diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 53080126d8..6ff362e386 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-19 15:54+0800\n" +"POT-Creation-Date: 2018-01-12 18:04+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,15 +54,15 @@ msgid "Space quota is too low (minimum value is 0)" msgstr "" #: seahub/api2/endpoints/admin/account.py:258 seahub/institutions/views.py:213 -#: seahub/views/sysadmin.py:773 +#: seahub/views/sysadmin.py:774 #, python-format msgid "Failed to set quota: maximum quota is %d MB" msgstr "" #: seahub/api2/endpoints/admin/default_library.py:31 #: seahub/api2/endpoints/admin/default_library.py:32 -#: seahub/views/__init__.py:689 seahub/views/__init__.py:690 -#: seahub/views/__init__.py:695 seahub/views/__init__.py:696 +#: seahub/views/__init__.py:664 seahub/views/__init__.py:665 +#: seahub/views/__init__.py:670 seahub/views/__init__.py:671 msgid "My Library" msgstr "" @@ -84,7 +84,7 @@ msgstr "" msgid "User %s is already group owner." msgstr "" -#: seahub/api2/endpoints/admin/libraries.py:219 seahub/views/sysadmin.py:1815 +#: seahub/api2/endpoints/admin/libraries.py:219 seahub/views/sysadmin.py:1816 msgid "System library can not be deleted." msgstr "" @@ -95,6 +95,7 @@ msgstr "" #: seahub/api2/endpoints/admin/shares.py:174 #: seahub/api2/endpoints/invitations.py:49 +#: seahub/api2/endpoints/invitations.py:106 #, python-format msgid "Email %s invalid." msgstr "" @@ -103,20 +104,28 @@ msgstr "" msgid "must be an integer that is greater than or equal to 0." msgstr "" -#: seahub/api2/endpoints/copy_move_task.py:78 seahub/views/ajax.py:576 +#: seahub/api2/endpoints/copy_move_task.py:79 seahub/views/ajax.py:632 msgid "Invalid destination path" msgstr "" -#: seahub/api2/endpoints/copy_move_task.py:82 +#: seahub/api2/endpoints/copy_move_task.py:83 msgid "Destination path is too long." msgstr "" -#: seahub/api2/endpoints/copy_move_task.py:128 seahub/views/ajax.py:661 +#: seahub/api2/endpoints/copy_move_task.py:134 seahub/views/ajax.py:726 #, python-format msgid "Can not move directory %(src)s to its subdirectory %(des)s" msgstr "" -#: seahub/api2/endpoints/copy_move_task.py:201 +#: seahub/api2/endpoints/copy_move_task.py:149 +#: seahub/api2/endpoints/file.py:262 seahub/api2/endpoints/file.py:342 +#: seahub/api2/endpoints/file.py:458 seahub/api2/endpoints/file.py:541 +#: seahub/api2/endpoints/file.py:603 seahub/views/ajax.py:445 +#: seahub/views/ajax.py:516 seahub/views/file.py:1174 +msgid "File is locked" +msgstr "" + +#: seahub/api2/endpoints/copy_move_task.py:216 msgid "Cancel failed" msgstr "" @@ -135,18 +144,10 @@ msgstr "" msgid "This item has been shared to %s." msgstr "" -#: seahub/api2/endpoints/file.py:419 seahub/views/file.py:1164 -msgid "Check file lock error" -msgstr "" - -#: seahub/api2/endpoints/file.py:423 seahub/views/file.py:1167 -msgid "File is locked" -msgstr "" - #: seahub/api2/endpoints/file_tag.py:44 seahub/group/views.py:364 -#: seahub/views/__init__.py:1016 seahub/views/ajax.py:1061 -#: seahub/views/ajax.py:1065 seahub/views/sysadmin.py:2027 -#: seahub/views/wiki.py:136 +#: seahub/views/__init__.py:984 seahub/views/ajax.py:1126 +#: seahub/views/ajax.py:1130 seahub/views/file.py:1171 +#: seahub/views/sysadmin.py:2028 seahub/views/wiki.py:136 msgid "Internal Server Error" msgstr "" @@ -154,8 +155,8 @@ msgstr "" #: seahub/group/views.py:451 #: seahub/templates/sysadmin/sys_useradmin_admins.html:90 #: seahub/thumbnail/views.py:52 seahub/thumbnail/views.py:164 -#: seahub/views/__init__.py:858 seahub/views/ajax.py:221 -#: seahub/views/ajax.py:752 seahub/views/wiki.py:203 +#: seahub/views/__init__.py:821 seahub/views/ajax.py:224 +#: seahub/views/ajax.py:817 seahub/views/wiki.py:203 msgid "Permission denied." msgstr "" @@ -167,28 +168,31 @@ msgid "Tag can only contain letters, numbers, dot, hyphen or underscore." msgstr "" #: seahub/api2/endpoints/group_members.py:93 -#: seahub/api2/endpoints/group_members.py:289 seahub/views/ajax.py:1248 +#: seahub/api2/endpoints/group_members.py:289 seahub/views/ajax.py:1318 #, python-format msgid "User %s is already a group member." msgstr "" #: seahub/api2/endpoints/group_members.py:99 -#: seahub/api2/endpoints/group_members.py:298 seahub/api2/views.py:1221 -#: seahub/views/ajax.py:1257 tsinghua-auth-fix/seahub/api2/views.py:1116 +#: seahub/api2/endpoints/group_members.py:298 seahub/api2/views.py:1288 +#: seahub/views/ajax.py:1327 #, python-format msgid "User %s not found in organization." msgstr "" #: seahub/api2/endpoints/invitations.py:53 +#: seahub/api2/endpoints/invitations.py:113 msgid "The email address is not allowed to be invited as a guest." msgstr "" #: seahub/api2/endpoints/invitations.py:58 +#: seahub/api2/endpoints/invitations.py:121 #, python-format msgid "%s is already invited." msgstr "" -#: seahub/api2/endpoints/invitations.py:68 seahub/base/accounts.py:701 +#: seahub/api2/endpoints/invitations.py:68 +#: seahub/api2/endpoints/invitations.py:129 seahub/base/accounts.py:708 #, python-format msgid "User %s already exists." msgstr "" @@ -202,19 +206,17 @@ msgstr "" msgid "Error" msgstr "" -#: seahub/api2/endpoints/repo_set_password.py:48 seahub/api2/views.py:3108 -#: tsinghua-auth-fix/seahub/api2/views.py:2987 +#: seahub/api2/endpoints/repo_set_password.py:48 seahub/api2/views.py:3197 msgid "Wrong password" msgstr "" -#: seahub/api2/endpoints/repo_set_password.py:51 seahub/api2/views.py:3111 -#: seahub/views/__init__.py:476 seahub/views/ajax.py:624 -#: seahub/views/sysadmin.py:2196 tsinghua-auth-fix/seahub/api2/views.py:2990 +#: seahub/api2/endpoints/repo_set_password.py:51 seahub/api2/views.py:3200 +#: seahub/views/__init__.py:451 seahub/views/ajax.py:680 +#: seahub/views/sysadmin.py:2213 msgid "Internal server error" msgstr "" -#: seahub/api2/endpoints/repo_set_password.py:54 seahub/api2/views.py:3114 -#: tsinghua-auth-fix/seahub/api2/views.py:2993 +#: seahub/api2/endpoints/repo_set_password.py:54 seahub/api2/views.py:3203 msgid "Decrypt library error" msgstr "" @@ -258,7 +260,7 @@ msgid "An upload link is shared to you on %s" msgstr "" #: seahub/api2/endpoints/share_link_zip_task.py:95 -#: seahub/views/__init__.py:1000 +#: seahub/views/__init__.py:968 #, python-format msgid "Unable to download directory \"%s\": size is too large." msgstr "" @@ -273,23 +275,21 @@ msgstr "" msgid "Password is too short" msgstr "" -#: seahub/api2/endpoints/user_avatar.py:38 seahub/avatar/forms.py:35 -#: seahub/avatar/forms.py:58 +#: seahub/api2/endpoints/user_avatar.py:38 seahub/utils/error_msg.py:8 #, python-format msgid "" "%(ext)s is an invalid file extension. Authorized extensions are : " "%(valid_exts_list)s" msgstr "" -#: seahub/api2/endpoints/user_avatar.py:42 seahub/avatar/forms.py:39 -#: seahub/avatar/forms.py:62 +#: seahub/api2/endpoints/user_avatar.py:42 seahub/utils/error_msg.py:13 #, python-format msgid "" "Your file is too big (%(size)s), the maximum allowed size is " "%(max_valid_size)s" msgstr "" -#: seahub/api2/endpoints/user_avatar.py:48 seahub/avatar/forms.py:45 +#: seahub/api2/endpoints/user_avatar.py:48 seahub/avatar/forms.py:43 #, python-format msgid "" "You already have %(nb_avatars)d avatars, and the maximum allowed is " @@ -320,7 +320,7 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:611 #: seahub/templates/js/sysadmin-templates.html:804 #: seahub/templates/js/templates.html:379 -#: seahub/templates/js/templates.html:1394 +#: seahub/templates/js/templates.html:1402 #: seahub/templates/sysadmin/base.html:56 #: seahub/templates/sysadmin/settings.html:78 #: seahub/templates/sysadmin/sys_org_info_group.html:9 @@ -349,15 +349,15 @@ msgid "Email or Username" msgstr "" #: seahub/auth/forms.py:28 seahub/auth/forms.py:215 -#: seahub/base/accounts.py:679 +#: seahub/base/accounts.py:686 #: seahub/invitations/templates/invitations/token_view.html:13 #: seahub/profile/templates/profile/set_profile.html:16 #: seahub/profile/templates/profile/set_profile.html:85 #: seahub/templates/file_edit.html:131 #: seahub/templates/js/lib-op-popups.html:108 #: seahub/templates/js/templates.html:39 -#: seahub/templates/js/templates.html:1031 -#: seahub/templates/js/templates.html:1104 +#: seahub/templates/js/templates.html:1039 +#: seahub/templates/js/templates.html:1112 #: seahub/templates/registration/login.html:36 #: seahub/templates/registration/registration_form.html:24 #: seahub/templates/snippets/file_share_popup.html:18 @@ -366,7 +366,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_org_admin.html:32 #: seahub/templates/sysadmin/sys_org_info_user.html:71 #: seahub/templates/sysadmin/sys_useradmin.html:61 -#: seahub/views/sysadmin.py:1983 +#: seahub/views/sysadmin.py:1984 msgid "Password" msgstr "" @@ -420,7 +420,7 @@ msgid "New password confirmation" msgstr "" #: seahub/auth/forms.py:185 seahub/auth/forms.py:227 -#: seahub/base/accounts.py:735 +#: seahub/base/accounts.py:742 msgid "The two password fields didn't match." msgstr "" @@ -432,7 +432,7 @@ msgstr "" msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: seahub/auth/forms.py:216 seahub/base/accounts.py:681 +#: seahub/auth/forms.py:216 seahub/base/accounts.py:688 msgid "Password (again)" msgstr "" @@ -441,19 +441,19 @@ msgstr "" msgid "Enter a valid e-mail address." msgstr "" -#: seahub/auth/views.py:203 +#: seahub/auth/views.py:140 msgid "This account has been frozen due to too many failed login attempts." msgstr "" -#: seahub/auth/views.py:327 +#: seahub/auth/views.py:260 msgid "Logged out" msgstr "" -#: seahub/auth/views.py:375 +#: seahub/auth/views.py:308 msgid "Failed to send email, please contact administrator." msgstr "" -#: seahub/auth/views.py:436 +#: seahub/auth/views.py:369 msgid "Can not update password, please contact LDAP admin." msgstr "" @@ -519,51 +519,51 @@ msgstr "" msgid "Successfully deleted the requested avatars." msgstr "" -#: seahub/base/accounts.py:390 +#: seahub/base/accounts.py:397 #, python-format msgid "Account %(account)s froze on %(site)s." msgstr "" -#: seahub/base/accounts.py:670 +#: seahub/base/accounts.py:677 msgid "Email address" msgstr "" -#: seahub/base/accounts.py:675 +#: seahub/base/accounts.py:682 msgid "Username" msgstr "" -#: seahub/base/accounts.py:676 +#: seahub/base/accounts.py:683 msgid "This value must be of length 40" msgstr "" -#: seahub/base/accounts.py:691 seahub/forms.py:30 -#: seahub/views/sysadmin.py:2038 +#: seahub/base/accounts.py:698 seahub/forms.py:30 +#: seahub/views/sysadmin.py:2039 msgid "The number of users exceeds the limit." msgstr "" -#: seahub/base/accounts.py:695 +#: seahub/base/accounts.py:702 msgid "Enter a valid email address." msgstr "" -#: seahub/base/accounts.py:705 +#: seahub/base/accounts.py:712 msgid "Invalid user id." msgstr "" -#: seahub/base/accounts.py:756 seahub/templates/js/templates.html:424 -#: seahub/templates/js/templates.html:1616 -#: seahub/templates/js/templates.html:1653 +#: seahub/base/accounts.py:763 seahub/templates/js/templates.html:424 +#: seahub/templates/js/templates.html:1624 +#: seahub/templates/js/templates.html:1661 msgid "name" msgstr "" -#: seahub/base/accounts.py:759 +#: seahub/base/accounts.py:766 msgid "department" msgstr "" -#: seahub/base/accounts.py:762 +#: seahub/base/accounts.py:769 msgid "telephone" msgstr "" -#: seahub/base/accounts.py:765 +#: seahub/base/accounts.py:772 msgid "note" msgstr "" @@ -585,10 +585,10 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:879 #: seahub/templates/js/sysadmin-templates.html:937 #: seahub/templates/js/sysadmin-templates.html:977 -#: seahub/templates/js/templates.html:1898 #: seahub/templates/js/templates.html:1906 -#: seahub/templates/js/templates.html:2484 -#: seahub/templates/js/templates.html:2516 +#: seahub/templates/js/templates.html:1914 +#: seahub/templates/js/templates.html:2492 +#: seahub/templates/js/templates.html:2524 #: seahub/templates/registration/registration_form.html:22 #: seahub/templates/sysadmin/sys_inst_info_admins.html:15 #: seahub/templates/sysadmin/sys_inst_info_user.html:23 @@ -602,8 +602,8 @@ msgstr "" #: seahub/templates/sysadmin/user_search.html:10 #: seahub/templates/sysadmin/useradmin_table.html:6 #: seahub/templates/sysadmin/useradmin_table.html:10 -#: seahub/templates/sysadmin/userinfo.html:36 seahub/views/sysadmin.py:323 -#: seahub/views/sysadmin.py:327 seahub/views/sysadmin.py:1983 +#: seahub/templates/sysadmin/userinfo.html:36 seahub/views/sysadmin.py:324 +#: seahub/views/sysadmin.py:328 seahub/views/sysadmin.py:1984 msgid "Email" msgstr "" @@ -634,21 +634,21 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:840 #: seahub/templates/js/sysadmin-templates.html:878 #: seahub/templates/js/templates.html:5 seahub/templates/js/templates.html:409 -#: seahub/templates/js/templates.html:1599 -#: seahub/templates/js/templates.html:1625 +#: seahub/templates/js/templates.html:1607 #: seahub/templates/js/templates.html:1633 #: seahub/templates/js/templates.html:1641 -#: seahub/templates/js/templates.html:1667 -#: seahub/templates/js/templates.html:1756 -#: seahub/templates/js/templates.html:1775 -#: seahub/templates/js/templates.html:1897 +#: seahub/templates/js/templates.html:1649 +#: seahub/templates/js/templates.html:1675 +#: seahub/templates/js/templates.html:1764 +#: seahub/templates/js/templates.html:1783 #: seahub/templates/js/templates.html:1905 -#: seahub/templates/js/templates.html:1985 -#: seahub/templates/js/templates.html:2004 -#: seahub/templates/js/templates.html:2235 -#: seahub/templates/js/templates.html:2352 -#: seahub/templates/js/templates.html:2386 -#: seahub/templates/js/templates.html:2421 seahub/templates/libraries.html:120 +#: seahub/templates/js/templates.html:1913 +#: seahub/templates/js/templates.html:1993 +#: seahub/templates/js/templates.html:2012 +#: seahub/templates/js/templates.html:2243 +#: seahub/templates/js/templates.html:2360 +#: seahub/templates/js/templates.html:2394 +#: seahub/templates/js/templates.html:2429 seahub/templates/libraries.html:120 #: seahub/templates/registration/registration_form.html:18 #: seahub/templates/repo_dir_recycle_view.html:44 #: seahub/templates/repo_history_view.html:58 @@ -674,8 +674,8 @@ msgstr "" #: seahub/templates/wiki/personal_wiki.html:43 #: seahub/templates/wiki/personal_wiki.html:85 #: seahub/templates/wiki/personal_wiki_pages.html:28 -#: seahub/views/sysadmin.py:323 seahub/views/sysadmin.py:327 -#: seahub/views/sysadmin.py:1177 seahub/views/sysadmin.py:1983 +#: seahub/views/sysadmin.py:324 seahub/views/sysadmin.py:328 +#: seahub/views/sysadmin.py:1178 seahub/views/sysadmin.py:1984 msgid "Name" msgstr "" @@ -685,8 +685,8 @@ msgstr "" #: seahub/institutions/templates/institutions/useradmin_search.html:19 #: seahub/templates/sysadmin/useradmin_table.html:6 #: seahub/templates/sysadmin/useradmin_table.html:10 -#: seahub/templates/sysadmin/userinfo.html:68 seahub/views/sysadmin.py:323 -#: seahub/views/sysadmin.py:327 +#: seahub/templates/sysadmin/userinfo.html:68 seahub/views/sysadmin.py:324 +#: seahub/views/sysadmin.py:328 msgid "Contact Email" msgstr "" @@ -702,32 +702,32 @@ msgstr "" #: seahub/templates/sysadmin/sys_org_info_user.html:20 #: seahub/templates/sysadmin/useradmin_table.html:7 #: seahub/templates/sysadmin/useradmin_table.html:11 -#: seahub/templates/sysadmin/userinfo.html:126 seahub/views/sysadmin.py:323 -#: seahub/views/sysadmin.py:327 +#: seahub/templates/sysadmin/userinfo.html:126 seahub/views/sysadmin.py:324 +#: seahub/views/sysadmin.py:328 msgid "Status" msgstr "" #: seahub/base/management/commands/export_users.py:43 #: seahub/institutions/templates/institutions/user_info.html:113 #: seahub/templates/js/sysadmin-templates.html:880 -#: seahub/templates/js/templates.html:1899 +#: seahub/templates/js/templates.html:1907 #: seahub/templates/sysadmin/sys_useradmin.html:52 #: seahub/templates/sysadmin/useradmin_table.html:8 -#: seahub/templates/sysadmin/userinfo.html:323 seahub/views/sysadmin.py:323 -#: seahub/views/sysadmin.py:1984 +#: seahub/templates/sysadmin/userinfo.html:323 seahub/views/sysadmin.py:324 +#: seahub/views/sysadmin.py:1985 msgid "Role" msgstr "" #: seahub/base/management/commands/export_users.py:44 #: seahub/base/management/commands/export_users.py:48 -#: seahub/views/sysadmin.py:324 seahub/views/sysadmin.py:328 +#: seahub/views/sysadmin.py:325 seahub/views/sysadmin.py:329 msgid "Space Usage" msgstr "" #: seahub/base/management/commands/export_users.py:44 #: seahub/base/management/commands/export_users.py:48 -#: seahub/views/sysadmin.py:324 seahub/views/sysadmin.py:328 -#: seahub/views/sysadmin.py:1985 +#: seahub/views/sysadmin.py:325 seahub/views/sysadmin.py:329 +#: seahub/views/sysadmin.py:1986 msgid "Space Quota" msgstr "" @@ -739,14 +739,14 @@ msgstr "" #: seahub/templates/sysadmin/sys_org_info_group.html:20 #: seahub/templates/sysadmin/sys_publink_admin.html:30 #: seahub/templates/sysadmin/sys_upload_link_admin.html:24 -#: seahub/templates/sysadmin/userinfo.html:324 seahub/views/sysadmin.py:325 -#: seahub/views/sysadmin.py:329 seahub/views/sysadmin.py:1177 +#: seahub/templates/sysadmin/userinfo.html:324 seahub/views/sysadmin.py:326 +#: seahub/views/sysadmin.py:330 seahub/views/sysadmin.py:1178 msgid "Create At" msgstr "" #: seahub/base/management/commands/export_users.py:45 #: seahub/base/management/commands/export_users.py:49 -#: seahub/views/sysadmin.py:325 seahub/views/sysadmin.py:329 +#: seahub/views/sysadmin.py:326 seahub/views/sysadmin.py:330 msgid "Last Login" msgstr "" @@ -757,22 +757,22 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:900 #: seahub/templates/js/sysadmin-templates.html:904 #: seahub/templates/js/sysadmin-templates.html:911 -#: seahub/templates/js/templates.html:1166 -#: seahub/templates/js/templates.html:1196 -#: seahub/templates/js/templates.html:1430 -#: seahub/templates/js/templates.html:1446 -#: seahub/templates/js/templates.html:1451 -#: seahub/templates/js/templates.html:1455 -#: seahub/templates/js/templates.html:1933 -#: seahub/templates/js/templates.html:1937 -#: seahub/templates/js/templates.html:1944 -#: seahub/templates/js/templates.html:2206 -#: seahub/templates/js/templates.html:2209 -#: seahub/templates/js/templates.html:2264 -#: seahub/templates/js/templates.html:2269 -#: seahub/templates/js/templates.html:2278 -#: seahub/templates/js/templates.html:2286 seahub/views/sysadmin.py:325 -#: seahub/views/sysadmin.py:329 seahub/views/sysadmin.py:721 +#: seahub/templates/js/templates.html:1174 +#: seahub/templates/js/templates.html:1204 +#: seahub/templates/js/templates.html:1438 +#: seahub/templates/js/templates.html:1454 +#: seahub/templates/js/templates.html:1459 +#: seahub/templates/js/templates.html:1463 +#: seahub/templates/js/templates.html:1941 +#: seahub/templates/js/templates.html:1945 +#: seahub/templates/js/templates.html:1952 +#: seahub/templates/js/templates.html:2214 +#: seahub/templates/js/templates.html:2217 +#: seahub/templates/js/templates.html:2272 +#: seahub/templates/js/templates.html:2277 +#: seahub/templates/js/templates.html:2286 +#: seahub/templates/js/templates.html:2294 seahub/views/sysadmin.py:326 +#: seahub/views/sysadmin.py:330 seahub/views/sysadmin.py:722 msgid "Admin" msgstr "" @@ -783,7 +783,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_useradmin_admins.html:17 #: seahub/templates/sysadmin/sys_useradmin_ldap.html:17 #: seahub/templates/sysadmin/sys_useradmin_paid.html:17 -#: seahub/views/sysadmin.py:325 seahub/views/sysadmin.py:329 +#: seahub/views/sysadmin.py:326 seahub/views/sysadmin.py:330 msgid "LDAP(imported)" msgstr "" @@ -798,7 +798,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_org_info_user.html:39 #: seahub/templates/sysadmin/useradmin_table.html:44 #: seahub/templates/sysadmin/useradmin_table.html:51 -#: seahub/views/sysadmin.py:383 +#: seahub/views/sysadmin.py:384 msgid "Active" msgstr "" @@ -813,7 +813,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_org_info_user.html:40 #: seahub/templates/sysadmin/useradmin_table.html:46 #: seahub/templates/sysadmin/useradmin_table.html:52 -#: seahub/views/sysadmin.py:385 +#: seahub/views/sysadmin.py:386 msgid "Inactive" msgstr "" @@ -821,7 +821,7 @@ msgstr "" #: seahub/base/management/commands/export_users.py:127 #: seahub/templates/base.html:130 seahub/templates/base_for_backbone.html:91 #: seahub/templates/sysadmin/sysadmin_backbone.html:70 -#: seahub/views/sysadmin.py:391 seahub/views/sysadmin.py:392 +#: seahub/views/sysadmin.py:392 seahub/views/sysadmin.py:393 msgid "Yes" msgstr "" @@ -830,7 +830,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_useradmin.html:55 #: seahub/templates/sysadmin/useradmin_table.html:60 #: seahub/templates/sysadmin/useradmin_table.html:70 -#: seahub/views/sysadmin.py:397 +#: seahub/views/sysadmin.py:398 msgid "Guest" msgstr "" @@ -840,7 +840,7 @@ msgstr "" #: seahub/templates/sysadmin/sys_useradmin.html:54 #: seahub/templates/sysadmin/useradmin_table.html:62 #: seahub/templates/sysadmin/useradmin_table.html:69 -#: seahub/views/sysadmin.py:399 seahub/views/sysadmin.py:403 +#: seahub/views/sysadmin.py:400 seahub/views/sysadmin.py:404 msgid "Default" msgstr "" @@ -905,7 +905,7 @@ msgid "Recovered deleted directory" msgstr "" #: seahub/base/templatetags/seahub_tags.py:159 -#: seahub/base/templatetags/seahub_tags.py:228 seahub/views/ajax.py:1120 +#: seahub/base/templatetags/seahub_tags.py:228 seahub/views/ajax.py:1185 msgid "Changed library name or description" msgstr "" @@ -957,30 +957,30 @@ msgstr[1] "" #: seahub/templates/js/sysadmin-templates.html:761 #: seahub/templates/js/sysadmin-templates.html:788 #: seahub/templates/js/templates.html:28 -#: seahub/templates/js/templates.html:1163 -#: seahub/templates/js/templates.html:1193 -#: seahub/templates/js/templates.html:1433 -#: seahub/templates/js/templates.html:1444 -#: seahub/templates/js/templates.html:1449 -#: seahub/templates/js/templates.html:1453 -#: seahub/templates/js/templates.html:1460 -#: seahub/templates/js/templates.html:1463 -#: seahub/templates/js/templates.html:1497 -#: seahub/templates/js/templates.html:1523 -#: seahub/templates/js/templates.html:1682 -#: seahub/templates/js/templates.html:1689 -#: seahub/templates/js/templates.html:2076 -#: seahub/templates/js/templates.html:2122 -#: seahub/templates/js/templates.html:2267 -#: seahub/templates/js/templates.html:2273 -#: seahub/templates/js/templates.html:2276 +#: seahub/templates/js/templates.html:1171 +#: seahub/templates/js/templates.html:1201 +#: seahub/templates/js/templates.html:1441 +#: seahub/templates/js/templates.html:1452 +#: seahub/templates/js/templates.html:1457 +#: seahub/templates/js/templates.html:1461 +#: seahub/templates/js/templates.html:1468 +#: seahub/templates/js/templates.html:1471 +#: seahub/templates/js/templates.html:1505 +#: seahub/templates/js/templates.html:1531 +#: seahub/templates/js/templates.html:1690 +#: seahub/templates/js/templates.html:1697 +#: seahub/templates/js/templates.html:2084 +#: seahub/templates/js/templates.html:2130 +#: seahub/templates/js/templates.html:2275 +#: seahub/templates/js/templates.html:2281 #: seahub/templates/js/templates.html:2284 #: seahub/templates/js/templates.html:2292 -#: seahub/templates/js/templates.html:2295 -#: seahub/templates/js/templates.html:2302 -#: seahub/templates/js/templates.html:2325 -#: seahub/templates/js/templates.html:2328 -#: seahub/templates/js/templates.html:2335 +#: seahub/templates/js/templates.html:2300 +#: seahub/templates/js/templates.html:2303 +#: seahub/templates/js/templates.html:2310 +#: seahub/templates/js/templates.html:2333 +#: seahub/templates/js/templates.html:2336 +#: seahub/templates/js/templates.html:2343 #: seahub/templates/sysadmin/sys_org_info_library.html:29 #: seahub/templates/sysadmin/userinfo.html:199 #: seahub/templates/sysadmin/userinfo.html:250 @@ -994,29 +994,29 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:762 #: seahub/templates/js/sysadmin-templates.html:789 #: seahub/templates/js/templates.html:29 -#: seahub/templates/js/templates.html:1164 -#: seahub/templates/js/templates.html:1194 -#: seahub/templates/js/templates.html:1435 -#: seahub/templates/js/templates.html:1445 -#: seahub/templates/js/templates.html:1450 -#: seahub/templates/js/templates.html:1454 -#: seahub/templates/js/templates.html:1461 -#: seahub/templates/js/templates.html:1464 -#: seahub/templates/js/templates.html:1498 -#: seahub/templates/js/templates.html:1524 -#: seahub/templates/js/templates.html:1690 -#: seahub/templates/js/templates.html:2077 -#: seahub/templates/js/templates.html:2123 -#: seahub/templates/js/templates.html:2268 -#: seahub/templates/js/templates.html:2277 -#: seahub/templates/js/templates.html:2281 +#: seahub/templates/js/templates.html:1172 +#: seahub/templates/js/templates.html:1202 +#: seahub/templates/js/templates.html:1443 +#: seahub/templates/js/templates.html:1453 +#: seahub/templates/js/templates.html:1458 +#: seahub/templates/js/templates.html:1462 +#: seahub/templates/js/templates.html:1469 +#: seahub/templates/js/templates.html:1472 +#: seahub/templates/js/templates.html:1506 +#: seahub/templates/js/templates.html:1532 +#: seahub/templates/js/templates.html:1698 +#: seahub/templates/js/templates.html:2085 +#: seahub/templates/js/templates.html:2131 +#: seahub/templates/js/templates.html:2276 #: seahub/templates/js/templates.html:2285 -#: seahub/templates/js/templates.html:2296 -#: seahub/templates/js/templates.html:2299 -#: seahub/templates/js/templates.html:2303 -#: seahub/templates/js/templates.html:2329 -#: seahub/templates/js/templates.html:2332 -#: seahub/templates/js/templates.html:2336 +#: seahub/templates/js/templates.html:2289 +#: seahub/templates/js/templates.html:2293 +#: seahub/templates/js/templates.html:2304 +#: seahub/templates/js/templates.html:2307 +#: seahub/templates/js/templates.html:2311 +#: seahub/templates/js/templates.html:2337 +#: seahub/templates/js/templates.html:2340 +#: seahub/templates/js/templates.html:2344 #: seahub/templates/sysadmin/userinfo.html:248 msgid "Read-Only" msgstr "" @@ -1111,18 +1111,18 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:718 #: seahub/templates/js/sysadmin-templates.html:901 #: seahub/templates/js/sysadmin-templates.html:908 -#: seahub/templates/js/templates.html:943 -#: seahub/templates/js/templates.html:989 -#: seahub/templates/js/templates.html:1439 -#: seahub/templates/js/templates.html:1934 -#: seahub/templates/js/templates.html:1941 -#: seahub/templates/js/templates.html:2265 -#: seahub/templates/js/templates.html:2274 +#: seahub/templates/js/templates.html:951 +#: seahub/templates/js/templates.html:997 +#: seahub/templates/js/templates.html:1447 +#: seahub/templates/js/templates.html:1942 +#: seahub/templates/js/templates.html:1949 +#: seahub/templates/js/templates.html:2273 #: seahub/templates/js/templates.html:2282 -#: seahub/templates/js/templates.html:2293 -#: seahub/templates/js/templates.html:2300 -#: seahub/templates/js/templates.html:2326 -#: seahub/templates/js/templates.html:2333 +#: seahub/templates/js/templates.html:2290 +#: seahub/templates/js/templates.html:2301 +#: seahub/templates/js/templates.html:2308 +#: seahub/templates/js/templates.html:2334 +#: seahub/templates/js/templates.html:2341 #: seahub/templates/repo_history.html:81 #: seahub/templates/sysadmin/sys_org_info_user.html:36 #: seahub/templates/sysadmin/useradmin_table.html:48 @@ -1156,17 +1156,17 @@ msgstr "" #: seahub/templates/js/templates.html:299 #: seahub/templates/js/templates.html:455 #: seahub/templates/js/templates.html:530 -#: seahub/templates/js/templates.html:607 -#: seahub/templates/js/templates.html:729 -#: seahub/templates/js/templates.html:810 -#: seahub/templates/js/templates.html:866 -#: seahub/templates/js/templates.html:1078 -#: seahub/templates/js/templates.html:1126 -#: seahub/templates/js/templates.html:1470 -#: seahub/templates/js/templates.html:1808 -#: seahub/templates/js/templates.html:1955 -#: seahub/templates/js/templates.html:1960 -#: seahub/templates/js/templates.html:2559 +#: seahub/templates/js/templates.html:608 +#: seahub/templates/js/templates.html:734 +#: seahub/templates/js/templates.html:817 +#: seahub/templates/js/templates.html:874 +#: seahub/templates/js/templates.html:1086 +#: seahub/templates/js/templates.html:1134 +#: seahub/templates/js/templates.html:1478 +#: seahub/templates/js/templates.html:1816 +#: seahub/templates/js/templates.html:1963 +#: seahub/templates/js/templates.html:1968 +#: seahub/templates/js/templates.html:2567 #: seahub/templates/snippets/file_share_popup.html:46 #: seahub/templates/sysadmin/org_admin_table.html:25 #: seahub/templates/sysadmin/sys_invitations_admin.html:49 @@ -1234,28 +1234,28 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:792 #: seahub/templates/js/sysadmin-templates.html:830 #: seahub/templates/js/templates.html:46 seahub/templates/js/templates.html:54 -#: seahub/templates/js/templates.html:945 -#: seahub/templates/js/templates.html:991 -#: seahub/templates/js/templates.html:1085 -#: seahub/templates/js/templates.html:1133 -#: seahub/templates/js/templates.html:1170 -#: seahub/templates/js/templates.html:1200 -#: seahub/templates/js/templates.html:1389 -#: seahub/templates/js/templates.html:1501 -#: seahub/templates/js/templates.html:1527 -#: seahub/templates/js/templates.html:1672 -#: seahub/templates/js/templates.html:1747 -#: seahub/templates/js/templates.html:1863 -#: seahub/templates/js/templates.html:1872 +#: seahub/templates/js/templates.html:953 +#: seahub/templates/js/templates.html:999 +#: seahub/templates/js/templates.html:1093 +#: seahub/templates/js/templates.html:1141 +#: seahub/templates/js/templates.html:1178 +#: seahub/templates/js/templates.html:1208 +#: seahub/templates/js/templates.html:1397 +#: seahub/templates/js/templates.html:1509 +#: seahub/templates/js/templates.html:1535 +#: seahub/templates/js/templates.html:1680 +#: seahub/templates/js/templates.html:1755 +#: seahub/templates/js/templates.html:1871 #: seahub/templates/js/templates.html:1880 -#: seahub/templates/js/templates.html:2041 -#: seahub/templates/js/templates.html:2081 -#: seahub/templates/js/templates.html:2094 -#: seahub/templates/js/templates.html:2127 -#: seahub/templates/js/templates.html:2140 -#: seahub/templates/js/templates.html:2158 -#: seahub/templates/js/templates.html:2519 -#: seahub/templates/js/templates.html:2545 seahub/templates/libraries.html:123 +#: seahub/templates/js/templates.html:1888 +#: seahub/templates/js/templates.html:2049 +#: seahub/templates/js/templates.html:2089 +#: seahub/templates/js/templates.html:2102 +#: seahub/templates/js/templates.html:2135 +#: seahub/templates/js/templates.html:2148 +#: seahub/templates/js/templates.html:2166 +#: seahub/templates/js/templates.html:2527 +#: seahub/templates/js/templates.html:2553 seahub/templates/libraries.html:123 #: seahub/templates/libraries.html:186 #: seahub/templates/registration/password_change_form.html:24 #: seahub/templates/registration/password_reset_confirm.html:19 @@ -1407,7 +1407,7 @@ msgstr "" msgid "Successfully Deleted %s" msgstr "" -#: seahub/forms.py:35 seahub/invitations/views.py:29 +#: seahub/forms.py:35 seahub/invitations/views.py:30 msgid "A user with this email already exists." msgstr "" @@ -1436,10 +1436,10 @@ msgstr "" msgid "Name %s is not valid" msgstr "" -#: seahub/forms.py:97 seahub/views/ajax.py:395 seahub/views/ajax.py:563 -#: seahub/views/ajax.py:836 seahub/views/ajax.py:840 seahub/views/ajax.py:844 -#: seahub/views/ajax.py:1107 seahub/views/file.py:1657 -#: seahub/views/sysadmin.py:1593 seahub/views/sysadmin.py:1611 +#: seahub/forms.py:97 seahub/views/ajax.py:407 seahub/views/ajax.py:619 +#: seahub/views/ajax.py:901 seahub/views/ajax.py:905 seahub/views/ajax.py:909 +#: seahub/views/ajax.py:1172 seahub/views/file.py:1664 +#: seahub/views/sysadmin.py:1594 seahub/views/sysadmin.py:1612 msgid "Argument missing" msgstr "" @@ -1563,10 +1563,10 @@ msgstr "" #: seahub/templates/js/lib-op-popups.html:88 #: seahub/templates/js/sysadmin-templates.html:4 #: seahub/templates/js/templates.html:144 -#: seahub/templates/js/templates.html:900 -#: seahub/templates/js/templates.html:1248 -#: seahub/templates/js/templates.html:2177 -#: seahub/templates/js/templates.html:2527 seahub/templates/libraries.html:149 +#: seahub/templates/js/templates.html:908 +#: seahub/templates/js/templates.html:1256 +#: seahub/templates/js/templates.html:2185 +#: seahub/templates/js/templates.html:2535 seahub/templates/libraries.html:149 #: seahub/templates/libraries.html:159 seahub/templates/libraries.html:171 #: seahub/templates/sysadmin/base.html:13 #: seahub/templates/sysadmin/sysadmin_backbone.html:30 @@ -1667,10 +1667,10 @@ msgstr "" #: seahub/templates/js/lib-op-popups.html:77 #: seahub/templates/js/lib-op-popups.html:121 #: seahub/templates/js/lib-op-popups.html:129 -#: seahub/templates/js/templates.html:1086 -#: seahub/templates/js/templates.html:1134 -#: seahub/templates/js/templates.html:2095 -#: seahub/templates/js/templates.html:2141 +#: seahub/templates/js/templates.html:1094 +#: seahub/templates/js/templates.html:1142 +#: seahub/templates/js/templates.html:2103 +#: seahub/templates/js/templates.html:2149 #: seahub/templates/repo_dir_recycle_view.html:74 #: seahub/templates/shared_file_view.html:74 #: seahub/templates/snippets/file_share_popup.html:58 @@ -1756,11 +1756,11 @@ msgid "Description is required." msgstr "" #: seahub/group/views.py:124 seahub/share/views.py:230 -#: seahub/views/__init__.py:468 seahub/views/__init__.py:596 -#: seahub/views/ajax.py:162 seahub/views/ajax.py:413 seahub/views/ajax.py:420 -#: seahub/views/ajax.py:470 seahub/views/ajax.py:477 seahub/views/ajax.py:582 -#: seahub/views/ajax.py:1087 seahub/views/file.py:1160 -#: seahub/views/file.py:1666 seahub/views/repo.py:123 +#: seahub/views/__init__.py:443 seahub/views/__init__.py:571 +#: seahub/views/ajax.py:165 seahub/views/ajax.py:425 seahub/views/ajax.py:432 +#: seahub/views/ajax.py:495 seahub/views/ajax.py:502 seahub/views/ajax.py:638 +#: seahub/views/ajax.py:1152 seahub/views/file.py:1165 +#: seahub/views/file.py:1673 seahub/views/repo.py:123 msgid "Permission denied" msgstr "" @@ -2259,8 +2259,8 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:34 #: seahub/templates/js/sysadmin-templates.html:161 #: seahub/templates/js/sysadmin-templates.html:810 -#: seahub/templates/js/templates.html:1346 -#: seahub/templates/js/templates.html:2229 seahub/templates/libraries.html:5 +#: seahub/templates/js/templates.html:1354 +#: seahub/templates/js/templates.html:2237 seahub/templates/libraries.html:5 #: seahub/templates/sysadmin/base.html:44 #: seahub/templates/sysadmin/sys_org_info_group.html:10 #: seahub/templates/sysadmin/sys_org_info_library.html:10 @@ -2306,7 +2306,7 @@ msgstr "" #: seahub/institutions/templates/institutions/user_info.html:40 #: seahub/templates/registration/registration_form.html:31 -#: seahub/templates/sysadmin/userinfo.html:92 seahub/views/sysadmin.py:1984 +#: seahub/templates/sysadmin/userinfo.html:92 seahub/views/sysadmin.py:1985 msgid "Department" msgstr "" @@ -2351,14 +2351,14 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:841 #: seahub/templates/js/templates.html:166 #: seahub/templates/js/templates.html:411 -#: seahub/templates/js/templates.html:924 -#: seahub/templates/js/templates.html:969 -#: seahub/templates/js/templates.html:1602 -#: seahub/templates/js/templates.html:1606 -#: seahub/templates/js/templates.html:1643 -#: seahub/templates/js/templates.html:1758 -#: seahub/templates/js/templates.html:1987 -#: seahub/templates/js/templates.html:2006 +#: seahub/templates/js/templates.html:932 +#: seahub/templates/js/templates.html:977 +#: seahub/templates/js/templates.html:1610 +#: seahub/templates/js/templates.html:1614 +#: seahub/templates/js/templates.html:1651 +#: seahub/templates/js/templates.html:1766 +#: seahub/templates/js/templates.html:1995 +#: seahub/templates/js/templates.html:2014 #: seahub/templates/repo_dir_recycle_view.html:46 #: seahub/templates/repo_history_view.html:59 #: seahub/templates/sysadmin/userinfo.html:189 @@ -2372,14 +2372,14 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:543 #: seahub/templates/js/templates.html:170 #: seahub/templates/js/templates.html:412 -#: seahub/templates/js/templates.html:933 -#: seahub/templates/js/templates.html:979 -#: seahub/templates/js/templates.html:1542 -#: seahub/templates/js/templates.html:1604 -#: seahub/templates/js/templates.html:1607 -#: seahub/templates/js/templates.html:1644 -#: seahub/templates/js/templates.html:1668 -#: seahub/templates/js/templates.html:1759 +#: seahub/templates/js/templates.html:941 +#: seahub/templates/js/templates.html:987 +#: seahub/templates/js/templates.html:1550 +#: seahub/templates/js/templates.html:1612 +#: seahub/templates/js/templates.html:1615 +#: seahub/templates/js/templates.html:1652 +#: seahub/templates/js/templates.html:1676 +#: seahub/templates/js/templates.html:1767 #: seahub/templates/sysadmin/userinfo.html:190 #: seahub/templates/sysadmin/userinfo.html:240 #: seahub/templates/view_shared_dir.html:52 @@ -2387,7 +2387,7 @@ msgid "Last Update" msgstr "" #: seahub/institutions/templates/institutions/user_info.html:75 -#: seahub/templates/js/templates.html:1680 +#: seahub/templates/js/templates.html:1688 #: seahub/templates/sysadmin/sys_org_info_library.html:27 #: seahub/templates/sysadmin/userinfo.html:197 #: seahub/templates/sysadmin/userinfo.html:246 @@ -2520,14 +2520,14 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:654 #: seahub/templates/js/sysadmin-templates.html:672 #: seahub/templates/js/sysadmin-templates.html:898 -#: seahub/templates/js/templates.html:1645 +#: seahub/templates/js/templates.html:1653 #: seahub/templates/sysadmin/sys_link_search.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:30 #: seahub/templates/sysadmin/sys_org_info_library.html:21 #: seahub/templates/sysadmin/sys_publink_admin.html:29 #: seahub/templates/sysadmin/sys_upload_link_admin.html:23 #: seahub/templates/sysadmin/sys_virus_scan_records.html:12 -#: seahub/views/sysadmin.py:719 +#: seahub/views/sysadmin.py:720 msgid "Owner" msgstr "" @@ -2535,18 +2535,18 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:903 #: seahub/templates/js/sysadmin-templates.html:907 #: seahub/templates/js/sysadmin-templates.html:910 -#: seahub/templates/js/templates.html:1936 -#: seahub/templates/js/templates.html:1940 -#: seahub/templates/js/templates.html:1943 seahub/views/sysadmin.py:723 +#: seahub/templates/js/templates.html:1944 +#: seahub/templates/js/templates.html:1948 +#: seahub/templates/js/templates.html:1951 seahub/views/sysadmin.py:724 msgid "Member" msgstr "" -#: seahub/institutions/views.py:195 seahub/views/sysadmin.py:828 +#: seahub/institutions/views.py:195 seahub/views/sysadmin.py:829 #, python-format msgid "Successfully deleted %s" msgstr "" -#: seahub/institutions/views.py:197 seahub/views/sysadmin.py:838 +#: seahub/institutions/views.py:197 seahub/views/sysadmin.py:839 msgid "Failed to delete: the user does not exist" msgstr "" @@ -2601,60 +2601,61 @@ msgstr "" msgid "Virus detected on %s" msgstr "" -#: seahub/notifications/management/commands/send_notices.py:28 -#: seahub/notifications/management/commands/send_notices.py:272 +#: seahub/notifications/management/commands/send_notices.py:29 +#: seahub/notifications/management/commands/send_notices.py:293 #, python-format msgid "New notice on %s" msgstr "" -#: seahub/notifications/models.py:437 seahub/notifications/models.py:479 -#: seahub/notifications/models.py:523 seahub/notifications/models.py:572 -#: seahub/notifications/models.py:604 seahub/notifications/models.py:622 -#: seahub/notifications/models.py:652 seahub/notifications/models.py:674 -#: seahub/utils/__init__.py:143 seahub/utils/__init__.py:1157 +#: seahub/notifications/models.py:454 seahub/notifications/models.py:496 +#: seahub/notifications/models.py:540 seahub/notifications/models.py:589 +#: seahub/notifications/models.py:621 seahub/notifications/models.py:639 +#: seahub/notifications/models.py:669 seahub/notifications/models.py:691 +#: seahub/notifications/models.py:717 seahub/utils/__init__.py:143 +#: seahub/utils/__init__.py:1157 msgid "Internal error" msgstr "" -#: seahub/notifications/models.py:456 +#: seahub/notifications/models.py:473 #, python-format msgid "" "A file named %(file_name)s is uploaded to %(name)s" msgstr "" -#: seahub/notifications/models.py:463 +#: seahub/notifications/models.py:480 #, python-format msgid "" "A file named %(file_name)s is uploaded to Deleted " "Library" msgstr "" -#: seahub/notifications/models.py:505 +#: seahub/notifications/models.py:522 #, python-format msgid "" "%(user)s has shared a library named %(repo_name)s to " "you." msgstr "" -#: seahub/notifications/models.py:552 +#: seahub/notifications/models.py:569 #, python-format msgid "" "%(user)s has shared a library named %(repo_name)s to group %(group_name)s." msgstr "" -#: seahub/notifications/models.py:583 +#: seahub/notifications/models.py:600 #, python-format msgid "%(group_name)s has a new discussion." msgstr "" -#: seahub/notifications/models.py:587 +#: seahub/notifications/models.py:604 #, python-format msgid "" "%(user)s posted a new discussion in %(group_name)s." msgstr "" -#: seahub/notifications/models.py:633 +#: seahub/notifications/models.py:650 #, python-format msgid "" "User %(username)s has asked to join group %(group_staff)s has added you to group " "%(group_name)s" msgstr "" -#: seahub/notifications/models.py:688 +#: seahub/notifications/models.py:705 #, python-format msgid "" "File %(file_name)s has a new comment from user " "%(author)s" msgstr "" +#: seahub/notifications/models.py:728 +#: seahub/notifications/templates/notifications/notice_email.html:57 +#, python-format +msgid "" +"Guest %(user)s accepted your invitation at %(time)s." +msgstr "" + #: seahub/notifications/templates/notifications/notice_email.html:7 #, python-format msgid "Hi, %(name)s" @@ -2766,7 +2775,7 @@ msgid "" "comment from user %(author)s" msgstr "" -#: seahub/notifications/templates/notifications/notice_email.html:64 +#: seahub/notifications/templates/notifications/notice_email.html:67 msgid "Go check out at the following page:" msgstr "" @@ -2866,8 +2875,8 @@ msgstr "" #: seahub/templates/base.html:73 #: seahub/templates/js/sysadmin-templates.html:28 #: seahub/templates/js/sysadmin-templates.html:324 -#: seahub/templates/js/templates.html:1409 -#: seahub/templates/js/templates.html:2201 seahub/templates/libraries.html:150 +#: seahub/templates/js/templates.html:1417 +#: seahub/templates/js/templates.html:2209 seahub/templates/libraries.html:150 #: seahub/templates/sysadmin/base.html:38 #: seahub/templates/sysadmin/settings.html:7 #: seahub/templates/sysadmin/sys_org_info_group.html:11 @@ -2888,7 +2897,7 @@ msgstr "" #: seahub/profile/templates/profile/set_profile.html:26 #: seahub/profile/templates/profile/set_profile.html:139 #: seahub/templates/sysadmin/userinfo.html:123 -#: seahub/two_factor/templates/two_factor/core/login.html:6 +#: seahub/two_factor/templates/two_factor/core/login.html:7 msgid "Two-Factor Authentication" msgstr "" @@ -3045,9 +3054,9 @@ msgstr "" #: seahub/profile/templates/profile/set_profile.html:282 #: seahub/templates/js/sysadmin-templates.html:1000 #: seahub/templates/sysadmin/settings.html:211 -#: seahub/templates/sysadmin/settings.html:249 seahub/views/sysadmin.py:1325 -#: seahub/views/sysadmin.py:1382 seahub/views/sysadmin.py:2261 -#: seahub/views/sysadmin.py:2343 seahub/views/sysadmin.py:2514 +#: seahub/templates/sysadmin/settings.html:249 seahub/views/sysadmin.py:1326 +#: seahub/views/sysadmin.py:1383 seahub/views/sysadmin.py:2274 +#: seahub/views/sysadmin.py:2356 seahub/views/sysadmin.py:2527 msgid "Success" msgstr "" @@ -3140,9 +3149,9 @@ msgid "" msgstr "" #: seahub/share/views.py:336 seahub/thumbnail/views.py:40 -#: seahub/thumbnail/views.py:159 seahub/views/ajax.py:209 -#: seahub/views/ajax.py:388 seahub/views/ajax.py:452 seahub/views/ajax.py:502 -#: seahub/views/ajax.py:551 seahub/views/ajax.py:745 seahub/views/ajax.py:1078 +#: seahub/thumbnail/views.py:159 seahub/views/ajax.py:212 +#: seahub/views/ajax.py:400 seahub/views/ajax.py:477 seahub/views/ajax.py:541 +#: seahub/views/ajax.py:607 seahub/views/ajax.py:810 seahub/views/ajax.py:1143 msgid "Library does not exist." msgstr "" @@ -3194,19 +3203,19 @@ msgid "View profile and more" msgstr "" #: seahub/templates/base.html:76 seahub/templates/js/sysadmin-templates.html:5 -#: seahub/templates/js/templates.html:2203 +#: seahub/templates/js/templates.html:2211 #: seahub/templates/sysadmin/base.html:15 msgid "System Admin" msgstr "" -#: seahub/templates/base.html:79 seahub/templates/js/templates.html:2206 +#: seahub/templates/base.html:79 seahub/templates/js/templates.html:2214 msgid "Organization Admin" msgstr "" #: seahub/templates/base.html:85 seahub/templates/base_for_backbone.html:65 #: seahub/templates/finish_payment.html:5 #: seahub/templates/js/sysadmin-templates.html:326 -#: seahub/templates/js/templates.html:2211 +#: seahub/templates/js/templates.html:2219 msgid "Log out" msgstr "" @@ -3223,7 +3232,7 @@ msgstr "" #: seahub/templates/base_for_backbone.html:58 #: seahub/templates/js/sysadmin-templates.html:64 -#: seahub/templates/js/templates.html:2178 +#: seahub/templates/js/templates.html:2186 #: seahub/templates/sysadmin/base.html:74 msgid "Notifications" msgstr "" @@ -3286,9 +3295,9 @@ msgstr "" #: seahub/templates/js/templates.html:449 #: seahub/templates/js/templates.html:525 #: seahub/templates/js/templates.html:602 -#: seahub/templates/js/templates.html:724 -#: seahub/templates/js/templates.html:805 -#: seahub/templates/js/templates.html:859 +#: seahub/templates/js/templates.html:728 +#: seahub/templates/js/templates.html:811 +#: seahub/templates/js/templates.html:867 #: seahub/templates/repo_history_view.html:79 #: seahub/templates/shared_file_view.html:53 #: seahub/templates/shared_file_view.html:85 @@ -3307,9 +3316,9 @@ msgid "Download" msgstr "" #: seahub/templates/file_access.html:5 seahub/templates/file_access.html:8 -#: seahub/templates/js/templates.html:633 -#: seahub/templates/js/templates.html:757 -#: seahub/templates/js/templates.html:836 +#: seahub/templates/js/templates.html:637 +#: seahub/templates/js/templates.html:763 +#: seahub/templates/js/templates.html:844 msgid "Access Log" msgstr "" @@ -3322,9 +3331,9 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:224 #: seahub/templates/js/sysadmin-templates.html:279 #: seahub/templates/js/sysadmin-templates.html:749 -#: seahub/templates/js/templates.html:1151 -#: seahub/templates/js/templates.html:1485 -#: seahub/templates/js/templates.html:2059 +#: seahub/templates/js/templates.html:1159 +#: seahub/templates/js/templates.html:1493 +#: seahub/templates/js/templates.html:2067 #: seahub/templates/sysadmin/settings.html:41 #: seahub/templates/sysadmin/sys_trafficadmin.html:26 msgid "User" @@ -3418,9 +3427,9 @@ msgstr "" #: seahub/templates/file_edit.html:130 #: seahub/templates/js/sysadmin-templates.html:282 -#: seahub/templates/js/templates.html:1541 -#: seahub/templates/js/templates.html:2387 -#: seahub/templates/js/templates.html:2422 +#: seahub/templates/js/templates.html:1549 +#: seahub/templates/js/templates.html:2395 +#: seahub/templates/js/templates.html:2430 #: seahub/templates/sysadmin/settings.html:118 #: seahub/templates/sysadmin/sys_virus_scan_records.html:11 msgid "Library" @@ -3510,7 +3519,7 @@ msgstr "" msgid "Link" msgstr "" -#: seahub/templates/file_edit.html:415 seahub/templates/js/templates.html:2025 +#: seahub/templates/file_edit.html:415 seahub/templates/js/templates.html:2033 #: seahub/templates/repo_history_view.html:74 #: seahub/templates/snippets/repo_dir_trash_tr.html:21 #: seahub/templates/sysadmin/sys_statistic_file.html:13 @@ -3598,12 +3607,12 @@ msgstr "" #: seahub/templates/file_revisions.html:6 #: seahub/templates/js/templates.html:368 -#: seahub/templates/js/templates.html:631 -#: seahub/templates/js/templates.html:651 -#: seahub/templates/js/templates.html:754 -#: seahub/templates/js/templates.html:763 -#: seahub/templates/js/templates.html:834 -#: seahub/templates/js/templates.html:842 seahub/templates/repo_history.html:6 +#: seahub/templates/js/templates.html:635 +#: seahub/templates/js/templates.html:655 +#: seahub/templates/js/templates.html:760 +#: seahub/templates/js/templates.html:769 +#: seahub/templates/js/templates.html:842 +#: seahub/templates/js/templates.html:850 seahub/templates/repo_history.html:6 #: seahub/templates/view_file_base.html:79 msgid "History" msgstr "" @@ -3650,8 +3659,8 @@ msgid "Restore" msgstr "" #: seahub/templates/file_revisions.html:89 -#: seahub/templates/js/templates.html:2452 -#: seahub/templates/js/templates.html:2463 +#: seahub/templates/js/templates.html:2460 +#: seahub/templates/js/templates.html:2471 msgid "View" msgstr "" @@ -3676,92 +3685,92 @@ msgstr "" #: seahub/templates/home_base.html:9 #: seahub/templates/js/sysadmin-templates.html:161 #: seahub/templates/js/templates.html:162 -#: seahub/templates/js/templates.html:965 -#: seahub/templates/js/templates.html:1249 +#: seahub/templates/js/templates.html:973 +#: seahub/templates/js/templates.html:1257 msgid "Files" msgstr "" #: seahub/templates/home_base.html:12 seahub/templates/js/templates.html:385 #: seahub/templates/js/templates.html:387 -#: seahub/templates/js/templates.html:1253 seahub/templates/libraries.html:13 +#: seahub/templates/js/templates.html:1261 seahub/templates/libraries.html:13 #: seahub/templates/libraries.html.py:39 msgid "My Libraries" msgstr "" #: seahub/templates/home_base.html:14 seahub/templates/js/templates.html:387 -#: seahub/templates/js/templates.html:1258 seahub/templates/libraries.html:57 +#: seahub/templates/js/templates.html:1266 seahub/templates/libraries.html:57 msgid "Shared with me" msgstr "" #: seahub/templates/home_base.html:16 seahub/templates/js/templates.html:383 -#: seahub/templates/js/templates.html:1263 seahub/templates/libraries.html:73 +#: seahub/templates/js/templates.html:1271 seahub/templates/libraries.html:73 msgid "Shared with all" msgstr "" -#: seahub/templates/home_base.html:21 seahub/templates/js/templates.html:1269 -#: seahub/templates/js/templates.html:1286 -#: seahub/templates/js/templates.html:1289 +#: seahub/templates/home_base.html:21 seahub/templates/js/templates.html:1277 +#: seahub/templates/js/templates.html:1294 +#: seahub/templates/js/templates.html:1297 msgid "Shared with groups" msgstr "" -#: seahub/templates/home_base.html:24 seahub/templates/js/templates.html:1271 -#: seahub/templates/js/templates.html:1293 +#: seahub/templates/home_base.html:24 seahub/templates/js/templates.html:1279 +#: seahub/templates/js/templates.html:1301 msgid "All Groups" msgstr "" -#: seahub/templates/home_base.html:36 seahub/templates/js/templates.html:1306 +#: seahub/templates/home_base.html:36 seahub/templates/js/templates.html:1314 msgid "Tools" msgstr "" -#: seahub/templates/home_base.html:39 seahub/templates/js/templates.html:1315 +#: seahub/templates/home_base.html:39 seahub/templates/js/templates.html:1323 #: seahub/templates/libraries.html:193 msgid "Favorites" msgstr "" -#: seahub/templates/home_base.html:41 seahub/templates/js/templates.html:1319 +#: seahub/templates/home_base.html:41 seahub/templates/js/templates.html:1327 msgid "Activities" msgstr "" #: seahub/templates/home_base.html:45 seahub/templates/home_base.html.py:81 -#: seahub/templates/js/templates.html:1327 -#: seahub/templates/js/templates.html:1383 +#: seahub/templates/js/templates.html:1335 +#: seahub/templates/js/templates.html:1391 #: seahub/templates/wiki/personal_wiki.html:6 #: seahub/templates/wiki/personal_wiki_pages.html:6 msgid "Personal Wiki" msgstr "" -#: seahub/templates/home_base.html:48 seahub/templates/js/templates.html:1333 +#: seahub/templates/home_base.html:48 seahub/templates/js/templates.html:1341 #: seahub/templates/libraries.html:212 msgid "Linked Devices" msgstr "" -#: seahub/templates/home_base.html:51 seahub/templates/js/templates.html:1337 -#: seahub/templates/js/templates.html:2477 -#: seahub/templates/js/templates.html:2478 -#: seahub/templates/js/templates.html:2515 +#: seahub/templates/home_base.html:51 seahub/templates/js/templates.html:1345 +#: seahub/templates/js/templates.html:2485 +#: seahub/templates/js/templates.html:2486 +#: seahub/templates/js/templates.html:2523 msgid "Invite People" msgstr "" -#: seahub/templates/home_base.html:56 seahub/templates/js/templates.html:1342 +#: seahub/templates/home_base.html:56 seahub/templates/js/templates.html:1350 msgid "Share Admin" msgstr "" -#: seahub/templates/home_base.html:60 seahub/templates/js/templates.html:961 -#: seahub/templates/js/templates.html:1349 -#: seahub/templates/js/templates.html:2346 +#: seahub/templates/home_base.html:60 seahub/templates/js/templates.html:969 +#: seahub/templates/js/templates.html:1357 +#: seahub/templates/js/templates.html:2354 msgid "Folders" msgstr "" #: seahub/templates/home_base.html:62 #: seahub/templates/js/sysadmin-templates.html:70 -#: seahub/templates/js/templates.html:1354 -#: seahub/templates/js/templates.html:1358 +#: seahub/templates/js/templates.html:1362 +#: seahub/templates/js/templates.html:1366 #: seahub/templates/sysadmin/base.html:80 msgid "Links" msgstr "" -#: seahub/templates/home_base.html:74 seahub/templates/js/templates.html:1309 -#: seahub/templates/js/templates.html:1372 +#: seahub/templates/home_base.html:74 seahub/templates/js/templates.html:1317 +#: seahub/templates/js/templates.html:1380 msgid "Enable Modules" msgstr "" @@ -3769,12 +3778,12 @@ msgstr "" msgid "Upload Folder" msgstr "" -#: seahub/templates/i18n.html:7 seahub/templates/js/templates.html:1043 +#: seahub/templates/i18n.html:7 seahub/templates/js/templates.html:1051 #: seahub/templates/snippets/file_share_popup.html:26 msgid "Add auto expiration" msgstr "" -#: seahub/templates/i18n.html:8 seahub/templates/js/templates.html:1046 +#: seahub/templates/i18n.html:8 seahub/templates/js/templates.html:1054 #: seahub/templates/snippets/file_share_popup.html:29 msgid "Days" msgstr "" @@ -4012,7 +4021,7 @@ msgid "No connected devices" msgstr "" #: seahub/templates/js/sysadmin-templates.html:253 -#: seahub/templates/js/templates.html:2169 +#: seahub/templates/js/templates.html:2177 msgid "Unlink" msgstr "" @@ -4053,7 +4062,7 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:360 #: seahub/templates/js/sysadmin-templates.html:392 #: seahub/templates/js/templates.html:4 -#: seahub/templates/js/templates.html:1400 seahub/templates/libraries.html:15 +#: seahub/templates/js/templates.html:1408 seahub/templates/libraries.html:15 msgid "New Library" msgstr "" @@ -4085,7 +4094,7 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:686 #: seahub/templates/js/templates.html:71 #: seahub/templates/js/templates.html:120 -#: seahub/templates/js/templates.html:1820 +#: seahub/templates/js/templates.html:1828 #: seahub/templates/sysadmin/userinfo.html:219 msgid "Transfer" msgstr "" @@ -4096,9 +4105,9 @@ msgstr "" #: seahub/templates/js/templates.html:460 #: seahub/templates/js/templates.html:482 #: seahub/templates/js/templates.html:522 -#: seahub/templates/js/templates.html:612 -#: seahub/templates/js/templates.html:645 -#: seahub/templates/js/templates.html:721 +#: seahub/templates/js/templates.html:614 +#: seahub/templates/js/templates.html:649 +#: seahub/templates/js/templates.html:725 msgid "More Operations" msgstr "" @@ -4113,11 +4122,11 @@ msgstr "" #: seahub/templates/js/templates.html:452 #: seahub/templates/js/templates.html:527 #: seahub/templates/js/templates.html:604 -#: seahub/templates/js/templates.html:726 -#: seahub/templates/js/templates.html:807 -#: seahub/templates/js/templates.html:862 -#: seahub/templates/js/templates.html:1219 -#: seahub/templates/js/templates.html:1239 +#: seahub/templates/js/templates.html:730 +#: seahub/templates/js/templates.html:813 +#: seahub/templates/js/templates.html:870 +#: seahub/templates/js/templates.html:1227 +#: seahub/templates/js/templates.html:1247 #: seahub/templates/view_file_base.html:74 msgid "Share" msgstr "" @@ -4134,8 +4143,8 @@ msgid "Tip: libraries deleted 30 days ago will be cleaned automatically." msgstr "" #: seahub/templates/js/sysadmin-templates.html:501 -#: seahub/templates/js/templates.html:1626 -#: seahub/templates/js/templates.html:1633 +#: seahub/templates/js/templates.html:1634 +#: seahub/templates/js/templates.html:1641 msgid "Deleted Time" msgstr "" @@ -4182,12 +4191,12 @@ msgid "Tip: you can search by keyword in name." msgstr "" #: seahub/templates/js/sysadmin-templates.html:739 -#: seahub/templates/js/templates.html:1014 +#: seahub/templates/js/templates.html:1022 msgid "Share to user" msgstr "" #: seahub/templates/js/sysadmin-templates.html:740 -#: seahub/templates/js/templates.html:1015 +#: seahub/templates/js/templates.html:1023 msgid "Share to group" msgstr "" @@ -4195,28 +4204,28 @@ msgstr "" #: seahub/templates/js/sysadmin-templates.html:777 #: seahub/templates/js/templates.html:470 #: seahub/templates/js/templates.html:545 -#: seahub/templates/js/templates.html:881 -#: seahub/templates/js/templates.html:1152 -#: seahub/templates/js/templates.html:1182 -#: seahub/templates/js/templates.html:1486 -#: seahub/templates/js/templates.html:1512 -#: seahub/templates/js/templates.html:1669 -#: seahub/templates/js/templates.html:2061 -#: seahub/templates/js/templates.html:2105 -#: seahub/templates/js/templates.html:2237 -#: seahub/templates/js/templates.html:2354 +#: seahub/templates/js/templates.html:889 +#: seahub/templates/js/templates.html:1160 +#: seahub/templates/js/templates.html:1190 +#: seahub/templates/js/templates.html:1494 +#: seahub/templates/js/templates.html:1520 +#: seahub/templates/js/templates.html:1677 +#: seahub/templates/js/templates.html:2069 +#: seahub/templates/js/templates.html:2113 +#: seahub/templates/js/templates.html:2245 +#: seahub/templates/js/templates.html:2362 msgid "Permission" msgstr "" #: seahub/templates/js/sysadmin-templates.html:776 -#: seahub/templates/js/templates.html:1181 -#: seahub/templates/js/templates.html:1511 -#: seahub/templates/js/templates.html:2103 +#: seahub/templates/js/templates.html:1189 +#: seahub/templates/js/templates.html:1519 +#: seahub/templates/js/templates.html:2111 msgid "Group" msgstr "" #: seahub/templates/js/sysadmin-templates.html:813 -#: seahub/templates/js/templates.html:1410 seahub/templates/libraries.html:160 +#: seahub/templates/js/templates.html:1418 seahub/templates/libraries.html:160 #: seahub/templates/sysadmin/sys_inst_info_admins.html:7 #: seahub/templates/sysadmin/sys_inst_info_user.html:13 #: seahub/templates/sysadmin/sys_org_info_group.html:8 @@ -4242,8 +4251,8 @@ msgstr "" #: seahub/templates/js/templates.html:257 #: seahub/templates/js/templates.html:270 #: seahub/templates/js/templates.html:289 -#: seahub/templates/js/templates.html:2309 -#: seahub/templates/js/templates.html:2341 +#: seahub/templates/js/templates.html:2317 +#: seahub/templates/js/templates.html:2349 msgid "Unshare" msgstr "" @@ -4288,7 +4297,7 @@ msgid "Template" msgstr "" #: seahub/templates/js/templates.html:17 -#: seahub/templates/js/templates.html:1603 +#: seahub/templates/js/templates.html:1611 msgid "Storage backend" msgstr "" @@ -4301,14 +4310,14 @@ msgid "Encrypt" msgstr "" #: seahub/templates/js/templates.html:39 -#: seahub/templates/js/templates.html:2153 +#: seahub/templates/js/templates.html:2161 #, python-format msgid "(at least %(repo_password_min_length)s characters)" msgstr "" #: seahub/templates/js/templates.html:41 -#: seahub/templates/js/templates.html:1037 -#: seahub/templates/js/templates.html:1110 +#: seahub/templates/js/templates.html:1045 +#: seahub/templates/js/templates.html:1118 #: seahub/templates/snippets/file_share_popup.html:20 msgid "Password again" msgstr "" @@ -4321,12 +4330,12 @@ msgstr "" #: seahub/templates/js/templates.html:119 #: seahub/templates/js/templates.html:463 #: seahub/templates/js/templates.html:531 -#: seahub/templates/js/templates.html:615 -#: seahub/templates/js/templates.html:730 -#: seahub/templates/js/templates.html:811 -#: seahub/templates/js/templates.html:867 -#: seahub/templates/js/templates.html:1819 -#: seahub/templates/js/templates.html:1838 +#: seahub/templates/js/templates.html:618 +#: seahub/templates/js/templates.html:735 +#: seahub/templates/js/templates.html:818 +#: seahub/templates/js/templates.html:875 +#: seahub/templates/js/templates.html:1827 +#: seahub/templates/js/templates.html:1846 msgid "Rename" msgstr "" @@ -4351,15 +4360,15 @@ msgstr "" #: seahub/templates/js/templates.html:487 #: seahub/templates/js/templates.html:547 #: seahub/templates/js/templates.html:549 -#: seahub/templates/js/templates.html:635 -#: seahub/templates/js/templates.html:652 -#: seahub/templates/js/templates.html:760 -#: seahub/templates/js/templates.html:764 -#: seahub/templates/js/templates.html:838 -#: seahub/templates/js/templates.html:843 -#: seahub/templates/js/templates.html:883 -#: seahub/templates/js/templates.html:885 -#: seahub/templates/js/templates.html:1710 +#: seahub/templates/js/templates.html:639 +#: seahub/templates/js/templates.html:656 +#: seahub/templates/js/templates.html:766 +#: seahub/templates/js/templates.html:770 +#: seahub/templates/js/templates.html:846 +#: seahub/templates/js/templates.html:851 +#: seahub/templates/js/templates.html:891 +#: seahub/templates/js/templates.html:893 +#: seahub/templates/js/templates.html:1718 #: seahub/templates/repo_history.html:53 msgid "Details" msgstr "" @@ -4372,10 +4381,10 @@ msgstr "" #: seahub/templates/js/templates.html:297 #: seahub/templates/js/templates.html:464 #: seahub/templates/js/templates.html:532 -#: seahub/templates/js/templates.html:616 -#: seahub/templates/js/templates.html:731 -#: seahub/templates/js/templates.html:812 -#: seahub/templates/js/templates.html:868 +#: seahub/templates/js/templates.html:619 +#: seahub/templates/js/templates.html:736 +#: seahub/templates/js/templates.html:819 +#: seahub/templates/js/templates.html:876 msgid "Move" msgstr "" @@ -4385,14 +4394,14 @@ msgstr "" #: seahub/templates/js/templates.html:485 #: seahub/templates/js/templates.html:533 #: seahub/templates/js/templates.html:537 -#: seahub/templates/js/templates.html:617 -#: seahub/templates/js/templates.html:648 -#: seahub/templates/js/templates.html:732 -#: seahub/templates/js/templates.html:746 -#: seahub/templates/js/templates.html:813 -#: seahub/templates/js/templates.html:825 -#: seahub/templates/js/templates.html:869 -#: seahub/templates/js/templates.html:872 +#: seahub/templates/js/templates.html:621 +#: seahub/templates/js/templates.html:652 +#: seahub/templates/js/templates.html:738 +#: seahub/templates/js/templates.html:752 +#: seahub/templates/js/templates.html:821 +#: seahub/templates/js/templates.html:833 +#: seahub/templates/js/templates.html:877 +#: seahub/templates/js/templates.html:880 msgid "Copy" msgstr "" @@ -4452,118 +4461,118 @@ msgstr "" #: seahub/templates/js/templates.html:410 #: seahub/templates/js/templates.html:427 -#: seahub/templates/js/templates.html:1600 -#: seahub/templates/js/templates.html:1618 -#: seahub/templates/js/templates.html:1627 -#: seahub/templates/js/templates.html:1634 +#: seahub/templates/js/templates.html:1608 +#: seahub/templates/js/templates.html:1626 +#: seahub/templates/js/templates.html:1635 #: seahub/templates/js/templates.html:1642 -#: seahub/templates/js/templates.html:1656 +#: seahub/templates/js/templates.html:1650 +#: seahub/templates/js/templates.html:1664 msgid "Actions" msgstr "" #: seahub/templates/js/templates.html:423 -#: seahub/templates/js/templates.html:1615 -#: seahub/templates/js/templates.html:1652 +#: seahub/templates/js/templates.html:1623 +#: seahub/templates/js/templates.html:1660 msgid "Sort:" msgstr "" #: seahub/templates/js/templates.html:425 -#: seahub/templates/js/templates.html:1617 -#: seahub/templates/js/templates.html:1654 +#: seahub/templates/js/templates.html:1625 +#: seahub/templates/js/templates.html:1662 msgid "last update" msgstr "" #: seahub/templates/js/templates.html:476 -#: seahub/templates/js/templates.html:639 -#: seahub/templates/js/templates.html:850 -#: seahub/templates/js/templates.html:892 +#: seahub/templates/js/templates.html:643 +#: seahub/templates/js/templates.html:858 +#: seahub/templates/js/templates.html:900 msgid "Open via Client" msgstr "" #: seahub/templates/js/templates.html:568 -#: seahub/templates/js/templates.html:678 +#: seahub/templates/js/templates.html:682 #: seahub/templates/view_file_base.html:39 msgid "starred" msgstr "" #: seahub/templates/js/templates.html:570 -#: seahub/templates/js/templates.html:680 +#: seahub/templates/js/templates.html:684 #: seahub/templates/view_file_base.html:41 msgid "unstarred" msgstr "" #: seahub/templates/js/templates.html:586 -#: seahub/templates/js/templates.html:696 -#: seahub/templates/js/templates.html:783 +#: seahub/templates/js/templates.html:700 +#: seahub/templates/js/templates.html:789 #: seahub/templates/view_file_base.html:45 msgid "locked" msgstr "" -#: seahub/templates/js/templates.html:621 -#: seahub/templates/js/templates.html:736 -#: seahub/templates/js/templates.html:817 +#: seahub/templates/js/templates.html:625 +#: seahub/templates/js/templates.html:742 +#: seahub/templates/js/templates.html:825 #: seahub/templates/view_file_base.html:65 #: seahub/templates/view_file_base.html:67 msgid "Unlock" msgstr "" -#: seahub/templates/js/templates.html:624 -#: seahub/templates/js/templates.html:739 -#: seahub/templates/js/templates.html:820 +#: seahub/templates/js/templates.html:628 +#: seahub/templates/js/templates.html:745 +#: seahub/templates/js/templates.html:828 #: seahub/templates/view_file_base.html:64 #: seahub/templates/view_file_base.html:68 msgid "Lock" msgstr "" -#: seahub/templates/js/templates.html:630 -#: seahub/templates/js/templates.html:650 -#: seahub/templates/js/templates.html:753 -#: seahub/templates/js/templates.html:762 -#: seahub/templates/js/templates.html:833 +#: seahub/templates/js/templates.html:634 +#: seahub/templates/js/templates.html:654 +#: seahub/templates/js/templates.html:759 +#: seahub/templates/js/templates.html:768 #: seahub/templates/js/templates.html:841 +#: seahub/templates/js/templates.html:849 #: seahub/templates/view_file_base.html:89 msgid "Comment" msgstr "" -#: seahub/templates/js/templates.html:663 -#: seahub/templates/js/templates.html:713 +#: seahub/templates/js/templates.html:667 +#: seahub/templates/js/templates.html:717 msgid "Fetch failed" msgstr "" -#: seahub/templates/js/templates.html:928 -#: seahub/templates/js/templates.html:974 +#: seahub/templates/js/templates.html:936 +#: seahub/templates/js/templates.html:982 msgid "Location" msgstr "" -#: seahub/templates/js/templates.html:939 -#: seahub/templates/js/templates.html:985 +#: seahub/templates/js/templates.html:947 +#: seahub/templates/js/templates.html:993 msgid "Tags" msgstr "" -#: seahub/templates/js/templates.html:1007 +#: seahub/templates/js/templates.html:1015 #: seahub/templates/snippets/file_share_popup.html:6 msgid "Download Link" msgstr "" -#: seahub/templates/js/templates.html:1011 +#: seahub/templates/js/templates.html:1019 msgid "Upload Link" msgstr "" -#: seahub/templates/js/templates.html:1028 -#: seahub/templates/js/templates.html:1101 +#: seahub/templates/js/templates.html:1036 +#: seahub/templates/js/templates.html:1109 #: seahub/templates/snippets/file_share_popup.html:15 msgid "Add password protection" msgstr "" -#: seahub/templates/js/templates.html:1031 -#: seahub/templates/js/templates.html:1104 +#: seahub/templates/js/templates.html:1039 +#: seahub/templates/js/templates.html:1112 #: seahub/templates/snippets/file_share_popup.html:18 #, python-format msgid "(at least %(share_link_password_min_length)s characters)" msgstr "" -#: seahub/templates/js/templates.html:1034 -#: seahub/templates/js/templates.html:1107 +#: seahub/templates/js/templates.html:1042 +#: seahub/templates/js/templates.html:1115 #: seahub/templates/sysadmin/sys_org_info_user.html:74 #: seahub/templates/sysadmin/sys_org_info_user.html:98 #: seahub/templates/sysadmin/sys_useradmin.html:64 @@ -4571,269 +4580,270 @@ msgstr "" msgid "Show" msgstr "" -#: seahub/templates/js/templates.html:1035 -#: seahub/templates/js/templates.html:1108 +#: seahub/templates/js/templates.html:1043 +#: seahub/templates/js/templates.html:1116 #: seahub/templates/sysadmin/sys_org_info_user.html:75 #: seahub/templates/sysadmin/sys_useradmin.html:65 msgid "Generate a random password" msgstr "" -#: seahub/templates/js/templates.html:1053 +#: seahub/templates/js/templates.html:1061 #: seahub/templates/snippets/file_share_popup.html:36 msgid "Online preview only" msgstr "" -#: seahub/templates/js/templates.html:1058 -#: seahub/templates/js/templates.html:1114 +#: seahub/templates/js/templates.html:1066 +#: seahub/templates/js/templates.html:1122 #: seahub/templates/snippets/file_share_popup.html:42 msgid "Generate" msgstr "" -#: seahub/templates/js/templates.html:1062 +#: seahub/templates/js/templates.html:1070 #: seahub/templates/snippets/file_share_popup.html:44 msgid "Link: " msgstr "" -#: seahub/templates/js/templates.html:1068 +#: seahub/templates/js/templates.html:1076 msgid "Direct Download Link: " msgstr "" -#: seahub/templates/js/templates.html:1076 -#: seahub/templates/js/templates.html:1124 +#: seahub/templates/js/templates.html:1084 +#: seahub/templates/js/templates.html:1132 #: seahub/templates/snippets/file_share_popup.html:45 msgid "Send" msgstr "" -#: seahub/templates/js/templates.html:1080 -#: seahub/templates/js/templates.html:1128 +#: seahub/templates/js/templates.html:1088 +#: seahub/templates/js/templates.html:1136 #: seahub/templates/snippets/file_share_popup.html:49 msgid "Send to:" msgstr "" -#: seahub/templates/js/templates.html:1081 -#: seahub/templates/js/templates.html:1129 +#: seahub/templates/js/templates.html:1089 +#: seahub/templates/js/templates.html:1137 +#: seahub/templates/js/templates.html:2525 #: seahub/templates/snippets/file_share_popup.html:50 #: seahub/templates/sysadmin/sys_useradmin_admins.html:38 msgid "Emails, separated by ','" msgstr "" -#: seahub/templates/js/templates.html:1082 -#: seahub/templates/js/templates.html:1130 +#: seahub/templates/js/templates.html:1090 +#: seahub/templates/js/templates.html:1138 #: seahub/templates/snippets/file_share_popup.html:54 msgid "Message (optional):" msgstr "" -#: seahub/templates/js/templates.html:1087 -#: seahub/templates/js/templates.html:1135 +#: seahub/templates/js/templates.html:1095 +#: seahub/templates/js/templates.html:1143 #: seahub/templates/snippets/file_share_popup.html:59 msgid "Sending..." msgstr "" -#: seahub/templates/js/templates.html:1097 +#: seahub/templates/js/templates.html:1105 msgid "" "You can share the generated link to others and then they can upload files to " "this directory via the link." msgstr "" -#: seahub/templates/js/templates.html:1118 +#: seahub/templates/js/templates.html:1126 msgid "Upload Link: " msgstr "" -#: seahub/templates/js/templates.html:1221 -#: seahub/templates/js/templates.html:1241 +#: seahub/templates/js/templates.html:1229 +#: seahub/templates/js/templates.html:1249 msgid "Leave Share" msgstr "" -#: seahub/templates/js/templates.html:1406 +#: seahub/templates/js/templates.html:1414 msgid "Wiki" msgstr "" -#: seahub/templates/js/templates.html:1411 +#: seahub/templates/js/templates.html:1419 msgid "Discussion" msgstr "" -#: seahub/templates/js/templates.html:1477 -#: seahub/templates/js/templates.html:2049 +#: seahub/templates/js/templates.html:1485 +#: seahub/templates/js/templates.html:2057 msgid "User Permission" msgstr "" -#: seahub/templates/js/templates.html:1478 -#: seahub/templates/js/templates.html:2050 +#: seahub/templates/js/templates.html:1486 +#: seahub/templates/js/templates.html:2058 msgid "Group Permission" msgstr "" -#: seahub/templates/js/templates.html:1540 -#: seahub/templates/js/templates.html:1546 +#: seahub/templates/js/templates.html:1548 +#: seahub/templates/js/templates.html:1554 msgid "File Name" msgstr "" -#: seahub/templates/js/templates.html:1556 -#: seahub/templates/js/templates.html:1577 +#: seahub/templates/js/templates.html:1564 +#: seahub/templates/js/templates.html:1585 msgid "icon" msgstr "" -#: seahub/templates/js/templates.html:1569 -#: seahub/templates/js/templates.html:1591 +#: seahub/templates/js/templates.html:1577 +#: seahub/templates/js/templates.html:1599 msgid "Unstar" msgstr "" -#: seahub/templates/js/templates.html:1598 -#: seahub/templates/js/templates.html:1613 -#: seahub/templates/js/templates.html:1624 +#: seahub/templates/js/templates.html:1606 +#: seahub/templates/js/templates.html:1621 #: seahub/templates/js/templates.html:1632 #: seahub/templates/js/templates.html:1640 -#: seahub/templates/js/templates.html:1650 +#: seahub/templates/js/templates.html:1648 +#: seahub/templates/js/templates.html:1658 msgid "Library Type" msgstr "" -#: seahub/templates/js/templates.html:1661 +#: seahub/templates/js/templates.html:1669 msgid "Select libraries to share" msgstr "" -#: seahub/templates/js/templates.html:1718 +#: seahub/templates/js/templates.html:1726 msgid "Created library" msgstr "" -#: seahub/templates/js/templates.html:1722 +#: seahub/templates/js/templates.html:1730 msgid "Deleted library" msgstr "" -#: seahub/templates/js/templates.html:1729 +#: seahub/templates/js/templates.html:1737 #: seahub/templates/snippets/list_commit_detail.html:10 msgid "Modification Details" msgstr "" -#: seahub/templates/js/templates.html:1743 +#: seahub/templates/js/templates.html:1751 #: seahub/templates/snippets/search_form.html:4 msgid "Search files in this wiki" msgstr "" -#: seahub/templates/js/templates.html:1743 +#: seahub/templates/js/templates.html:1751 #: seahub/templates/snippets/search_form.html:4 msgid "Search files in this library" msgstr "" -#: seahub/templates/js/templates.html:1745 +#: seahub/templates/js/templates.html:1753 #: seahub/templates/snippets/search_form.html:7 #: seahub/templates/snippets/search_form.html:13 msgid "Search Files" msgstr "" -#: seahub/templates/js/templates.html:1747 +#: seahub/templates/js/templates.html:1755 #: seahub/templates/snippets/search_form.html:9 msgid "advanced" msgstr "" -#: seahub/templates/js/templates.html:1765 -#: seahub/templates/js/templates.html:1782 seahub/templates/libraries.html:137 +#: seahub/templates/js/templates.html:1773 +#: seahub/templates/js/templates.html:1790 seahub/templates/libraries.html:137 msgid "No library is shared to this group" msgstr "" -#: seahub/templates/js/templates.html:1790 +#: seahub/templates/js/templates.html:1798 msgid "owner" msgstr "" -#: seahub/templates/js/templates.html:1792 +#: seahub/templates/js/templates.html:1800 msgid "admin" msgstr "" -#: seahub/templates/js/templates.html:1806 -#: seahub/templates/js/templates.html:2557 +#: seahub/templates/js/templates.html:1814 +#: seahub/templates/js/templates.html:2565 #: seahub/templates/view_file_base.html:145 msgid "Reply" msgstr "" -#: seahub/templates/js/templates.html:1823 -#: seahub/templates/js/templates.html:1841 +#: seahub/templates/js/templates.html:1831 +#: seahub/templates/js/templates.html:1849 msgid "Add Wiki" msgstr "" -#: seahub/templates/js/templates.html:1825 -#: seahub/templates/js/templates.html:1843 +#: seahub/templates/js/templates.html:1833 +#: seahub/templates/js/templates.html:1851 msgid "Remove Wiki" msgstr "" -#: seahub/templates/js/templates.html:1830 -#: seahub/templates/js/templates.html:1848 +#: seahub/templates/js/templates.html:1838 +#: seahub/templates/js/templates.html:1856 msgid "Import Members" msgstr "" -#: seahub/templates/js/templates.html:1831 -#: seahub/templates/js/templates.html:1849 +#: seahub/templates/js/templates.html:1839 +#: seahub/templates/js/templates.html:1857 msgid "Manage Members" msgstr "" -#: seahub/templates/js/templates.html:1834 +#: seahub/templates/js/templates.html:1842 msgid "Dismiss" msgstr "" -#: seahub/templates/js/templates.html:1853 +#: seahub/templates/js/templates.html:1861 msgid "Leave group" msgstr "" -#: seahub/templates/js/templates.html:1860 +#: seahub/templates/js/templates.html:1868 msgid "Rename Group To" msgstr "" -#: seahub/templates/js/templates.html:1869 +#: seahub/templates/js/templates.html:1877 msgid "Transfer Group To" msgstr "" -#: seahub/templates/js/templates.html:1877 +#: seahub/templates/js/templates.html:1885 msgid "Import group members from a CSV file" msgstr "" -#: seahub/templates/js/templates.html:1879 +#: seahub/templates/js/templates.html:1887 msgid "File format: user@mail.com" msgstr "" -#: seahub/templates/js/templates.html:1889 +#: seahub/templates/js/templates.html:1897 #: seahub/templates/sysadmin/sys_inst_admin.html:12 #: seahub/templates/sysadmin/sys_terms_admin.html:9 msgid "Add" msgstr "" -#: seahub/templates/js/templates.html:1971 -#: seahub/templates/js/templates.html:2372 -#: seahub/templates/js/templates.html:2408 +#: seahub/templates/js/templates.html:1979 +#: seahub/templates/js/templates.html:2380 +#: seahub/templates/js/templates.html:2416 #: seahub/templates/sysadmin/sys_publink_admin.html:16 #: seahub/templates/sysadmin/sys_upload_link_admin.html:10 msgid "Download Links" msgstr "" -#: seahub/templates/js/templates.html:1974 -#: seahub/templates/js/templates.html:2376 -#: seahub/templates/js/templates.html:2412 +#: seahub/templates/js/templates.html:1982 +#: seahub/templates/js/templates.html:2384 +#: seahub/templates/js/templates.html:2420 #: seahub/templates/sysadmin/sys_publink_admin.html:19 #: seahub/templates/sysadmin/sys_upload_link_admin.html:13 msgid "Upload Links" msgstr "" -#: seahub/templates/js/templates.html:1986 -#: seahub/templates/js/templates.html:2005 +#: seahub/templates/js/templates.html:1994 +#: seahub/templates/js/templates.html:2013 msgid "Created By" msgstr "" -#: seahub/templates/js/templates.html:1988 -#: seahub/templates/js/templates.html:2007 -#: seahub/templates/js/templates.html:2388 -#: seahub/templates/js/templates.html:2423 +#: seahub/templates/js/templates.html:1996 +#: seahub/templates/js/templates.html:2015 +#: seahub/templates/js/templates.html:2396 +#: seahub/templates/js/templates.html:2431 #: seahub/templates/sysadmin/sys_upload_link_admin.html:25 #: seahub/templates/sysadmin/userinfo.html:278 msgid "Visits" msgstr "" -#: seahub/templates/js/templates.html:2022 +#: seahub/templates/js/templates.html:2030 #: seahub/templates/sysadmin/userinfo.html:289 #: seahub/templates/sysadmin/userinfo.html:299 #: seahub/templates/view_shared_dir.html:60 msgid "Directory icon" msgstr "" -#: seahub/templates/js/templates.html:2032 -#: seahub/templates/js/templates.html:2453 -#: seahub/templates/js/templates.html:2464 -#: seahub/templates/js/templates.html:2509 +#: seahub/templates/js/templates.html:2040 +#: seahub/templates/js/templates.html:2461 +#: seahub/templates/js/templates.html:2472 +#: seahub/templates/js/templates.html:2517 #: seahub/templates/sysadmin/sys_inst_admin.html:36 #: seahub/templates/sysadmin/sys_link_search.html:36 #: seahub/templates/sysadmin/sys_publink_admin.html:42 @@ -4843,109 +4853,109 @@ msgstr "" msgid "Remove" msgstr "" -#: seahub/templates/js/templates.html:2060 -#: seahub/templates/js/templates.html:2104 +#: seahub/templates/js/templates.html:2068 +#: seahub/templates/js/templates.html:2112 msgid "Folder" msgstr "" -#: seahub/templates/js/templates.html:2071 -#: seahub/templates/js/templates.html:2090 -#: seahub/templates/js/templates.html:2117 -#: seahub/templates/js/templates.html:2136 +#: seahub/templates/js/templates.html:2079 +#: seahub/templates/js/templates.html:2098 +#: seahub/templates/js/templates.html:2125 +#: seahub/templates/js/templates.html:2144 msgid "Select a folder" msgstr "" -#: seahub/templates/js/templates.html:2151 +#: seahub/templates/js/templates.html:2159 msgid "Old Password" msgstr "" -#: seahub/templates/js/templates.html:2153 +#: seahub/templates/js/templates.html:2161 #: seahub/templates/registration/password_change_form.html:18 msgid "New Password" msgstr "" -#: seahub/templates/js/templates.html:2155 +#: seahub/templates/js/templates.html:2163 msgid "New Password Again" msgstr "" -#: seahub/templates/js/templates.html:2184 +#: seahub/templates/js/templates.html:2192 msgid "See All Notifications" msgstr "" -#: seahub/templates/js/templates.html:2236 -#: seahub/templates/js/templates.html:2353 +#: seahub/templates/js/templates.html:2244 +#: seahub/templates/js/templates.html:2361 msgid "Share To" msgstr "" -#: seahub/templates/js/templates.html:2245 +#: seahub/templates/js/templates.html:2253 msgid "You have not shared any libraries" msgstr "" -#: seahub/templates/js/templates.html:2246 +#: seahub/templates/js/templates.html:2254 msgid "" "You can share libraries with your friends and colleagues by clicking the " "share icon of your own libraries in your home page or creating a new library " "in groups you are in." msgstr "" -#: seahub/templates/js/templates.html:2259 -#: seahub/templates/js/templates.html:2321 +#: seahub/templates/js/templates.html:2267 +#: seahub/templates/js/templates.html:2329 msgid "all members" msgstr "" -#: seahub/templates/js/templates.html:2362 +#: seahub/templates/js/templates.html:2370 msgid "You have not shared any folders" msgstr "" -#: seahub/templates/js/templates.html:2363 +#: seahub/templates/js/templates.html:2371 msgid "" "You can share a single folder with a registered user if you don't want to " "share a whole library." msgstr "" -#: seahub/templates/js/templates.html:2389 -#: seahub/templates/js/templates.html:2486 +#: seahub/templates/js/templates.html:2397 +#: seahub/templates/js/templates.html:2494 msgid "Expiration" msgstr "" -#: seahub/templates/js/templates.html:2397 +#: seahub/templates/js/templates.html:2405 msgid "You don't have any download links" msgstr "" -#: seahub/templates/js/templates.html:2398 +#: seahub/templates/js/templates.html:2406 msgid "" "You can generate a download link for a folder or a file. Anyone who receives " "this link can view the folder or the file online." msgstr "" -#: seahub/templates/js/templates.html:2431 +#: seahub/templates/js/templates.html:2439 msgid "You don't have any upload links" msgstr "" -#: seahub/templates/js/templates.html:2432 +#: seahub/templates/js/templates.html:2440 msgid "" "You can generate an upload link from any folder. Anyone who receives this " "link can upload files to this folder." msgstr "" -#: seahub/templates/js/templates.html:2485 +#: seahub/templates/js/templates.html:2493 msgid "Invite Time" msgstr "" -#: seahub/templates/js/templates.html:2487 +#: seahub/templates/js/templates.html:2495 msgid "Accepted" msgstr "" -#: seahub/templates/js/templates.html:2495 +#: seahub/templates/js/templates.html:2503 msgid "You have not invited any people." msgstr "" -#: seahub/templates/js/templates.html:2536 +#: seahub/templates/js/templates.html:2544 #: seahub/templates/view_file_base.html:123 msgid "No comment yet." msgstr "" -#: seahub/templates/js/templates.html:2543 +#: seahub/templates/js/templates.html:2551 #: seahub/templates/view_file_base.html:130 msgid "Add a comment..." msgstr "" @@ -5297,6 +5307,22 @@ msgstr "" msgid "We will send you an email to set new password" msgstr "" +#: seahub/templates/registration/register_complete_email.html:1 +#, python-format +msgid "" +"You're receiving this e-mail because you are the admin of %(site_name)s, and " +"a new user %(reg_email)s is joined." +msgstr "" + +#: seahub/templates/registration/register_complete_email.html:3 +msgid "Please click the following link to view the new account:" +msgstr "" + +#: seahub/templates/registration/register_complete_email_subject.html:1 +#, python-format +msgid "New account created on %(site_name)s" +msgstr "" + #: seahub/templates/registration/registration_complete.html:4 #: seahub/templates/shibboleth/complete.html:4 msgid "Registration complete" @@ -5681,7 +5707,7 @@ msgstr "" #: seahub/templates/sysadmin/org_admin_table.html:5 #: seahub/templates/sysadmin/sys_org_info_group.html:19 #: seahub/templates/sysadmin/sys_org_search.html:11 -#: seahub/views/sysadmin.py:1177 +#: seahub/views/sysadmin.py:1178 msgid "Creator" msgstr "" @@ -6153,12 +6179,12 @@ msgid "Max User Number" msgstr "" #: seahub/templates/sysadmin/sys_org_info_setting.html:52 -#: seahub/views/sysadmin.py:1376 +#: seahub/views/sysadmin.py:1377 msgid "Input should be a number" msgstr "" #: seahub/templates/sysadmin/sys_org_info_setting.html:55 -#: seahub/views/sysadmin.py:1386 +#: seahub/views/sysadmin.py:1387 msgid "Input number should be greater than 0" msgstr "" @@ -6393,7 +6419,7 @@ msgid "Download an example file" msgstr "" #: seahub/templates/sysadmin/sys_useradmin.html:79 -#: seahub/views/sysadmin.py:2019 seahub/views/sysadmin.py:2107 +#: seahub/views/sysadmin.py:2020 seahub/views/sysadmin.py:2108 msgid "Please choose a .xlsx file." msgstr "" @@ -6763,7 +6789,7 @@ msgid "Personal Wiki Pages" msgstr "" #: seahub/thumbnail/views.py:46 seahub/thumbnail/views.py:170 -#: seahub/views/__init__.py:627 seahub/views/file.py:1181 +#: seahub/views/__init__.py:602 seahub/views/file.py:1188 msgid "Invalid arguments." msgstr "" @@ -6848,51 +6874,56 @@ msgstr "" msgid "Generate Tokens" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:12 +#: seahub/two_factor/templates/two_factor/core/login.html:13 msgid "" "We are calling your phone right now, please enter the\n" " digits you hear." msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:15 +#: seahub/two_factor/templates/two_factor/core/login.html:16 msgid "" "We sent you a text message, please enter the tokens we\n" " sent." msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:18 +#: seahub/two_factor/templates/two_factor/core/login.html:19 msgid "" "Open the two-factor authentication app on your device to view your " "authentication token and verify your identify." msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:21 +#: seahub/two_factor/templates/two_factor/core/login.html:22 msgid "Authentication token" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:25 -#: seahub/two_factor/templates/two_factor/core/login.html:42 +#: seahub/two_factor/templates/two_factor/core/login.html:27 +#, python-format +msgid "Remember this computer for %(remember_days)s days" +msgstr "" + +#: seahub/two_factor/templates/two_factor/core/login.html:31 +#: seahub/two_factor/templates/two_factor/core/login.html:50 msgid "Incorrect code" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:29 -#: seahub/two_factor/templates/two_factor/core/login.html:47 +#: seahub/two_factor/templates/two_factor/core/login.html:35 +#: seahub/two_factor/templates/two_factor/core/login.html:55 msgid "Verify" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:33 +#: seahub/two_factor/templates/two_factor/core/login.html:40 msgid "Don't have your phone?" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:34 +#: seahub/two_factor/templates/two_factor/core/login.html:41 msgid "Enter a two-factor backup code" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:39 +#: seahub/two_factor/templates/two_factor/core/login.html:47 msgid "Backup code" msgstr "" -#: seahub/two_factor/templates/two_factor/core/login.html:46 +#: seahub/two_factor/templates/two_factor/core/login.html:54 msgid "" "You can enter one of your backup codes in case you lost access to your " "mobile device." @@ -6993,272 +7024,268 @@ msgstr "" msgid "permission error" msgstr "" -#: seahub/views/__init__.py:424 seahub/views/__init__.py:440 +#: seahub/views/__init__.py:399 seahub/views/__init__.py:415 msgid "Unable to view recycle page" msgstr "" -#: seahub/views/__init__.py:508 +#: seahub/views/__init__.py:483 msgid "Unable to view library modification" msgstr "" -#: seahub/views/__init__.py:587 seahub/views/__init__.py:629 -#: seahub/views/__init__.py:853 seahub/views/__init__.py:972 -#: seahub/views/file.py:1652 seahub/views/sysadmin.py:1732 +#: seahub/views/__init__.py:562 seahub/views/__init__.py:604 +#: seahub/views/__init__.py:816 seahub/views/__init__.py:940 +#: seahub/views/file.py:1659 seahub/views/sysadmin.py:1733 msgid "Library does not exist" msgstr "" -#: seahub/views/__init__.py:620 +#: seahub/views/__init__.py:595 msgid "Please specify history ID" msgstr "" -#: seahub/views/__init__.py:624 +#: seahub/views/__init__.py:599 msgid "Successfully restored the library." msgstr "" -#: seahub/views/__init__.py:631 +#: seahub/views/__init__.py:606 msgid "History you specified does not exist" msgstr "" -#: seahub/views/__init__.py:633 +#: seahub/views/__init__.py:608 msgid "Unknown error" msgstr "" -#: seahub/views/__init__.py:979 seahub/views/repo.py:200 +#: seahub/views/__init__.py:947 seahub/views/repo.py:200 #, python-format msgid "\"%s\" does not exist." msgstr "" -#: seahub/views/__init__.py:997 seahub/views/file.py:1149 +#: seahub/views/__init__.py:965 seahub/views/file.py:1154 msgid "Internal Error" msgstr "" -#: seahub/views/__init__.py:1019 +#: seahub/views/__init__.py:987 #, python-format msgid "Unable to download \"%s\"" msgstr "" -#: seahub/views/__init__.py:1111 +#: seahub/views/__init__.py:1079 msgid "Successfully enable \"Personal Wiki\"." msgstr "" -#: seahub/views/__init__.py:1116 +#: seahub/views/__init__.py:1084 msgid "Successfully disable \"Personal Wiki\"." msgstr "" -#: seahub/views/ajax.py:83 +#: seahub/views/ajax.py:86 msgid "You don't have permission to access the library." msgstr "" -#: seahub/views/ajax.py:91 +#: seahub/views/ajax.py:94 msgid "No path." msgstr "" -#: seahub/views/ajax.py:156 +#: seahub/views/ajax.py:159 msgid "The group doesn't exist" msgstr "" -#: seahub/views/ajax.py:227 seahub/views/ajax.py:765 seahub/views/ajax.py:1101 +#: seahub/views/ajax.py:230 seahub/views/ajax.py:830 seahub/views/ajax.py:1166 msgid "Library is encrypted." msgstr "" -#: seahub/views/ajax.py:233 seahub/views/ajax.py:771 +#: seahub/views/ajax.py:236 seahub/views/ajax.py:836 msgid "Error: no head commit id" msgstr "" -#: seahub/views/ajax.py:460 seahub/views/ajax.py:510 +#: seahub/views/ajax.py:485 seahub/views/ajax.py:549 msgid "Argument missing." msgstr "" -#: seahub/views/ajax.py:488 +#: seahub/views/ajax.py:527 #, python-format msgid "Internal error. Failed to delete %s." msgstr "" -#: seahub/views/ajax.py:570 +#: seahub/views/ajax.py:626 #, python-format msgid "Destination path is too long for %s." msgstr "" -#: seahub/views/ajax.py:629 +#: seahub/views/ajax.py:685 msgid "Out of quota." msgstr "" -#: seahub/views/ajax.py:703 +#: seahub/views/ajax.py:768 msgid "You do not have permission to copy files/folders in this directory" msgstr "" -#: seahub/views/ajax.py:710 +#: seahub/views/ajax.py:775 #, python-format msgid "Can not copy directory %(src)s to its subdirectory %(des)s" msgstr "" -#: seahub/views/ajax.py:806 +#: seahub/views/ajax.py:871 msgid "Failed to get file block list" msgstr "" -#: seahub/views/ajax.py:815 +#: seahub/views/ajax.py:880 msgid "FileServer access token invalid." msgstr "" -#: seahub/views/ajax.py:849 +#: seahub/views/ajax.py:914 msgid "Wrong repo id" msgstr "" -#: seahub/views/ajax.py:858 seahub/views/file.py:405 seahub/views/file.py:848 -#: seahub/views/file.py:1041 seahub/views/file.py:1661 +#: seahub/views/ajax.py:923 seahub/views/file.py:406 seahub/views/file.py:853 +#: seahub/views/file.py:1046 seahub/views/file.py:1668 msgid "File does not exist" msgstr "" -#: seahub/views/ajax.py:1039 +#: seahub/views/ajax.py:1104 msgid "Bad upload link token." msgstr "" -#: seahub/views/ajax.py:1045 +#: seahub/views/ajax.py:1110 msgid "Bad repo id in upload link." msgstr "" -#: seahub/views/ajax.py:1123 +#: seahub/views/ajax.py:1188 msgid "No conflict in the merge." msgstr "" -#: seahub/views/ajax.py:1198 -msgid "Failed, file is too large" -msgstr "" - -#: seahub/views/file.py:156 +#: seahub/views/file.py:157 msgid "HTTPError: failed to open file online" msgstr "" -#: seahub/views/file.py:160 +#: seahub/views/file.py:161 msgid "URLError: failed to open file online" msgstr "" -#: seahub/views/file.py:167 seahub/views/file.py:1199 +#: seahub/views/file.py:168 seahub/views/file.py:1206 msgid "The encoding you chose is not proper." msgstr "" -#: seahub/views/file.py:184 seahub/views/file.py:187 +#: seahub/views/file.py:185 seahub/views/file.py:188 msgid "Unknown file encoding" msgstr "" -#: seahub/views/file.py:315 seahub/views/file.py:324 +#: seahub/views/file.py:316 seahub/views/file.py:325 #, python-format msgid "File size surpasses %s, can not be opened online." msgstr "" -#: seahub/views/file.py:339 +#: seahub/views/file.py:340 msgid "The library is encrypted, can not open file online." msgstr "" -#: seahub/views/file.py:417 seahub/views/file.py:426 seahub/views/file.py:438 -#: seahub/views/file.py:491 seahub/views/file.py:730 seahub/views/file.py:745 -#: seahub/views/file.py:763 seahub/views/file.py:870 seahub/views/file.py:1053 -#: seahub/views/file.py:1066 seahub/views/file.py:1268 +#: seahub/views/file.py:418 seahub/views/file.py:427 seahub/views/file.py:439 +#: seahub/views/file.py:496 seahub/views/file.py:735 seahub/views/file.py:750 +#: seahub/views/file.py:768 seahub/views/file.py:875 seahub/views/file.py:1058 +#: seahub/views/file.py:1071 seahub/views/file.py:1275 msgid "Unable to view file" msgstr "" -#: seahub/views/file.py:790 +#: seahub/views/file.py:795 msgid "Unable to download file, invalid file path" msgstr "" -#: seahub/views/file.py:799 +#: seahub/views/file.py:804 msgid "Unable to download file, wrong file path" msgstr "" -#: seahub/views/file.py:804 +#: seahub/views/file.py:809 msgid "Unable to download file, share link traffic is used up." msgstr "" -#: seahub/views/file.py:820 +#: seahub/views/file.py:825 msgid "Unable to download file." msgstr "" -#: seahub/views/file.py:880 +#: seahub/views/file.py:885 msgid "Unable to view raw file, share link traffic is used up." msgstr "" -#: seahub/views/file.py:1171 +#: seahub/views/file.py:1178 msgid "The library does not exist." msgstr "" -#: seahub/views/file.py:1175 +#: seahub/views/file.py:1182 msgid "The library is encrypted." msgstr "" -#: seahub/views/file.py:1256 +#: seahub/views/file.py:1263 msgid "Unable to edit file" msgstr "" -#: seahub/views/file.py:1262 +#: seahub/views/file.py:1269 msgid "The file does not exist." msgstr "" -#: seahub/views/file.py:1294 +#: seahub/views/file.py:1301 msgid "Edit online is not offered for this type of file." msgstr "" -#: seahub/views/file.py:1405 seahub/views/file.py:1410 +#: seahub/views/file.py:1412 seahub/views/file.py:1417 msgid "Unable to download file" msgstr "" -#: seahub/views/sysadmin.py:314 seahub/views/sysadmin.py:420 -#: seahub/views/sysadmin.py:1174 seahub/views/sysadmin.py:1186 -#: seahub/views/sysadmin.py:1997 +#: seahub/views/sysadmin.py:315 seahub/views/sysadmin.py:421 +#: seahub/views/sysadmin.py:1175 seahub/views/sysadmin.py:1187 +#: seahub/views/sysadmin.py:1998 msgid "Failed to export Excel" msgstr "" -#: seahub/views/sysadmin.py:779 seahub/views/sysadmin.py:805 +#: seahub/views/sysadmin.py:780 seahub/views/sysadmin.py:806 msgid "Failed to set quota: internal server error" msgstr "" -#: seahub/views/sysadmin.py:824 +#: seahub/views/sysadmin.py:825 msgid "Failed to delete: the user is an organization creator" msgstr "" -#: seahub/views/sysadmin.py:859 +#: seahub/views/sysadmin.py:860 #, python-format msgid "Successfully remove trial for: %s" msgstr "" -#: seahub/views/sysadmin.py:888 +#: seahub/views/sysadmin.py:889 #, python-format msgid "Successfully revoke the admin permission of %s" msgstr "" -#: seahub/views/sysadmin.py:890 +#: seahub/views/sysadmin.py:891 msgid "Failed to revoke admin: the user does not exist" msgstr "" -#: seahub/views/sysadmin.py:937 +#: seahub/views/sysadmin.py:938 #, python-format msgid "Your account on %s is activated" msgstr "" -#: seahub/views/sysadmin.py:1020 +#: seahub/views/sysadmin.py:1021 #, python-format msgid "Password has been reset on %s" msgstr "" -#: seahub/views/sysadmin.py:1045 +#: seahub/views/sysadmin.py:1046 #, python-format msgid "" "Successfully reset password to %(passwd)s, an email has been sent to " "%(user)s." msgstr "" -#: seahub/views/sysadmin.py:1050 +#: seahub/views/sysadmin.py:1051 #, python-format msgid "" "Successfully reset password to %(passwd)s, but failed to send email to " "%(user)s, please check your email configuration." msgstr "" -#: seahub/views/sysadmin.py:1054 +#: seahub/views/sysadmin.py:1055 #, python-format msgid "Successfully reset password to %(passwd)s for user %(user)s." msgstr "" -#: seahub/views/sysadmin.py:1057 +#: seahub/views/sysadmin.py:1058 #, python-format msgid "" "Successfully reset password to %(passwd)s for user %(user)s. But email " @@ -7266,238 +7293,122 @@ msgid "" "configured." msgstr "" -#: seahub/views/sysadmin.py:1060 +#: seahub/views/sysadmin.py:1061 msgid "Failed to reset password: user does not exist" msgstr "" -#: seahub/views/sysadmin.py:1076 seahub/views/sysadmin.py:2092 +#: seahub/views/sysadmin.py:1077 seahub/views/sysadmin.py:2093 #, python-format msgid "You are invited to join %s" msgstr "" -#: seahub/views/sysadmin.py:1109 +#: seahub/views/sysadmin.py:1110 #, python-format msgid "Fail to add user %s." msgstr "" -#: seahub/views/sysadmin.py:1134 seahub/views/sysadmin.py:1147 +#: seahub/views/sysadmin.py:1135 seahub/views/sysadmin.py:1148 #, python-format msgid "Successfully added user %s. An email notification has been sent." msgstr "" -#: seahub/views/sysadmin.py:1137 seahub/views/sysadmin.py:1150 +#: seahub/views/sysadmin.py:1138 seahub/views/sysadmin.py:1151 #, python-format msgid "" "Successfully added user %s. An error accurs when sending email notification, " "please check your email configuration." msgstr "" -#: seahub/views/sysadmin.py:1139 seahub/views/sysadmin.py:1152 +#: seahub/views/sysadmin.py:1140 seahub/views/sysadmin.py:1153 #, python-format msgid "Successfully added user %s." msgstr "" -#: seahub/views/sysadmin.py:1154 +#: seahub/views/sysadmin.py:1155 #, python-format msgid "" "Successfully added user %s. But email notification can not be sent, because " "Email service is not properly configured." msgstr "" -#: seahub/views/sysadmin.py:1328 +#: seahub/views/sysadmin.py:1329 msgid "Failed to rename organization" msgstr "" -#: seahub/views/sysadmin.py:1358 seahub/views/sysadmin.py:1838 -#: seahub/views/sysadmin.py:1934 +#: seahub/views/sysadmin.py:1359 seahub/views/sysadmin.py:1839 +#: seahub/views/sysadmin.py:1935 msgid "Successfully deleted." msgstr "" -#: seahub/views/sysadmin.py:1727 +#: seahub/views/sysadmin.py:1728 msgid "Failed to transfer, invalid arguments." msgstr "" -#: seahub/views/sysadmin.py:1738 +#: seahub/views/sysadmin.py:1739 #, python-format msgid "Failed to transfer, user %s not found" msgstr "" -#: seahub/views/sysadmin.py:1744 +#: seahub/views/sysadmin.py:1745 msgid "Can not transfer organization library" msgstr "" -#: seahub/views/sysadmin.py:1748 +#: seahub/views/sysadmin.py:1749 #, python-format msgid "Can not transfer library to organization user %s" msgstr "" -#: seahub/views/sysadmin.py:1801 +#: seahub/views/sysadmin.py:1802 msgid "Successfully transfered." msgstr "" -#: seahub/views/sysadmin.py:1937 +#: seahub/views/sysadmin.py:1938 msgid "Failed to delete, please try again later." msgstr "" -#: seahub/views/sysadmin.py:1968 +#: seahub/views/sysadmin.py:1969 #, python-format msgid "Successfully set %s as admin." msgstr "" -#: seahub/views/sysadmin.py:1970 +#: seahub/views/sysadmin.py:1971 #, python-format msgid "Failed to set %s as admin: user does not exist." msgstr "" -#: seahub/views/sysadmin.py:1983 seahub/views/sysadmin.py:1984 -#: seahub/views/sysadmin.py:1985 +#: seahub/views/sysadmin.py:1984 seahub/views/sysadmin.py:1985 +#: seahub/views/sysadmin.py:1986 msgid "Optional" msgstr "" -#: seahub/views/sysadmin.py:2105 +#: seahub/views/sysadmin.py:2106 msgid "Import succeeded" msgstr "" -#: seahub/views/sysadmin.py:2171 +#: seahub/views/sysadmin.py:2188 msgid "Invalid setting" msgstr "" -#: seahub/views/sysadmin.py:2178 seahub/views/sysadmin.py:2182 -#: seahub/views/sysadmin.py:2187 +#: seahub/views/sysadmin.py:2195 seahub/views/sysadmin.py:2199 +#: seahub/views/sysadmin.py:2204 msgid "Invalid value" msgstr "" -#: seahub/views/sysadmin.py:2319 +#: seahub/views/sysadmin.py:2332 #, python-format msgid "" "Failed to add %s to the institution: user already belongs to an institution" msgstr "" -#: seahub/views/sysadmin.py:2324 +#: seahub/views/sysadmin.py:2337 #, python-format msgid "Successfully added %s to the institution." msgstr "" -#: seahub/views/sysadmin.py:2648 +#: seahub/views/sysadmin.py:2661 msgid "Successfully deleted 1 item" msgstr "" #: seahub/views/wiki.py:162 msgid "You do not have permission to create wiki" msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:143 -msgid "العربية" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:145 -msgid "Català" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:147 -msgid "Deutsch" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:148 -msgid "ελληνικά" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:149 -msgid "English" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:150 -msgid "Español" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:151 -msgid "Español de Argentina" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:152 -msgid "Español de México" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:153 -msgid "Suomi" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:154 -msgid "français" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:155 -msgid "עברית" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:156 -msgid "Magyar" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:157 -msgid "Íslenska" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:158 -msgid "Italiano" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:159 -msgid "日本語" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:160 -msgid "한국어" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:162 -msgid "Latvian" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:164 -msgid "Nederlands" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:165 -msgid "Polski" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:166 -msgid "Portuguese, Brazil" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:167 -msgid "Русский" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:169 -msgid "Slovenian" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:170 -msgid "Svenska" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:171 -msgid "ไทย" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:172 -msgid "Türkçe" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:173 -msgid "українська мова" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:174 -msgid "Tiếng Việt" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:175 -msgid "简体中文" -msgstr "" - -#: tsinghua-auth-fix/seahub/settings.py:176 -msgid "繁體中文" -msgstr "" diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po index 25c09f4dc3..bfd0c2e31c 100644 --- a/locale/en/LC_MESSAGES/djangojs.po +++ b/locale/en/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-19 15:54+0800\n" +"POT-Creation-Date: 2018-01-12 18:04+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,12 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: static/scripts/app/models/deleted-repo.js:19 -#: static/scripts/app/models/repo.js:59 static/scripts/common.js:319 +#: static/scripts/app/models/repo.js:59 static/scripts/common.js:320 msgid "Encrypted library" msgstr "" #: static/scripts/app/models/deleted-repo.js:21 -#: static/scripts/app/models/repo.js:61 static/scripts/common.js:323 +#: static/scripts/app/models/repo.js:61 static/scripts/common.js:324 #: static/scripts/sysadmin-app/models/trash-repo.js:14 msgid "Read-Write library" msgstr "" @@ -33,7 +33,7 @@ msgstr "" #: static/scripts/app/views/fileupload.js:378 #: static/scripts/app/views/fileupload.js:392 #: static/scripts/app/views/fileupload.js:404 -#: static/scripts/app/views/fileupload.js:416 static/scripts/common.js:586 +#: static/scripts/app/views/fileupload.js:416 static/scripts/common.js:598 msgid "Just now" msgstr "" @@ -64,7 +64,7 @@ msgstr "" msgid "Passwords don't match" msgstr "" -#: static/scripts/app/models/repo.js:63 static/scripts/common.js:321 +#: static/scripts/app/models/repo.js:63 static/scripts/common.js:322 msgid "Read-Only library" msgstr "" @@ -92,7 +92,7 @@ msgstr "" #: static/scripts/app/views/group.js:110 static/scripts/app/views/group.js:143 #: static/scripts/app/views/groups.js:83 #: static/scripts/app/views/groups.js:134 -#: static/scripts/app/views/invitations.js:78 +#: static/scripts/app/views/invitations.js:119 #: static/scripts/app/views/my-deleted-repos.js:86 #: static/scripts/app/views/myhome-repos.js:104 #: static/scripts/app/views/myhome-shared-repos.js:81 @@ -150,8 +150,8 @@ msgstr "" #: static/scripts/app/views/dialogs/repo-folder-perm-admin.js:302 #: static/scripts/app/views/dialogs/repo-history-settings.js:83 #: static/scripts/app/views/dialogs/repo-history-settings.js:142 -#: static/scripts/app/views/dir.js:1292 static/scripts/app/views/dir.js:1326 -#: static/scripts/app/views/dir.js:1395 +#: static/scripts/app/views/dir.js:1291 static/scripts/app/views/dir.js:1325 +#: static/scripts/app/views/dir.js:1394 #: static/scripts/app/views/dirent-details.js:164 #: static/scripts/app/views/dirent-grid.js:338 #: static/scripts/app/views/dirent-grid.js:379 @@ -174,14 +174,14 @@ msgstr "" #: static/scripts/app/views/group-settings.js:287 #: static/scripts/app/views/group-settings.js:327 #: static/scripts/app/views/group-settings.js:362 -#: static/scripts/app/views/invitations.js:146 +#: static/scripts/app/views/invitations.js:188 #: static/scripts/app/views/repo-folder-perm-item.js:86 #: static/scripts/app/views/repo-folder-perm-item.js:127 #: static/scripts/app/views/repo.js:206 static/scripts/app/views/repo.js:281 #: static/scripts/app/views/repo.js:398 static/scripts/app/views/repo.js:440 #: static/scripts/app/views/share.js:423 static/scripts/app/views/share.js:808 -#: static/scripts/app/views/share.js:887 static/scripts/common.js:407 -#: static/scripts/common.js:496 +#: static/scripts/app/views/share.js:887 static/scripts/common.js:419 +#: static/scripts/common.js:508 #: static/scripts/sysadmin-app/views/admin-login-logs.js:129 #: static/scripts/sysadmin-app/views/admin-operation-logs.js:129 #: static/scripts/sysadmin-app/views/dashboard.js:84 @@ -256,7 +256,7 @@ msgstr "" #: static/scripts/app/views/dialogs/dirent-mvcp.js:132 #: static/scripts/app/views/dialogs/dirent-mvcp.js:163 -#: static/scripts/app/views/dir.js:1386 +#: static/scripts/app/views/dir.js:1385 msgid "Canceled." msgstr "" @@ -286,7 +286,7 @@ msgstr "" #: static/scripts/app/views/dir.js:622 static/scripts/app/views/dir.js:683 #: static/scripts/app/views/dirent.js:477 #: static/scripts/app/views/groups.js:112 -#: static/scripts/app/views/invitations.js:54 +#: static/scripts/app/views/invitations.js:58 #: static/scripts/app/views/repo.js:175 static/scripts/app/views/repo.js:411 #: static/scripts/sysadmin-app/views/device-trusted-ipaddresses.js:42 #: static/scripts/sysadmin-app/views/dir.js:82 @@ -352,7 +352,7 @@ msgstr "" #: static/scripts/app/views/group-manage-members.js:112 #: static/scripts/app/views/group-members.js:75 #: static/scripts/app/views/group.js:138 static/scripts/app/views/groups.js:78 -#: static/scripts/app/views/invitations.js:141 +#: static/scripts/app/views/invitations.js:183 #: static/scripts/app/views/my-deleted-repos.js:81 #: static/scripts/app/views/myhome-repos.js:99 #: static/scripts/app/views/myhome-shared-repos.js:76 @@ -506,64 +506,64 @@ msgstr "" msgid "Copy selected item(s) to:" msgstr "" -#: static/scripts/app/views/dir.js:1179 static/scripts/app/views/dir.js:1347 +#: static/scripts/app/views/dir.js:1179 static/scripts/app/views/dir.js:1346 msgid "Successfully moved %(name)s." msgstr "" -#: static/scripts/app/views/dir.js:1181 static/scripts/app/views/dir.js:1349 +#: static/scripts/app/views/dir.js:1181 static/scripts/app/views/dir.js:1348 msgid "Successfully moved %(name)s and 1 other item." msgstr "" -#: static/scripts/app/views/dir.js:1183 static/scripts/app/views/dir.js:1351 +#: static/scripts/app/views/dir.js:1183 static/scripts/app/views/dir.js:1350 msgid "Successfully moved %(name)s and %(amount)s other items." msgstr "" -#: static/scripts/app/views/dir.js:1188 static/scripts/app/views/dir.js:1355 +#: static/scripts/app/views/dir.js:1188 static/scripts/app/views/dir.js:1354 msgid "Successfully copied %(name)s." msgstr "" -#: static/scripts/app/views/dir.js:1190 static/scripts/app/views/dir.js:1357 +#: static/scripts/app/views/dir.js:1190 static/scripts/app/views/dir.js:1356 msgid "Successfully copied %(name)s and 1 other item." msgstr "" -#: static/scripts/app/views/dir.js:1192 static/scripts/app/views/dir.js:1359 +#: static/scripts/app/views/dir.js:1192 static/scripts/app/views/dir.js:1358 msgid "Successfully copied %(name)s and %(amount)s other items." msgstr "" -#: static/scripts/app/views/dir.js:1204 +#: static/scripts/app/views/dir.js:1203 msgid "Internal error. Failed to move %(name)s and %(amount)s other item(s)." msgstr "" -#: static/scripts/app/views/dir.js:1206 +#: static/scripts/app/views/dir.js:1205 msgid "Internal error. Failed to move %(name)s." msgstr "" -#: static/scripts/app/views/dir.js:1210 +#: static/scripts/app/views/dir.js:1209 msgid "Internal error. Failed to copy %(name)s and %(amount)s other item(s)." msgstr "" -#: static/scripts/app/views/dir.js:1212 +#: static/scripts/app/views/dir.js:1211 msgid "Internal error. Failed to copy %(name)s." msgstr "" -#: static/scripts/app/views/dir.js:1254 +#: static/scripts/app/views/dir.js:1253 msgid "Moving file %(index)s of %(total)s" msgstr "" -#: static/scripts/app/views/dir.js:1254 +#: static/scripts/app/views/dir.js:1253 msgid "Copying file %(index)s of %(total)s" msgstr "" -#: static/scripts/app/views/dir.js:1280 +#: static/scripts/app/views/dir.js:1279 msgid "Failed to move %(name)s" msgstr "" -#: static/scripts/app/views/dir.js:1280 +#: static/scripts/app/views/dir.js:1279 msgid "Failed to copy %(name)s" msgstr "" -#: static/scripts/app/views/dirent-details.js:99 static/scripts/common.js:629 -#: static/scripts/common.js:700 +#: static/scripts/app/views/dirent-details.js:99 static/scripts/common.js:641 +#: static/scripts/common.js:712 msgid "No matches" msgstr "" @@ -745,11 +745,17 @@ msgid "Are you sure you want to quit this group?" msgstr "" #: static/scripts/app/views/invitation.js:37 -#: static/scripts/app/views/share-admin-folder.js:91 -#: static/scripts/app/views/share-admin-repo.js:99 -#: static/scripts/app/views/share-admin-share-link.js:55 -#: static/scripts/app/views/share-admin-upload-link.js:54 -msgid "Successfully deleted 1 item" +#: static/scripts/sysadmin-app/views/device-trusted-ipaddress.js:39 +#: static/scripts/sysadmin-app/views/group.js:44 +msgid "Successfully deleted 1 item." +msgstr "" + +#: static/scripts/app/views/invitations.js:94 +msgid "Successfully invited %(email)." +msgstr "" + +#: static/scripts/app/views/invitations.js:97 +msgid "Successfully invited %(email) and %(num) other people." msgstr "" #: static/scripts/app/views/notifications.js:58 @@ -804,6 +810,13 @@ msgstr "" msgid "Successfully modified permission" msgstr "" +#: static/scripts/app/views/share-admin-folder.js:91 +#: static/scripts/app/views/share-admin-repo.js:99 +#: static/scripts/app/views/share-admin-share-link.js:55 +#: static/scripts/app/views/share-admin-upload-link.js:54 +msgid "Successfully deleted 1 item" +msgstr "" + #: static/scripts/app/views/share.js:67 #: static/scripts/sysadmin-app/views/share.js:41 msgid "Share {placeholder}" @@ -859,27 +872,27 @@ msgstr "" msgid "Successfully unstared {placeholder}" msgstr "" -#: static/scripts/common.js:620 +#: static/scripts/common.js:632 msgid "Search users or enter emails and press Enter" msgstr "" -#: static/scripts/common.js:628 static/scripts/common.js:699 +#: static/scripts/common.js:640 static/scripts/common.js:711 msgid "Please enter 1 or more character" msgstr "" -#: static/scripts/common.js:630 static/scripts/common.js:701 +#: static/scripts/common.js:642 static/scripts/common.js:713 msgid "Searching..." msgstr "" -#: static/scripts/common.js:631 static/scripts/common.js:702 +#: static/scripts/common.js:643 static/scripts/common.js:714 msgid "Loading failed" msgstr "" -#: static/scripts/common.js:691 +#: static/scripts/common.js:703 msgid "Search groups" msgstr "" -#: static/scripts/common.js:1026 +#: static/scripts/common.js:1038 msgid "Packaging..." msgstr "" @@ -948,11 +961,6 @@ msgstr "" msgid "Successfully clean all errors." msgstr "" -#: static/scripts/sysadmin-app/views/device-trusted-ipaddress.js:39 -#: static/scripts/sysadmin-app/views/group.js:44 -msgid "Successfully deleted 1 item." -msgstr "" - #: static/scripts/sysadmin-app/views/group-member.js:81 msgid "Delete Member" msgstr "" diff --git a/seahub/notifications/models.py b/seahub/notifications/models.py index b9b4d3ca94..5771468a84 100644 --- a/seahub/notifications/models.py +++ b/seahub/notifications/models.py @@ -723,9 +723,12 @@ class UserNotification(models.Model): self.delete() return - msg = _('Guest %(user)s accepted your invitation at %(time)s.') % { + # Use same msg as in notice_email.html, so there will be only one msg + # in django.po. + msg = _('Guest %(user)s accepted your invitation at %(time)s.') % { 'user': inv.accepter, - 'href': settings.SITE_ROOT + '#invitations/', + 'url_base': '', + 'inv_url': settings.SITE_ROOT + '#invitations/', 'time': inv.accept_time.strftime("%Y-%m-%d %H:%M:%S"), } return msg diff --git a/seahub/templates/registration/register_complete_email.txt b/seahub/templates/registration/register_complete_email.html similarity index 100% rename from seahub/templates/registration/register_complete_email.txt rename to seahub/templates/registration/register_complete_email.html diff --git a/seahub/templates/registration/register_complete_email_subject.txt b/seahub/templates/registration/register_complete_email_subject.html similarity index 100% rename from seahub/templates/registration/register_complete_email_subject.txt rename to seahub/templates/registration/register_complete_email_subject.html diff --git a/thirdpart/registration/models.py b/thirdpart/registration/models.py index 1336a62d3d..a08b2d55c0 100644 --- a/thirdpart/registration/models.py +++ b/thirdpart/registration/models.py @@ -334,12 +334,12 @@ def notify_admins_on_register_complete(reg_email): "reg_email": reg_email, } - subject = render_to_string('registration/register_complete_email_subject.txt', + subject = render_to_string('registration/register_complete_email_subject.html', ctx_dict) # Email subject *must not* contain newlines subject = ''.join(subject.splitlines()) - message = render_to_string('registration/register_complete_email.txt', + message = render_to_string('registration/register_complete_email.html', ctx_dict) admins = User.objects.get_superusers()