1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 03:11:07 +00:00

Added missing translations and change timestamp

This commit is contained in:
zhengxie
2013-01-28 14:07:59 +08:00
parent 298f89aa59
commit 76a6f01bd5
7 changed files with 181 additions and 160 deletions

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-26 14:39+0800\n" "POT-Creation-Date: 2013-01-28 14:01+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,147 +77,147 @@ msgstr "验证信息不能为空"
msgid "Verification message is too long (maximun is 255 characters)" msgid "Verification message is too long (maximun is 255 characters)"
msgstr "验证信息太长不超过255个字符" msgstr "验证信息太长不超过255个字符"
#: views.py:75 #: views.py:73
msgid "There is already a group with that name." msgid "There is already a group with that name."
msgstr "已有同名群组" msgstr "已有同名群组"
#: views.py:108 #: views.py:106
msgid "Only administrators can delete the group." msgid "Only administrators can delete the group."
msgstr "只有管理员才能删除群组。" msgstr "只有管理员才能删除群组。"
#: views.py:145 #: views.py:143
msgid "Only administrators can dismiss the group" msgid "Only administrators can dismiss the group"
msgstr "只有管理员才能解散群组" msgstr "只有管理员才能解散群组"
#: views.py:168 #: views.py:166
msgid "group id is not a valid argument." msgid "group id is not a valid argument."
msgstr "群组 id 无效" msgstr "群组 id 无效"
#: views.py:326 #: views.py:321
msgid "The message doesn't exist" msgid "The message doesn't exist"
msgstr "该留言不存在" msgstr "该留言不存在"
#: views.py:336 #: views.py:331
msgid "You don't have the permission." msgid "You don't have the permission."
msgstr "你的权限不够。" msgstr "你的权限不够。"
#: views.py:500 #: views.py:495
#, python-format #, python-format
msgid "Failed to add, %s is not in current organization." msgid "Failed to add, %s is not in current organization."
msgstr "添加失败,%s 不在当前团体中。" msgstr "添加失败,%s 不在当前团体中。"
#: views.py:530 #: views.py:525
msgid "Your friend added you to a group at Seafile." msgid "Your friend added you to a group at Seafile."
msgstr "你的朋友在 Seafile 上把你加入到了一个群组中。" msgstr "你的朋友在 Seafile 上把你加入到了一个群组中。"
#: views.py:535 #: views.py:530
msgid "Failed to send mail." msgid "Failed to send mail."
msgstr "邮件发送失败。" msgstr "邮件发送失败。"
#: views.py:552 #: views.py:547
#, python-format #, python-format
msgid "Failed to add, %s is not registerd." msgid "Failed to add, %s is not registerd."
msgstr "添加失败,%s 未注册。" msgstr "添加失败,%s 未注册。"
#: views.py:566 #: views.py:561
#, python-format #, python-format
msgid "Successfully added. An email has been sent." msgid "Successfully added. An email has been sent."
msgid_plural "Successfully added. %(count)s emails have been sent." msgid_plural "Successfully added. %(count)s emails have been sent."
msgstr[0] "添加群组成员成功,%(count)s 封邀请邮件已发送。" msgstr[0] "添加群组成员成功,%(count)s 封邀请邮件已发送。"
#: views.py:574 #: views.py:569
msgid "Successfully added." msgid "Successfully added."
msgstr "添加成功。" msgstr "添加成功。"
#: views.py:614 #: views.py:609
#, python-format #, python-format
msgid "Failed to add, %s is not registrated." msgid "Failed to add, %s is not registrated."
msgstr "添加失败,%s 还没注册。" msgstr "添加失败,%s 还没注册。"
#: views.py:637 views.py:650 views.py:677 #: views.py:632 views.py:645 views.py:672
msgid "Operation succeeded." msgid "Operation succeeded."
msgstr "操作成功" msgstr "操作成功"
#: views.py:667 #: views.py:662
msgid "group id is not valid" msgid "group id is not valid"
msgstr "群组 id 无效" msgstr "群组 id 无效"
#: views.py:679 #: views.py:674
#, python-format #, python-format
msgid "Failed%s" msgid "Failed%s"
msgstr "删除失败:%s" msgstr "删除失败:%s"
#: views.py:691 #: views.py:686
msgid "Failed to share: the group doesn't exist." msgid "Failed to share: the group doesn't exist."
msgstr "共享失败: 该群组不存在。" msgstr "共享失败: 该群组不存在。"
#: views.py:694 #: views.py:689
msgid "Failed to share: internal error." msgid "Failed to share: internal error."
msgstr "共享失败: 内部错误。" msgstr "共享失败: 内部错误。"
#: views.py:704 #: views.py:699
msgid "Failed to unshare: the group doesn't exist." msgid "Failed to unshare: the group doesn't exist."
msgstr "共享失败: 该群组不存在。" msgstr "共享失败: 该群组不存在。"
#: views.py:709 #: views.py:704
msgid "" msgid ""
"Operation failed: only administrators and the owner of the library can " "Operation failed: only administrators and the owner of the library can "
"unshare it." "unshare it."
msgstr "操作失败:只有管理员和资料库拥有者才能取消共享。" msgstr "操作失败:只有管理员和资料库拥有者才能取消共享。"
#: views.py:712 #: views.py:707
msgid "Failed to unshare: internal error." msgid "Failed to unshare: internal error."
msgstr "取消共享失败:内部错误。" msgstr "取消共享失败:内部错误。"
#: views.py:740 #: views.py:735
msgid "Error: wrong group id" msgid "Error: wrong group id"
msgstr "推荐失败群组id不正确" msgstr "推荐失败群组id不正确"
#: views.py:748 #: views.py:743
#, python-format #, python-format
msgid "Error: you are not in group %s." msgid "Error: you are not in group %s."
msgstr "推荐到 %s 失败:你不在该群组中。" msgstr "推荐到 %s 失败:你不在该群组中。"
#: views.py:768 #: views.py:763
#, python-format #, python-format
msgid "" msgid ""
"Successfully recommended to <a href=\"%(url)s\" target=\"_blank\">%(name)s</" "Successfully recommended to <a href=\"%(url)s\" target=\"_blank\">%(name)s</"
"a>." "a>."
msgstr "推荐到<a href=\"%(url)s\" target=\"_blank\">%(name)s</a>成功" msgstr "推荐到<a href=\"%(url)s\" target=\"_blank\">%(name)s</a>成功"
#: views.py:773 #: views.py:768
msgid "Failed to recommend." msgid "Failed to recommend."
msgstr "推荐失败。" msgstr "推荐失败。"
#: views.py:788 #: views.py:783
msgid "Failed to create: the group does not exist." msgid "Failed to create: the group does not exist."
msgstr "创建失败:该群组不存在。" msgstr "创建失败:该群组不存在。"
#: views.py:792 #: views.py:787
msgid "Failed to create: you are not in the group." msgid "Failed to create: you are not in the group."
msgstr "创建失败:你不在该群组中。" msgstr "创建失败:你不在该群组中。"
#: views.py:814 views.py:842 #: views.py:809 views.py:837
msgid "Failed to create" msgid "Failed to create"
msgstr "创建失败。" msgstr "创建失败。"
#: views.py:828 views.py:855 #: views.py:823 views.py:850
msgid "Failed to create: internal error." msgid "Failed to create: internal error."
msgstr "创建团体群组失败。" msgstr "创建团体群组失败。"
#: views.py:882 #: views.py:877
msgid "You are already in the group." msgid "You are already in the group."
msgstr "你已在该群组中。" msgstr "你已在该群组中。"
#: views.py:901 #: views.py:896
msgid "apply to join the group" msgid "apply to join the group"
msgstr "申请加入群组" msgstr "申请加入群组"
#: views.py:903 #: views.py:898
msgid "Sent successfully, the group admin will handle it." msgid "Sent successfully, the group admin will handle it."
msgstr "发送成功,请等候管理员处理。" msgstr "发送成功,请等候管理员处理。"
#: views.py:907 #: views.py:902
msgid "Failed to send. You can try it again later." msgid "Failed to send. You can try it again later."
msgstr "发送失败, 请稍侯再试。" msgstr "发送失败, 请稍侯再试。"
@@ -301,7 +301,7 @@ msgstr "名字"
msgid "Description" msgid "Description"
msgstr "描述" msgstr "描述"
#: templates/group/group_info.html:87 templates/group/group_info.html:136 #: templates/group/group_info.html:87
msgid "Last Update" msgid "Last Update"
msgstr "更新时间" msgstr "更新时间"
@@ -349,10 +349,14 @@ msgstr ""
"以可读写方式共享的资料库可以被其他群组成员下载和同步,而以只读方式共享的资料" "以可读写方式共享的资料库可以被其他群组成员下载和同步,而以只读方式共享的资料"
"库只能被下载,其他人的修改将不会被上传。" "库只能被下载,其他人的修改将不会被上传。"
#: templates/group/group_info.html:134 templates/group/group_info.html:168 #: templates/group/group_info.html:134 templates/group/group_info.html:178
msgid "Library" msgid "Library"
msgstr "" msgstr ""
#: templates/group/group_info.html:136
msgid "Modified at"
msgstr "修改于"
#: templates/group/group_info.html:137 #: templates/group/group_info.html:137
msgid "Modifier" msgid "Modifier"
msgstr "" msgstr ""
@@ -361,19 +365,27 @@ msgstr ""
msgid "Details" msgid "Details"
msgstr "" msgstr ""
#: templates/group/group_info.html:168 #: templates/group/group_info.html:166 templates/group/new_msg_reply.html:57
msgid "None"
msgstr "暂无"
#: templates/group/group_info.html:171
msgid "Unknown"
msgstr ""
#: templates/group/group_info.html:178
msgid "is encrypted" msgid "is encrypted"
msgstr "" msgstr ""
#: templates/group/group_info.html:170 #: templates/group/group_info.html:180
msgid "Password" msgid "Password"
msgstr "" msgstr ""
#: templates/group/group_info.html:172 #: templates/group/group_info.html:182
msgid "The password will be kept in the server for only 1 hour." msgid "The password will be kept in the server for only 1 hour."
msgstr "" msgstr ""
#: templates/group/group_info.html:174 templates/group/group_info.html:190 #: templates/group/group_info.html:184 templates/group/group_info.html:200
#: templates/group/group_pubinfo.html:24 #: templates/group/group_pubinfo.html:24
#: templates/group/groups_right_panel.html:34 #: templates/group/groups_right_panel.html:34
#: templates/group/grpmember_add_form.html:12 #: templates/group/grpmember_add_form.html:12
@@ -381,27 +393,27 @@ msgstr ""
msgid "Submit" msgid "Submit"
msgstr "提交" msgstr "提交"
#: templates/group/group_info.html:175 #: templates/group/group_info.html:185
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: templates/group/group_info.html:182 #: templates/group/group_info.html:192
msgid "Messages" msgid "Messages"
msgstr "信息栏" msgstr "信息栏"
#: templates/group/group_info.html:210 templates/group/new_msg_reply.html:22 #: templates/group/group_info.html:220 templates/group/new_msg_reply.html:22
msgid "Recommended" msgid "Recommended"
msgstr "推荐" msgstr "推荐"
#: templates/group/group_info.html:222 #: templates/group/group_info.html:232
msgid "File " msgid "File "
msgstr "文件" msgstr "文件"
#: templates/group/group_info.html:222 #: templates/group/group_info.html:232
msgid "has a new comment:" msgid "has a new comment:"
msgstr "有新的评注:" msgstr "有新的评注:"
#: templates/group/group_info.html:229 #: templates/group/group_info.html:239
#: templates/group/group_reply_list.html:10 #: templates/group/group_reply_list.html:10
#: templates/group/group_reply_list.html:16 #: templates/group/group_reply_list.html:16
#: templates/group/group_reply_new.html:7 templates/group/msg_reply_js.html:59 #: templates/group/group_reply_new.html:7 templates/group/msg_reply_js.html:59
@@ -410,7 +422,7 @@ msgstr "有新的评注:"
msgid "Reply" msgid "Reply"
msgstr "回复" msgstr "回复"
#: templates/group/group_info.html:231 #: templates/group/group_info.html:241
#, python-format #, python-format
msgid "" msgid ""
"\n" "\n"
@@ -425,60 +437,60 @@ msgstr[0] ""
" <span class=\"reply-cnt\">%(counter)s</span> 回复\n" " <span class=\"reply-cnt\">%(counter)s</span> 回复\n"
" " " "
#: templates/group/group_info.html:238 templates/group/new_msg_reply.html:34 #: templates/group/group_info.html:248 templates/group/new_msg_reply.html:34
msgid "Hide" msgid "Hide"
msgstr "隐藏回复" msgstr "隐藏回复"
#: templates/group/group_info.html:240 templates/group/group_manage.html:51 #: templates/group/group_info.html:250 templates/group/group_manage.html:51
#: templates/group/group_manage.html:75 #: templates/group/group_manage.html:75
msgid "Delete" msgid "Delete"
msgstr "删除" msgstr "删除"
#: templates/group/group_info.html:252 #: templates/group/group_info.html:262
msgid "Previous" msgid "Previous"
msgstr "前一页" msgstr "前一页"
#: templates/group/group_info.html:255 #: templates/group/group_info.html:265
msgid "Next" msgid "Next"
msgstr "下一页" msgstr "下一页"
#: templates/group/group_info.html:268 #: templates/group/group_info.html:278
msgid "Quit Group" msgid "Quit Group"
msgstr "退出群组" msgstr "退出群组"
#: templates/group/group_info.html:268 #: templates/group/group_info.html:278
msgid "Are you sure you want to quit this group" msgid "Are you sure you want to quit this group"
msgstr "确定要退出该群组" msgstr "确定要退出该群组"
#: templates/group/group_info.html:269 #: templates/group/group_info.html:279
msgid "Unshare Library" msgid "Unshare Library"
msgstr "取消共享资料库" msgstr "取消共享资料库"
#: templates/group/group_info.html:269 #: templates/group/group_info.html:279
msgid "Are you sure you want to unshare" msgid "Are you sure you want to unshare"
msgstr "确定要取消共享" msgstr "确定要取消共享"
#: templates/group/group_info.html:302 #: templates/group/group_info.html:312
msgid "Really want to delete this message?" msgid "Really want to delete this message?"
msgstr "确定要删除这条留言?" msgstr "确定要删除这条留言?"
#: templates/group/group_info.html:302 #: templates/group/group_info.html:312
msgid "Yes" msgid "Yes"
msgstr "确定" msgstr "确定"
#: templates/group/group_info.html:302 #: templates/group/group_info.html:312
msgid "No" msgid "No"
msgstr "取消" msgstr "取消"
#: templates/group/group_info.html:314 #: templates/group/group_info.html:324
msgid "Successfully deleted" msgid "Successfully deleted"
msgstr "删除成功。" msgstr "删除成功。"
#: templates/group/group_info.html:316 #: templates/group/group_info.html:326
msgid "Failed to delete: " msgid "Failed to delete: "
msgstr "删除失败:" msgstr "删除失败:"
#: templates/group/group_info.html:320 #: templates/group/group_info.html:330
msgid ", failed to delete." msgid ", failed to delete."
msgstr ",删除失败。" msgstr ",删除失败。"
@@ -656,7 +668,3 @@ msgstr "所在群组:"
#: templates/group/new_msg_reply.html:49 #: templates/group/new_msg_reply.html:49
msgid "It can't be blank and should be no more than 150 characters." msgid "It can't be blank and should be no more than 150 characters."
msgstr "输入不能为空且应应少于 150 个字符。" msgstr "输入不能为空且应应少于 150 个字符。"
#: templates/group/new_msg_reply.html:57
msgid "None"
msgstr "暂无"

View File

@@ -133,7 +133,7 @@
<th width="5%"></th> <th width="5%"></th>
<th width="17%">{% trans "Library" %}</th> <th width="17%">{% trans "Library" %}</th>
<th width="49%">{% trans "Description" %}</th> <th width="49%">{% trans "Description" %}</th>
<th width="15%">{% trans "Last Update" %}</th> <th width="15%">{% trans "Modified at" %}</th>
<th width="14%">{% trans "Modifier" %}</th> <th width="14%">{% trans "Modifier" %}</th>
</tr> </tr>
@@ -160,7 +160,17 @@
{% endif %} {% endif %}
</td> </td>
<td>{{cmt.props.ctime|translate_seahub_time}}</td> <td>{{cmt.props.ctime|translate_seahub_time}}</td>
<td>{{cmt.creator_name|email2nickname}}</td> <td>
{% if cmt.creator_name %}
{% if cmt.second_parent_id %}
{% trans "None" %}
{% else %}
{{cmt.creator_name|email2nickname}}
{% endif %}
{% else %}
{% trans "Unknown"%}
{% endif %}
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import fpformat
import logging import logging
import os import os
import time
import simplejson as json import simplejson as json
from django.core.mail import send_mail from django.core.mail import send_mail
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@@ -217,7 +215,6 @@ def render_group_info(request, group_id, form):
else: else:
repos = get_group_repos(group_id_int, request.user.username) repos = get_group_repos(group_id_int, request.user.username)
start_time = time.time()
recent_commits = [] recent_commits = []
cmt_repo_dict = {} cmt_repo_dict = {}
for repo in repos: for repo in repos:
@@ -234,8 +231,6 @@ def render_group_info(request, group_id, form):
cmt.repo.password_set = is_passwd_set(cmt.props.repo_id, cmt.repo.password_set = is_passwd_set(cmt.props.repo_id,
request.user.username) request.user.username)
cmt.tp = cmt.props.desc.split(' ')[0] cmt.tp = cmt.props.desc.split(' ')[0]
logger.info("Show group recent commits cost %s seconds" % \
fpformat.fix(time.time()-start_time, 10))
"""group messages""" """group messages"""
# Make sure page request is an int. If not, deliver first page. # Make sure page request is an int. If not, deliver first page.

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-25 10:34+0800\n" "POT-Creation-Date: 2013-01-28 13:57+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,223 +152,223 @@ msgstr ""
msgid "Русский" msgid "Русский"
msgstr "" msgstr ""
#: views.py:537 #: views.py:538
msgid "Unable to view recycle page" msgid "Unable to view recycle page"
msgstr "无法查看文件回收站" msgstr "无法查看文件回收站"
#: views.py:558 #: views.py:559
msgid "Settings saved." msgid "Settings saved."
msgstr "设置已保存。" msgstr "设置已保存。"
#: views.py:561 #: views.py:562
msgid "Failed to save settings on server" msgid "Failed to save settings on server"
msgstr "设置失败" msgstr "设置失败"
#: views.py:568 #: views.py:569
msgid "Internal Server Error" msgid "Internal Server Error"
msgstr "服务器内部错误" msgstr "服务器内部错误"
#: views.py:570 #: views.py:571
msgid "Filename contains invalid character" msgid "Filename contains invalid character"
msgstr "上传的文件名包含非法字符" msgstr "上传的文件名包含非法字符"
#: views.py:572 #: views.py:573
msgid "Duplicated filename" msgid "Duplicated filename"
msgstr "已存在同名的文件" msgstr "已存在同名的文件"
#: views.py:574 views.py:1307 views.py:2541 views.py:2669 #: views.py:575 views.py:1305 views.py:2546 views.py:2674
msgid "File not exists" msgid "File not exists"
msgstr "文件不存在" msgstr "文件不存在"
#: views.py:576 #: views.py:577
msgid "File size surpasses the limit" msgid "File size surpasses the limit"
msgstr "文件大小超过限制" msgstr "文件大小超过限制"
#: views.py:578 #: views.py:579
msgid "The space of owner is used up, upload failed" msgid "The space of owner is used up, upload failed"
msgstr "该资料库所有者的空间已用完,无法上传" msgstr "该资料库所有者的空间已用完,无法上传"
#: views.py:580 #: views.py:581
msgid "An error occurs during file transfer" msgid "An error occurs during file transfer"
msgstr "文件传输出错" msgstr "文件传输出错"
#: views.py:591 views.py:612 #: views.py:592 views.py:613
msgid "Invalid url" msgid "Invalid url"
msgstr "非法链接" msgstr "非法链接"
#: views.py:677 #: views.py:678
msgid "Unable to view library modification" msgid "Unable to view library modification"
msgstr "无法浏览该资料库修改历史" msgstr "无法浏览该资料库修改历史"
#: views.py:724 #: views.py:725
msgid "Unable to view library snapshots" msgid "Unable to view library snapshots"
msgstr "无法查看该资料库镜像" msgstr "无法查看该资料库镜像"
#: views.py:774 #: views.py:775
msgid "You have no permission to restore library" msgid "You have no permission to restore library"
msgstr "你没有权限进行还原操作" msgstr "你没有权限进行还原操作"
#: views.py:790 #: views.py:791
msgid "Please specify history ID" msgid "Please specify history ID"
msgstr "请指定历史记录ID" msgstr "请指定历史记录ID"
#: views.py:796 views.py:1577 views.py:2416 views.py:2451 views.py:2883 #: views.py:797 views.py:1575 views.py:2421 views.py:2456 views.py:2888
msgid "Invalid arguments" msgid "Invalid arguments"
msgstr "非法参数" msgstr "非法参数"
#: views.py:798 views.py:893 views.py:2370 views.py:2898 #: views.py:799 views.py:891 views.py:2368 views.py:2903
msgid "Library not exists" msgid "Library not exists"
msgstr "资料库不存在" msgstr "资料库不存在"
#: views.py:800 #: views.py:801
msgid "History you specified is not exists" msgid "History you specified is not exists"
msgstr "指定的历史记录不存在" msgstr "指定的历史记录不存在"
#: views.py:802 #: views.py:803
msgid "Unknown error" msgid "Unknown error"
msgstr "未知错误" msgstr "未知错误"
#: views.py:913 views.py:929 #: views.py:911 views.py:927
msgid "" msgid ""
"Failed to remove library. Only staff or owner can perform this operation." "Failed to remove library. Only staff or owner can perform this operation."
msgstr "删除资料库失败, 只有团体管理员或资料库创建者有权删除资料库。" msgstr "删除资料库失败, 只有团体管理员或资料库创建者有权删除资料库。"
#: views.py:1203 #: views.py:1201
msgid "Failed to create repo" msgid "Failed to create repo"
msgstr "创建失败" msgstr "创建失败"
#: views.py:1221 #: views.py:1219
msgid "Operation successful" msgid "Operation successful"
msgstr "操作成功" msgstr "操作成功"
#: views.py:1223 #: views.py:1221
msgid "Operation failed" msgid "Operation failed"
msgstr "操作失败" msgstr "操作失败"
#: views.py:1254 #: views.py:1252
msgid "Failed to delete file." msgid "Failed to delete file."
msgstr "删除文件出错。" msgstr "删除文件出错。"
#: views.py:1261 #: views.py:1259
#, python-format #, python-format
msgid "%s successfully deleted." msgid "%s successfully deleted."
msgstr "%s 删除成功。" msgstr "%s 删除成功。"
#: views.py:1263 #: views.py:1261
#, python-format #, python-format
msgid "Internal error. Failed to delete %s." msgid "Internal error. Failed to delete %s."
msgstr "内部错误。删除 %s 失败。" msgstr "内部错误。删除 %s 失败。"
#: views.py:1323 views.py:1645 #: views.py:1321 views.py:1643
msgid "Unable to view file" msgid "Unable to view file"
msgstr "无法查看该文件" msgstr "无法查看该文件"
#: views.py:1528 #: views.py:1526
msgid "File size surpasses 10M, can not be previewed online." msgid "File size surpasses 10M, can not be previewed online."
msgstr "文件超过10M无法在线查看。" msgstr "文件超过10M无法在线查看。"
#: views.py:1533 #: views.py:1531
msgid "HTTPError: failed to open file online" msgid "HTTPError: failed to open file online"
msgstr "HTTPError: 无法在线打开该文件" msgstr "HTTPError: 无法在线打开该文件"
#: views.py:1536 #: views.py:1534
msgid "URLError: failed to open file online" msgid "URLError: failed to open file online"
msgstr "URLError: 无法在线打开该文件" msgstr "URLError: 无法在线打开该文件"
#: views.py:1548 #: views.py:1546
msgid "Unknown file encoding" msgid "Unknown file encoding"
msgstr "文件编码无法识别" msgstr "文件编码无法识别"
#: views.py:1557 #: views.py:1555
msgid "Internal Error" msgid "Internal Error"
msgstr "内部错误" msgstr "内部错误"
#: views.py:1563 views.py:2212 views.py:2243 views.py:2277 #: views.py:1561 views.py:2210 views.py:2241 views.py:2275
msgid "Permission denied" msgid "Permission denied"
msgstr "共享权限" msgstr "共享权限"
#: views.py:1567 #: views.py:1565
msgid "The library does not exist." msgid "The library does not exist."
msgstr "资料库不存在" msgstr "资料库不存在"
#: views.py:1571 #: views.py:1569
msgid "The library is encrypted." msgid "The library is encrypted."
msgstr "该资料库已加密" msgstr "该资料库已加密"
#: views.py:1624 #: views.py:1622
msgid "Unable to edit file" msgid "Unable to edit file"
msgstr "无法编辑该文件" msgstr "无法编辑该文件"
#: views.py:1639 #: views.py:1637
msgid "The file does not exist." msgid "The file does not exist."
msgstr "该文件不存在" msgstr "该文件不存在"
#: views.py:1665 #: views.py:1663
msgid "Edit online is not offered for this type of file." msgid "Edit online is not offered for this type of file."
msgstr "该类型文件不能在线编辑。" msgstr "该类型文件不能在线编辑。"
#: views.py:1719 #: views.py:1717
msgid "Unable to access file" msgid "Unable to access file"
msgstr "无法访问文件" msgstr "无法访问文件"
#: views.py:1735 #: views.py:1733
msgid "Failed to download library, unable to find server" msgid "Failed to download library, unable to find server"
msgstr "下载失败:找不到服务器" msgstr "下载失败:找不到服务器"
#: views.py:1746 #: views.py:1744
msgid "Invalid server setting" msgid "Invalid server setting"
msgstr "服务器设置错误" msgstr "服务器设置错误"
#: views.py:1787 #: views.py:1785
msgid "Destination path is too long." msgid "Destination path is too long."
msgstr "目标路径过长" msgstr "目标路径过长"
#: views.py:1793 #: views.py:1791
msgid "You can not modify that library." msgid "You can not modify that library."
msgstr "你无法修改该资料库。" msgstr "你无法修改该资料库。"
#: views.py:1806 #: views.py:1804
#, python-format #, python-format
msgid "Can not %(op)s directory %(src)s to its subdirectory %(des)s" msgid "Can not %(op)s directory %(src)s to its subdirectory %(des)s"
msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中" msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中"
#: views.py:1807 #: views.py:1805
msgid "copy" msgid "copy"
msgstr "复制" msgstr "复制"
#: views.py:1807 #: views.py:1805
msgid "move" msgid "move"
msgstr "移动" msgstr "移动"
#: views.py:1822 #: views.py:1820
#, python-format #, python-format
msgid "Successfully copying %(name)s<a href=\"%(url)s\">view</a>" msgid "Successfully copying %(name)s<a href=\"%(url)s\">view</a>"
msgstr "复制 %(name)s 成功:<a href=\"%(url)s\">查看</a>" msgstr "复制 %(name)s 成功:<a href=\"%(url)s\">查看</a>"
#: views.py:1828 #: views.py:1826
#, python-format #, python-format
msgid "Successfully moving %(name)s <a href=\"%(url)s\">view</a>" msgid "Successfully moving %(name)s <a href=\"%(url)s\">view</a>"
msgstr "移动 %(name)s 成功:<a href=\"%(url)s\">查看</a>" msgstr "移动 %(name)s 成功:<a href=\"%(url)s\">查看</a>"
#: views.py:1943 #: views.py:1941
msgid "Failed to set quota: internal error" msgid "Failed to set quota: internal error"
msgstr "内部错误,设置失败" msgstr "内部错误,设置失败"
#: views.py:2016 templates/sys_useradmin.html:78 #: views.py:2014 templates/sys_useradmin.html:78
#: templates/registration/password_reset_confirm.html:4 #: templates/registration/password_reset_confirm.html:4
#: templates/registration/password_reset_form.html:4 #: templates/registration/password_reset_form.html:4
#: templates/registration/password_reset_form.html:7 #: templates/registration/password_reset_form.html:7
msgid "Password Reset" msgid "Password Reset"
msgstr "密码重置" msgstr "密码重置"
#: views.py:2032 #: views.py:2030
#, python-format #, python-format
msgid "" msgid ""
"Successfully resetted password to %(passwd)s, an email has been sent to " "Successfully resetted password to %(passwd)s, an email has been sent to "
"%(user)s." "%(user)s."
msgstr "成功将重置密码为 %(passwd)s, 一封通知邮件已经发送给 %(user)s。" msgstr "成功将重置密码为 %(passwd)s, 一封通知邮件已经发送给 %(user)s。"
#: views.py:2037 #: views.py:2035
#, python-format #, python-format
msgid "" msgid ""
"Successfully resetted password to %(passwd)s, but failed to send email to " "Successfully resetted password to %(passwd)s, but failed to send email to "
@@ -377,12 +377,12 @@ msgstr ""
"成功将用户密码重置为 %(passwd)s, 但发送通知邮件到 %(user)s 失败,请检查你的邮" "成功将用户密码重置为 %(passwd)s, 但发送通知邮件到 %(user)s 失败,请检查你的邮"
"件配置。" "件配置。"
#: views.py:2041 #: views.py:2039
#, python-format #, python-format
msgid "Successfully resetted password to %(passwd)s for user %(user)s." msgid "Successfully resetted password to %(passwd)s for user %(user)s."
msgstr "成功将用户 %(user)s 的密码重置为 %(passwd)s。" msgstr "成功将用户 %(user)s 的密码重置为 %(passwd)s。"
#: views.py:2044 #: views.py:2042
#, python-format #, python-format
msgid "" msgid ""
"Successfully resetted password to %(passwd)s for user %(user)s. But email " "Successfully resetted password to %(passwd)s for user %(user)s. But email "
@@ -392,68 +392,73 @@ msgstr ""
"成功将用户 %(user)s 的密码重置为 %(passwd)s, 但是由于邮箱服务未正确配置,通知" "成功将用户 %(user)s 的密码重置为 %(passwd)s, 但是由于邮箱服务未正确配置,通知"
"邮件无法发送。" "邮件无法发送。"
#: views.py:2047 #: views.py:2045
msgid "Failed to reset password: user does not exist" msgid "Failed to reset password: user does not exist"
msgstr "密码重置失败:用户不存在" msgstr "密码重置失败:用户不存在"
#: views.py:2068 #: views.py:2066
msgid "Seafile Registration Information" msgid "Seafile Registration Information"
msgstr "Seafile注册信息" msgstr "Seafile注册信息"
#: views.py:2103 #: views.py:2101
#, python-format #, python-format
msgid "Successfully added user %s. An email notification has been sent." msgid "Successfully added user %s. An email notification has been sent."
msgstr "成功添加用户 %s。一封通知邮件已发送。" msgstr "成功添加用户 %s。一封通知邮件已发送。"
#: views.py:2106 #: views.py:2104
#, python-format #, python-format
msgid "" msgid ""
"Successfully added user %s. An error accurs when sending email notification, " "Successfully added user %s. An error accurs when sending email notification, "
"please check your email configuration." "please check your email configuration."
msgstr "成功添加用户 %s。但发送通知邮件出错请检查邮箱配置。" msgstr "成功添加用户 %s。但发送通知邮件出错请检查邮箱配置。"
#: views.py:2108 #: views.py:2106
#, python-format #, python-format
msgid "Successfully added user %s." msgid "Successfully added user %s."
msgstr "成功添加用户 %s。" msgstr "成功添加用户 %s。"
#: views.py:2110 #: views.py:2108
#, python-format #, python-format
msgid "" msgid ""
"Successfully added user %s. But email notification can not be sent, because " "Successfully added user %s. But email notification can not be sent, because "
"Email service is not properly configured." "Email service is not properly configured."
msgstr "成功添加用户 %s。 但由于邮件服务未正确配置,通知邮件无法发送。" msgstr "成功添加用户 %s。 但由于邮件服务未正确配置,通知邮件无法发送。"
#: views.py:2289 #: views.py:2287
#, python-format #, python-format
msgid "Successfully renamed %(old)s to %(new)s" msgid "Successfully renamed %(old)s to %(new)s"
msgstr "%(old)s 已重命名为 %(new)s" msgstr "%(old)s 已重命名为 %(new)s"
#: views.py:2344 #: views.py:2342
msgid "Failed to create library" msgid "Failed to create library"
msgstr "创建资料库失败" msgstr "创建资料库失败"
#: views.py:2437 #: views.py:2442
#, python-format #, python-format
msgid "" msgid ""
"Successfully revert %(path)s to <a href=\"%(root)s\">root directory.</a>" "Successfully revert %(path)s to <a href=\"%(root)s\">root directory.</a>"
msgstr "成功还原 %(path)s 到<a href=\"%(root)s\">根目录。</a>" msgstr "成功还原 %(path)s 到<a href=\"%(root)s\">根目录。</a>"
#: views.py:2441 views.py:2467 #: views.py:2446 views.py:2472
#, python-format #, python-format
msgid "Successfully revert <a href=\"%(url)s\">%(path)s</a>" msgid "Successfully revert <a href=\"%(url)s\">%(path)s</a>"
msgstr "成功还原 <a href=\"%(url)s\">%(path)s</a>" msgstr "成功还原 <a href=\"%(url)s\">%(path)s</a>"
#: views.py:2463 #: views.py:2468
#, python-format #, python-format
msgid "Successfully revert %(path)s to <a href=\"%(url)s\">root directory.</a>" msgid "Successfully revert %(path)s to <a href=\"%(url)s\">root directory.</a>"
msgstr "成功还原 %(path)s 到<a href=\"%(url)s\">根目录。</a>" msgstr "成功还原 %(path)s 到<a href=\"%(url)s\">根目录。</a>"
#: views.py:2727 utils/__init__.py:84 #: views.py:2732 utils/__init__.py:84
msgid "Internal error" msgid "Internal error"
msgstr "内部错误" msgstr "内部错误"
#: views.py:2930 #: views.py:2939
#, python-format
msgid "Unable to download directory \"%s\": size is too large."
msgstr "无法下载 \"%s\":目录大小超过限制。"
#: views.py:2946
#, python-format #, python-format
msgid "Unable to download \"%s\"" msgid "Unable to download \"%s\""
msgstr "无法下载 \"%s\"" msgstr "无法下载 \"%s\""
@@ -696,7 +701,7 @@ msgstr "提交失败。请检查网络是否已连接。"
msgid "Submit failed." msgid "Submit failed."
msgstr "提交失败。" msgstr "提交失败。"
#: templates/file_edit.html:260 templates/snippets/events_js.html:67 #: templates/file_edit.html:260 templates/snippets/repo_decrypt_js.html:11
msgid "Password is required." msgid "Password is required."
msgstr "密码为必填项" msgstr "密码为必填项"
@@ -707,8 +712,8 @@ msgstr "密码太长不超过15个字符"
#: templates/file_edit.html:291 templates/file_view.html:198 #: templates/file_edit.html:291 templates/file_view.html:198
#: templates/file_view.html.py:364 templates/repo.html:411 #: templates/file_view.html.py:364 templates/repo.html:411
#: templates/repo.html.py:649 templates/repo.html:686 #: templates/repo.html.py:649 templates/repo.html:686
#: templates/repo.html.py:829 templates/snippets/events_js.html:91 #: templates/repo.html.py:829 templates/snippets/file_content_js.html:97
#: templates/snippets/file_content_js.html:97 #: templates/snippets/repo_decrypt_js.html:35
#: templates/snippets/shared_link_js.html:41 #: templates/snippets/shared_link_js.html:41
#: templates/snippets/shared_link_js.html:60 #: templates/snippets/shared_link_js.html:60
#: templates/snippets/shared_link_js.html:123 #: templates/snippets/shared_link_js.html:123
@@ -726,7 +731,7 @@ msgid ""
msgstr "" msgstr ""
"Tip每次修改后都会生成一个新的版本, 你可以将当前文件恢复到之前的某个版本。" "Tip每次修改后都会生成一个新的版本, 你可以将当前文件恢复到之前的某个版本。"
#: templates/file_revisions.html:10 templates/text_diff.html:8 #: templates/file_revisions.html:10 templates/text_diff.html:10
msgid "Current Path:" msgid "Current Path:"
msgstr "当前路径:" msgstr "当前路径:"
@@ -784,6 +789,10 @@ msgstr "下载"
msgid "View" msgid "View"
msgstr "查看" msgstr "查看"
#: templates/file_revisions.html:55
msgid "Diff"
msgstr ""
#: templates/file_view.html:16 templates/history_file_view.html:38 #: templates/file_view.html:16 templates/history_file_view.html:38
msgid "Current Path: " msgid "Current Path: "
msgstr "当前路径:" msgstr "当前路径:"
@@ -932,7 +941,7 @@ msgstr "镜像"
msgid "history" msgid "history"
msgstr "历史" msgstr "历史"
#: templates/history_file_view.html:26 #: templates/history_file_view.html:26 templates/text_diff.html:7
msgid "Back to file versions" msgid "Back to file versions"
msgstr "返回文件版本列表" msgstr "返回文件版本列表"
@@ -1524,7 +1533,7 @@ msgstr "删除群组"
#: templates/sys_group_admin.html:60 templates/sys_org_admin.html:61 #: templates/sys_group_admin.html:60 templates/sys_org_admin.html:61
#: templates/sys_seafadmin.html:61 templates/sys_useradmin.html:77 #: templates/sys_seafadmin.html:61 templates/sys_useradmin.html:77
#: templates/userinfo.html:133 templates/snippets/myhome_extra_script.html:38 #: templates/userinfo.html:133 templates/snippets/myhome_extra_script.html:37
msgid "Are you sure you want to delete" msgid "Are you sure you want to delete"
msgstr "确定要删除" msgstr "确定要删除"
@@ -1556,7 +1565,7 @@ msgid "directory icon"
msgstr "目录图标" msgstr "目录图标"
#: templates/sys_seafadmin.html:61 templates/userinfo.html:133 #: templates/sys_seafadmin.html:61 templates/userinfo.html:133
#: templates/snippets/myhome_extra_script.html:38 #: templates/snippets/myhome_extra_script.html:37
msgid "Delete Library" msgid "Delete Library"
msgstr "删除资料库" msgstr "删除资料库"
@@ -1596,15 +1605,15 @@ msgstr "确定要重置该用户的密码:"
msgid "modification details" msgid "modification details"
msgstr "修改详情" msgstr "修改详情"
#: templates/text_diff.html:19 #: templates/text_diff.html:22
msgid "It's a newly-created blank file." msgid "It's a newly-created blank file."
msgstr "该文件为新建空白文件。" msgstr "该文件为新建空白文件。"
#: templates/text_diff.html:26 #: templates/text_diff.html:29
msgid "before modification" msgid "before modification"
msgstr "修改前" msgstr "修改前"
#: templates/text_diff.html:28 #: templates/text_diff.html:31
msgid "after modification" msgid "after modification"
msgstr "修改后" msgstr "修改后"
@@ -1852,7 +1861,7 @@ msgid "Deleted library"
msgstr "删除了资料库" msgstr "删除了资料库"
#: templates/snippets/events_js.html:42 #: templates/snippets/events_js.html:42
#: templates/snippets/list_commit_detail.html:37 #: templates/snippets/list_commit_detail.html:41
msgid "Unknown error." msgid "Unknown error."
msgstr "未知错误" msgstr "未知错误"
@@ -1949,7 +1958,7 @@ msgstr "新目录"
msgid "Deleted directories" msgid "Deleted directories"
msgstr "删除的目录" msgstr "删除的目录"
#: templates/snippets/list_commit_detail.html:31 #: templates/snippets/list_commit_detail.html:34
msgid "No conflict in the merge." msgid "No conflict in the merge."
msgstr "合并没有冲突。" msgstr "合并没有冲突。"
@@ -2033,7 +2042,7 @@ msgstr ""
"你可以在文件浏览页面点击“添加星标”按钮给重要的文件加上星标,这些文件会显示在" "你可以在文件浏览页面点击“添加星标”按钮给重要的文件加上星标,这些文件会显示在"
"这里。" "这里。"
#: templates/snippets/myhome_extra_script.html:28 #: templates/snippets/myhome_extra_script.html:27
msgid "Please enter emails or groups." msgid "Please enter emails or groups."
msgstr "请输入邮箱或群组。" msgstr "请输入邮箱或群组。"

View File

@@ -8,10 +8,10 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" /> <meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.16.custom.css" /> <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.16.custom.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1352500800" /> <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1359353100" />
<link rel="icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.ico?t=1352500800" /> <link rel="icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.ico?t=1359353100" />
<!--[if IE]> <!--[if IE]>
<link rel="shortcut icon" href="{{ MEDIA_URL }}img/favicon.ico?t=1352500800"/> <link rel="shortcut icon" href="{{ MEDIA_URL }}img/favicon.ico?t=1359353100"/>
<![endif]--> <![endif]-->
{% block extra_style %}{% endblock %} {% block extra_style %}{% endblock %}
</head> </head>
@@ -82,7 +82,7 @@
<div id="header"> <div id="header">
<div id="header-inner"> <div id="header-inner">
<a href="http://seafile.com/"> <a href="http://seafile.com/">
<img src="{{ MEDIA_URL }}img/logo.png?t=1352500800" title="Seafile" alt="Seafile logo" id="logo" class="fleft" /> <img src="{{ MEDIA_URL }}img/logo.png?t=1359353100" title="Seafile" alt="Seafile logo" id="logo" class="fleft" />
</a> </a>
{% block nav %}{% endblock %} {% block nav %}{% endblock %}
</div> </div>
@@ -154,7 +154,7 @@
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.placeholder.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.placeholder.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js?t=1352500800"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js?t=1359353100"></script>
<script type="text/javascript"> <script type="text/javascript">
$('input, textarea').placeholder(); $('input, textarea').placeholder();
$('.top-bar-con .manage').css('width', $('.top-bar-con').width() - $('.top-bar-con .account').width() - 30); $('.top-bar-con .manage').css('width', $('.top-bar-con').width() - $('.top-bar-con .account').width() - 30);

View File

@@ -37,7 +37,6 @@
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
{% include "snippets/file_view_js.html" %}
<script type="text/javascript"> <script type="text/javascript">
$('#back').click(function() { $('#back').click(function() {
location.href = $(this).attr('data'); location.href = $(this).attr('data');

View File

@@ -2935,7 +2935,7 @@ def repo_download_dir(request, repo_id):
return render_error(request, _(u'Internal Error')) return render_error(request, _(u'Internal Error'))
if total_size > MAX_DOWNLOAD_DIR_SIZE: if total_size > MAX_DOWNLOAD_DIR_SIZE:
return render_error(request, _(u'Unable to download directory "%s": size too large') % dirname) return render_error(request, _(u'Unable to download directory "%s": size is too large.') % dirname)
token = seafserv_rpc.web_get_access_token(repo_id, token = seafserv_rpc.web_get_access_token(repo_id,
dir_id, dir_id,