diff --git a/locale/ca/LC_MESSAGES/django.po b/locale/ca/LC_MESSAGES/django.po index fee7062118..3d7a4fcde3 100644 --- a/locale/ca/LC_MESSAGES/django.po +++ b/locale/ca/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: seahub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-11 13:47+0800\n" -"PO-Revision-Date: 2014-02-16 15:59+0000\n" -"Last-Translator: jordeu \n" +"POT-Creation-Date: 2014-04-10 11:01+0800\n" +"PO-Revision-Date: 2014-04-10 03:05+0000\n" +"Last-Translator: xiez \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/seahub/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,175 +18,207 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: seahub/forms.py:26 seahub/base/accounts.py:410 +#: seahub/forms.py:27 seahub/base/accounts.py:410 msgid "A user with this email already" msgstr "Ja existeix un usuari amb aquest correu electrònic" -#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171 +#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164 #: seahub/base/accounts.py:427 msgid "The two password fields didn't match." msgstr "Les contrasenyes no coincideixen" -#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16 +#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16 msgid "Name can't be empty" msgstr "El nom és obligatori" -#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17 +#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17 msgid "Name is too long (maximum is 255 characters)" msgstr "El nom és massa llarg (màxim de 255 caràcters)" -#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20 +#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20 msgid "Description can't be empty" msgstr "La descripció és obligatòria" -#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21 +#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21 msgid "Description is too long (maximum is 100 characters)" msgstr "La descripció és massa llarga (màxim de 100 caràcters)" -#: seahub/forms.py:63 +#: seahub/forms.py:64 #, python-format msgid "Name %s is not valid" msgstr "El nom %s no és vàlid" -#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729 -#: seahub/share/views.py:762 seahub/views/__init__.py:1074 -#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484 -#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977 -#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049 -#: seahub/views/ajax.py:1053 +#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708 +#: seahub/share/views.py:741 seahub/views/__init__.py:1107 +#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356 +#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641 +#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980 +#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145 +#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217 +#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455 msgid "Argument missing" msgstr "Falta un paràmetre" -#: seahub/forms.py:91 +#: seahub/forms.py:92 msgid "Oldname is required" msgstr "El nom antic és obligatori" -#: seahub/forms.py:94 seahub/forms.py:115 +#: seahub/forms.py:95 seahub/forms.py:116 msgid "It's too long." msgstr "És massa llarg" -#: seahub/forms.py:95 seahub/forms.py:116 +#: seahub/forms.py:96 seahub/forms.py:117 msgid "It's required." msgstr "És obligatori" -#: seahub/forms.py:102 seahub/forms.py:123 +#: seahub/forms.py:103 seahub/forms.py:124 #, python-format msgid "Name \"%s\" is not valid" msgstr "El nom \"%s\" no és vàlid" -#: seahub/forms.py:134 +#: seahub/forms.py:135 msgid "Repo id is required" msgstr "L'identificador de repositori és obligatori" -#: seahub/forms.py:135 +#: seahub/forms.py:136 msgid "Username is required" msgstr "El nom d'usuari és obligatori" -#: seahub/forms.py:136 +#: seahub/forms.py:137 seahub/forms.py:181 msgid "Password can't be empty" msgstr "La contrasenya és obligatòria" -#: seahub/forms.py:147 +#: seahub/forms.py:148 msgid "Bad url format" msgstr "El URL no és correcte" -#: seahub/forms.py:152 seahub/templates/repo.html:361 +#: seahub/forms.py:153 seahub/templates/repo.html:358 msgid "Wrong password" msgstr "La contrasenya no és correcte" -#: seahub/forms.py:154 seahub/views/__init__.py:1083 +#: seahub/forms.py:155 seahub/views/__init__.py:1113 +#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680 +#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784 msgid "Internal server error" msgstr "Error intern al servidor" -#: seahub/forms.py:156 +#: seahub/forms.py:157 msgid "Decrypt library error" msgstr "S'ha produït un error al desencriptar la llibreria" -#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29 +#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29 msgid "Email is required" msgstr "El correu electrònic és obligatori " -#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135 +#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129 msgid "Quota can't be empty" msgstr "La quota és obligatòria" -#: seahub/forms.py:165 +#: seahub/forms.py:166 msgid "Quota is too low (minimum value is 0)" msgstr "La quota no és correcte (el mínim és 0)" -#: seahub/forms.py:171 +#: seahub/forms.py:172 msgid "Library name is required" msgstr "El nom de la llibreria és obligatori " -#: seahub/forms.py:172 +#: seahub/forms.py:173 msgid "Library description is required" msgstr "La descripció de la llibreria és obligatòria" -#: seahub/forms.py:174 +#: seahub/forms.py:175 msgid "Please enter a number" msgstr "Introduïu un nombre" +#: seahub/forms.py:188 +msgid "Please enter a correct password." +msgstr "" + #: seahub/settings.py:133 +msgid "català" +msgstr "" + +#: seahub/settings.py:134 msgid "Deutsch" msgstr "Deutsch" -#: seahub/settings.py:134 +#: seahub/settings.py:135 msgid "English" msgstr "English" -#: seahub/settings.py:135 +#: seahub/settings.py:136 msgid "Español" msgstr "Español" -#: seahub/settings.py:136 +#: seahub/settings.py:137 +msgid "Argentinian Spanish" +msgstr "" + +#: seahub/settings.py:138 msgid "Mexican Spanish" msgstr "Mexican Spanish" -#: seahub/settings.py:137 -msgid "Français" -msgstr "Français" - -#: seahub/settings.py:138 -msgid "Hebrew" -msgstr "Hebrew" - #: seahub/settings.py:139 +msgid "français" +msgstr "" + +#: seahub/settings.py:140 +msgid "עברית" +msgstr "" + +#: seahub/settings.py:141 msgid "Magyar" msgstr "Magyar" -#: seahub/settings.py:140 +#: seahub/settings.py:142 +msgid "Íslenska" +msgstr "" + +#: seahub/settings.py:143 msgid "Italiano" msgstr "Italiano" -#: seahub/settings.py:141 +#: seahub/settings.py:144 +msgid "한국어" +msgstr "" + +#: seahub/settings.py:145 msgid "Latvian" msgstr "Latvian" -#: seahub/settings.py:142 -msgid "Dutch" -msgstr "Dutch" +#: seahub/settings.py:146 +msgid "Nederlands" +msgstr "" -#: seahub/settings.py:143 +#: seahub/settings.py:147 +msgid "Polski" +msgstr "" + +#: seahub/settings.py:148 msgid "Portuguese, Brazil" msgstr "Portuguese, Brazil" -#: seahub/settings.py:144 +#: seahub/settings.py:149 msgid "Русский" msgstr "Русский" -#: seahub/settings.py:145 +#: seahub/settings.py:150 msgid "Slovak" msgstr "Slovak" -#: seahub/settings.py:146 -msgid "Ukrainian" -msgstr "Ukrainian" +#: seahub/settings.py:151 +msgid "Svenska" +msgstr "" -#: seahub/settings.py:147 +#: seahub/settings.py:152 +msgid "українська мова" +msgstr "" + +#: seahub/settings.py:153 msgid "简体中文" msgstr "简体中文" -#: seahub/settings.py:148 +#: seahub/settings.py:154 msgid "繁體中文" msgstr "繁體中文" @@ -195,8 +227,9 @@ msgid "File Collaboration Team Organization" msgstr "Equip d'organització de fitxers" #: seahub/api2/templates/api2/discussion.html:6 -#: seahub/group/templates/group/group_base.html:25 +#: seahub/group/templates/group/group_base.html:23 #: seahub/group/templates/group/groups_right_panel.html:17 +#: seahub/templates/base.html:160 msgid "Discussion" msgstr "Missatges" @@ -208,16 +241,17 @@ msgstr "Missatges" #: seahub/api2/templates/api2/discussions_body.html:37 #: seahub/api2/templates/api2/new_msg_reply.html:27 #: seahub/api2/templates/api2/new_msg_reply.html:43 -#: seahub/group/templates/group/group_discuss.html:45 -#: seahub/group/templates/group/group_discuss.html:61 -#: seahub/group/templates/group/new_msg_reply.html:26 -#: seahub/group/templates/group/new_msg_reply.html:35 -#: seahub/message/templates/message/user_msg_list.html:47 +#: seahub/api2/templates/api2/user_msg_body.html:20 +#: seahub/group/templates/group/group_discuss.html:74 +#: seahub/group/templates/group/new_msg_reply.html:27 +#: seahub/group/templates/group/new_msg_reply.html:36 +#: seahub/message/templates/message/user_msg.html:17 +#: seahub/message/templates/message/user_msg_list.html:62 #: seahub/share/templates/share/links.html:28 #: seahub/share/templates/share/priv_shared_files.html:61 #: seahub/templates/repo_history_view.html:66 #: seahub/templates/repo_recycle_view.html:78 -#: seahub/templates/view_shared_dir.html:53 +#: seahub/templates/view_shared_dir.html:48 #: seahub/templates/snippets/group_recommend_form.html:28 #: seahub/templates/snippets/repo_dirents.html:57 msgid "File" @@ -227,13 +261,13 @@ msgstr "Fitxer" #: seahub/api2/templates/api2/discussion_posted.html:29 #: seahub/api2/templates/api2/discussions_body.html:31 #: seahub/api2/templates/api2/new_msg_reply.html:37 -#: seahub/group/templates/group/group_discuss.html:55 -#: seahub/group/templates/group/new_msg_reply.html:29 +#: seahub/group/templates/group/group_discuss.html:68 +#: seahub/group/templates/group/new_msg_reply.html:30 #: seahub/share/templates/share/links.html:31 #: seahub/share/templates/share/links.html:63 #: seahub/share/templates/share/priv_shared_files.html:64 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 -#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39 +#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29 +#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34 #: seahub/templates/snippets/group_recommend_form.html:22 #: seahub/templates/snippets/repo_dirents.html:8 msgid "Directory icon" @@ -242,9 +276,9 @@ msgstr "Icona del directori" #: seahub/api2/templates/api2/discussion_posted.html:46 #: seahub/api2/templates/api2/discussions_body.html:48 #: seahub/group/templates/group/discussion_list.html:17 -#: seahub/group/templates/group/group_discuss.html:71 -#: seahub/group/templates/group/group_discuss.html:147 -#: seahub/group/templates/group/new_msg_reply.html:45 +#: seahub/group/templates/group/group_discuss.html:85 +#: seahub/group/templates/group/group_discuss.html:160 +#: seahub/group/templates/group/new_msg_reply.html:47 #, python-format msgid "%(amount)s replies" msgstr "%(amount)s respostes" @@ -255,43 +289,48 @@ msgstr "No hi ha missatges" #: seahub/api2/templates/api2/discussions.html:29 #: seahub/api2/templates/api2/events.html:13 +#: seahub/api2/templates/api2/user_msg_list.html:25 #: seahub/notifications/templates/notifications/user_notification_list.html:26 -#: seahub/templates/activities.html:13 seahub/templates/repo.html:957 -#: seahub/templates/snippets/list_commit_detail.html:3 -#: seahub/templates/snippets/repo_dir_data.html:46 +#: seahub/templates/activities.html:13 +#: seahub/templates/snippets/repo_dir_data.html:48 msgid "Loading..." msgstr "S'està carregant..." #: seahub/api2/templates/api2/discussions.html:75 #: seahub/api2/templates/api2/events_js.html:34 +#: seahub/api2/templates/api2/user_msg_list.html:72 #: seahub/contacts/templates/contacts/contact_list.html:107 #: seahub/contacts/templates/contacts/contact_list.html:153 -#: seahub/group/templates/group/group_discuss.html:231 +#: seahub/group/templates/group/group_discuss.html:244 #: seahub/group/templates/group/msg_js.html:155 -#: seahub/message/templates/message/all_msg_list.html:141 -#: seahub/message/templates/message/all_msg_list.html:208 -#: seahub/message/templates/message/user_msg_list.html:156 +#: seahub/message/templates/message/all_msg_list.html:143 +#: seahub/message/templates/message/all_msg_list.html:219 +#: seahub/message/templates/message/user_msg_list.html:168 #: seahub/notifications/templates/notifications/user_notification_list.html:66 -#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592 -#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406 -#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628 -#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806 -#: seahub/templates/repo_settings.html:100 -#: seahub/templates/repo_settings.html:136 -#: seahub/templates/view_file_base.html:151 +#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592 +#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714 +#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559 +#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800 +#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935 +#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118 +#: seahub/templates/repo_settings.html:154 +#: seahub/templates/repo_settings.html:219 +#: seahub/templates/view_file_base.html:153 #: seahub/templates/snippets/bottom_bar.html:109 #: seahub/templates/snippets/events_js.html:56 -#: seahub/templates/snippets/office_convert_js.html:172 -#: seahub/templates/snippets/office_convert_js.html:197 +#: seahub/templates/snippets/msg_form_js.html:30 +#: seahub/templates/snippets/office_convert_js.html:177 +#: seahub/templates/snippets/office_convert_js.html:202 #: seahub/templates/snippets/repo_decrypt_js.html:35 -#: seahub/templates/snippets/shared_link_js.html:154 -#: seahub/templates/snippets/shared_link_js.html:189 -#: seahub/templates/snippets/shared_link_js.html:213 -#: seahub/templates/snippets/shared_link_js.html:276 -#: seahub/templates/snippets/shared_link_js.html:306 -#: seahub/templates/snippets/shared_link_js.html:330 -#: seahub/templates/sysadmin/sys_useradmin.html:94 -#: seahub/templates/sysadmin/userinfo.html:158 +#: seahub/templates/snippets/shared_link_js.html:197 +#: seahub/templates/snippets/shared_link_js.html:283 +#: seahub/templates/snippets/shared_link_js.html:308 +#: seahub/templates/snippets/shared_link_js.html:371 +#: seahub/templates/snippets/shared_link_js.html:437 +#: seahub/templates/snippets/shared_link_js.html:462 +#: seahub/templates/snippets/spreadsheet_convert_js.html:32 +#: seahub/templates/sysadmin/sys_useradmin.html:132 +#: seahub/templates/sysadmin/userinfo.html:152 msgid "Failed. Please check the network." msgstr "Error. Verifiqueu la connexió a la xarxa" @@ -340,6 +379,25 @@ msgstr "Verifiqueu la connexió a la xarxa" msgid "New Replies" msgstr "Hi ha respostes noves" +#: seahub/api2/templates/api2/user_msg_list.html:6 +#: seahub/message/templates/message/all_msg_list.html:4 +#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/user_msg_list.html:4 +#: seahub/share/templates/share/user_share_list.html:24 +#: seahub/templates/home_base.html:22 +msgid "Messages" +msgstr "Missatges" + +#: seahub/api2/templates/api2/user_msg_list.html:10 +#: seahub/message/templates/message/user_msg_list.html:9 +#, python-format +msgid "Messages with %(name)s" +msgstr "Missatges amb %(name)s" + +#: seahub/api2/templates/api2/user_msg_list.html:19 +msgid "No messages." +msgstr "" + #: seahub/auth/admin.py:29 msgid "Personal info" msgstr "Informació personal" @@ -353,10 +411,11 @@ msgid "Important dates" msgstr "Dates importants" #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5 -#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10 -#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15 -#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8 +#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14 +#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13 +#: seahub/templates/pubgrp.html:8 #: seahub/templates/snippets/repo_share_form.html:7 +#: seahub/templates/sysadmin/base.html:15 msgid "Groups" msgstr "Grups" @@ -369,72 +428,74 @@ msgstr "La contrasenya s'ha actualitzat " msgid "Change password: %s" msgstr "Modifiqueu la contrasenya: %s" -#: seahub/auth/forms.py:19 seahub/base/accounts.py:396 +#: seahub/auth/forms.py:18 seahub/base/accounts.py:396 msgid "Username" msgstr "Nom d'usuari" -#: seahub/auth/forms.py:20 seahub/auth/forms.py:159 -#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10 -#: seahub/templates/registration/registration_form.html:18 +#: seahub/auth/forms.py:19 seahub/auth/forms.py:152 +#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36 +#: seahub/templates/registration/registration_form.html:19 +#: seahub/templates/snippets/file_share_popup.html:36 +#: seahub/templates/snippets/file_share_popup.html:77 #: seahub/templates/snippets/repo_create_form.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:26 +#: seahub/templates/sysadmin/sys_useradmin.html:31 msgid "Password" msgstr "Contrasenya" -#: seahub/auth/forms.py:40 +#: seahub/auth/forms.py:39 msgid "" "Please enter a correct username and password. Note that both fields are " "case-sensitive." msgstr "Introduïu un nom d'usuari i contrasenyes correctes. Les majúscules i minúscules es consideren caràcters diferents." -#: seahub/auth/forms.py:42 +#: seahub/auth/forms.py:41 msgid "This account is inactive." msgstr "Aquest compte està deshabilitat" -#: seahub/auth/forms.py:47 +#: seahub/auth/forms.py:46 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "Per poder iniciar sessió el navegador ha de tenir les 'cookies' activades." -#: seahub/auth/forms.py:63 +#: seahub/auth/forms.py:62 msgid "E-mail" msgstr "Correu electrònic" -#: seahub/auth/forms.py:70 +#: seahub/auth/forms.py:69 msgid "" "Failed to send email, email service is not properly configured, please " "contact administrator." msgstr "No s'ha pogut enviar el correu. El servei de missatgeria no està ben configurat, aviseu l'administrador." -#: seahub/auth/forms.py:78 +#: seahub/auth/forms.py:77 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "Aquest correu electrònic no té cap compte associat. Verifiqueu que sigui correcte i estigui registrada." -#: seahub/auth/forms.py:108 +#: seahub/auth/forms.py:101 #, python-format -msgid "Password reset on %s" -msgstr "S'ha inicialitzat la contrasenya amb %s" +msgid "Reset Password on %s" +msgstr "" -#: seahub/auth/forms.py:116 +#: seahub/auth/forms.py:109 msgid "New password" msgstr "Contrasenya nova" -#: seahub/auth/forms.py:117 +#: seahub/auth/forms.py:110 msgid "New password confirmation" msgstr "Confirma la nova contrasenya" -#: seahub/auth/forms.py:143 +#: seahub/auth/forms.py:136 msgid "Old password" msgstr "Contrasenya antiga" -#: seahub/auth/forms.py:151 +#: seahub/auth/forms.py:144 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "La contrasenya antiga no coincideix. Torneu a introduir-la." -#: seahub/auth/forms.py:160 seahub/base/accounts.py:402 +#: seahub/auth/forms.py:153 seahub/base/accounts.py:402 msgid "Password (again)" msgstr "Repetiu la contrasenya" @@ -472,7 +533,7 @@ msgid "" "%(nb_max_avatars)d." msgstr "Teniu %(nb_avatars)d avatars, i el màxim permès és de %(nb_max_avatars)d." -#: seahub/avatar/models.py:138 seahub/avatar/models.py:163 +#: seahub/avatar/models.py:137 seahub/avatar/models.py:165 #, python-format msgid "Avatar for %s" msgstr "Avatar de %s" @@ -540,57 +601,62 @@ msgstr "Avatar actual:" #: seahub/contacts/templates/contacts/contact_list.html:62 #: seahub/group/templates/group/discussion_list.html:42 #: seahub/group/templates/group/group_base.html:61 -#: seahub/group/templates/group/group_discuss.html:16 -#: seahub/group/templates/group/group_discuss.html:98 -#: seahub/group/templates/group/group_discuss.html:155 +#: seahub/group/templates/group/group_discuss.html:17 +#: seahub/group/templates/group/group_discuss.html:29 +#: seahub/group/templates/group/group_discuss.html:112 +#: seahub/group/templates/group/group_discuss.html:168 #: seahub/group/templates/group/group_info.html:130 #: seahub/group/templates/group/group_manage.html:100 #: seahub/group/templates/group/group_manage.html:108 #: seahub/group/templates/group/group_pubinfo.html:24 -#: seahub/group/templates/group/group_wiki.html:25 -#: seahub/group/templates/group/group_wiki.html:57 +#: seahub/group/templates/group/group_wiki.html:51 +#: seahub/group/templates/group/group_wiki.html:61 +#: seahub/group/templates/group/group_wiki.html:94 #: seahub/group/templates/group/group_wiki_pages.html:33 #: seahub/group/templates/group/groups_right_panel.html:37 #: seahub/group/templates/group/grpmember_add_form.html:32 -#: seahub/group/templates/group/new_msg_reply.html:65 -#: seahub/message/templates/message/all_msg_list.html:50 -#: seahub/message/templates/message/user_msg_list.html:20 -#: seahub/notifications/templates/notifications/notification_list.html:15 +#: seahub/group/templates/group/new_msg_reply.html:67 +#: seahub/message/templates/message/all_msg_list.html:51 +#: seahub/message/templates/message/user_msg_list.html:21 +#: seahub/message/templates/message/user_msg_list.html:33 +#: seahub/notifications/templates/notifications/notification_list.html:14 #: seahub/options/templates/options/set_user_options.html:14 -#: seahub/profile/templates/profile/set_profile.html:60 -#: seahub/profile/templates/profile/set_profile.html:75 +#: seahub/profile/templates/profile/set_profile.html:61 #: seahub/profile/templates/profile/set_profile.html:86 -#: seahub/profile/templates/profile/set_profile.html:112 +#: seahub/profile/templates/profile/set_profile.html:97 +#: seahub/profile/templates/profile/set_profile.html:123 #: seahub/templates/activities.html:25 #: seahub/templates/decrypt_repo_form.html:13 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245 -#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72 -#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152 -#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197 -#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231 -#: seahub/templates/repo_settings.html:28 -#: seahub/templates/repo_settings.html:36 +#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63 +#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143 +#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188 +#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229 +#: seahub/templates/repo_settings.html:31 +#: seahub/templates/repo_settings.html:39 +#: seahub/templates/repo_settings.html:53 +#: seahub/templates/share_access_validation.html:10 #: seahub/templates/shared_file_view.html:50 -#: seahub/templates/registration/login.html:34 #: seahub/templates/registration/password_change_form.html:18 #: seahub/templates/registration/password_reset_confirm.html:19 #: seahub/templates/registration/password_reset_form.html:13 -#: seahub/templates/registration/registration_form.html:33 #: seahub/templates/snippets/add_to_contacts_form.html:8 #: seahub/templates/snippets/file_share_popup.html:24 -#: seahub/templates/snippets/file_share_popup.html:41 -#: seahub/templates/snippets/file_share_popup.html:61 +#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:95 #: seahub/templates/snippets/group_recommend_form.html:19 #: seahub/templates/snippets/repo_create_form.html:26 -#: seahub/templates/snippets/repo_share_form.html:52 +#: seahub/templates/snippets/repo_share_form.html:30 #: seahub/templates/snippets/search_form.html:57 #: seahub/templates/sysadmin/repo_transfer_form.html:8 -#: seahub/templates/sysadmin/sys_repo_search.html:11 -#: seahub/templates/sysadmin/sys_useradmin.html:31 -#: seahub/templates/sysadmin/user_search.html:10 -#: seahub/templates/sysadmin/userinfo.html:53 -#: seahub/templates/wiki/personal_wiki.html:24 -#: seahub/templates/wiki/personal_wiki.html:52 +#: seahub/templates/sysadmin/sys_repo_search.html:13 +#: seahub/templates/sysadmin/sys_useradmin.html:36 +#: seahub/templates/sysadmin/sys_useradmin.html:51 +#: seahub/templates/sysadmin/user_search.html:12 +#: seahub/templates/sysadmin/userinfo.html:47 +#: seahub/templates/wiki/personal_wiki.html:46 +#: seahub/templates/wiki/personal_wiki.html:56 +#: seahub/templates/wiki/personal_wiki.html:85 #: seahub/templates/wiki/personal_wiki_pages.html:31 msgid "Submit" msgstr "Envia" @@ -607,7 +673,7 @@ msgstr "%(avatar_creator)s ha actualitzat el seu av msgid "You have updated your avatar %(avatar)s." msgstr "Vós ha actualitzat l'avatar %(avatar)s." -#: seahub/avatar/templatetags/avatar_tags.py:46 +#: seahub/avatar/templatetags/avatar_tags.py:47 msgid "Default Avatar" msgstr "Avatar per defecte" @@ -639,7 +705,7 @@ msgstr "telèfon" msgid "note" msgstr "nota" -#: seahub/base/decorators.py:85 +#: seahub/base/decorators.py:102 msgid "Files in this library can not be viewed online." msgstr "Els fitxers d'aquesta llibreria no es poden mostrar a la web" @@ -696,7 +762,7 @@ msgstr "S'ha restaurat el fitxer \"%(file)s\" a l'estat de %(time)s." msgid "Recovered deleted directory" msgstr "S'ha recuperat el directori eliminat" -#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879 +#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965 msgid "Changed library name or description" msgstr "S'ha canviat el nom o descripció de la llibreria" @@ -706,9 +772,9 @@ msgstr "Sincronització automàtica de seafile" #: seahub/base/templatetags/seahub_tags.py:179 #: seahub/base/templatetags/seahub_tags.py:213 -#: seahub/group/templates/group/group_discuss.html:140 -#: seahub/templates/repo.html:1543 -#: seahub/templates/snippets/my_owned_repos.html:226 +#: seahub/group/templates/group/group_discuss.html:154 +#: seahub/templates/repo.html:1647 +#: seahub/templates/snippets/my_owned_repos.html:130 msgid "Just now" msgstr "Ara mateix" @@ -744,42 +810,48 @@ msgstr[1] "Fa %(seconds)d segons" #: seahub/group/templates/group/group_info.html:31 #: seahub/group/templates/group/group_info.html:34 #: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/share/views.py:365 seahub/share/views.py:496 +#: seahub/share/views.py:362 seahub/share/views.py:493 #: seahub/share/templates/share/list_priv_shared_folders.html:23 #: seahub/share/templates/share/list_priv_shared_folders.html:36 #: seahub/share/templates/share/repos.html:24 #: seahub/share/templates/share/repos.html:26 #: seahub/share/templates/share/repos.html:40 #: seahub/share/templates/share/user_share_list.html:42 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26 +#: seahub/templates/pubrepo.html.py:29 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 #: seahub/templates/snippets/my_owned_repos.html:29 #: seahub/templates/snippets/my_owned_repos.html:31 #: seahub/templates/snippets/my_owned_repos.html:75 #: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:223 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 #: seahub/templates/snippets/repo_create_form.html:11 -#: seahub/templates/snippets/repo_share_form.html:47 -#: seahub/templates/sysadmin/userinfo.html:78 -#: seahub/templates/sysadmin/userinfo.html:104 +#: seahub/templates/snippets/repo_share_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:72 +#: seahub/templates/sysadmin/userinfo.html:98 msgid "Read-Write" msgstr "Lectura-Escriptura" #: seahub/base/templatetags/seahub_tags.py:312 #: seahub/group/templates/group/group_info.html:36 #: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/views.py:367 seahub/share/views.py:498 +#: seahub/share/views.py:364 seahub/share/views.py:495 #: seahub/share/templates/share/list_priv_shared_folders.html:34 #: seahub/share/templates/share/repos.html:38 #: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:190 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31 +#: seahub/templates/repo.html:20 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_shared_repos.html:22 #: seahub/templates/snippets/repo_create_form.html:12 -#: seahub/templates/snippets/repo_share_form.html:48 +#: seahub/templates/snippets/repo_share_form.html:26 msgid "Read-Only" msgstr "Només lectura" @@ -788,33 +860,33 @@ msgstr "Només lectura" msgid "Email is required." msgstr "El correu electrònic és obligatori" -#: seahub/contacts/views.py:62 seahub/contacts/views.py:99 -#: seahub/group/views.py:806 +#: seahub/contacts/views.py:64 seahub/contacts/views.py:101 +#: seahub/group/views.py:796 #, python-format msgid "%s is not a valid email." msgstr "%s no és un correu electrònic vàlid." -#: seahub/contacts/views.py:67 seahub/contacts/views.py:103 +#: seahub/contacts/views.py:69 seahub/contacts/views.py:105 #, python-format msgid "%s is already in your contacts." msgstr "Ja teniu %s al llistat de contactes." -#: seahub/contacts/views.py:76 seahub/contacts/views.py:111 +#: seahub/contacts/views.py:78 seahub/contacts/views.py:113 #, python-format msgid "Successfully added %s to contacts." msgstr "S'ha afegit %s a la llista de contactes" -#: seahub/contacts/views.py:81 seahub/contacts/views.py:114 +#: seahub/contacts/views.py:83 seahub/contacts/views.py:116 #, python-format msgid "Failed to add %s to contacts." msgstr "Error al afegir %s a la llista de contactes" -#: seahub/contacts/views.py:136 +#: seahub/contacts/views.py:138 #, python-format msgid "Successfully edited %s." msgstr "S'ha actualitzat %s" -#: seahub/contacts/views.py:149 +#: seahub/contacts/views.py:151 #, python-format msgid "Successfully Deleted %s" msgstr "S'ha eliminat %s" @@ -839,10 +911,10 @@ msgstr "Correu electrònic" #: seahub/contacts/templates/contacts/contact_list.html:18 #: seahub/group/templates/group/group_info.html:21 #: seahub/group/templates/group/group_info_for_pub.html:13 -#: seahub/group/templates/group/group_wiki.html:20 -#: seahub/group/templates/group/group_wiki.html:54 +#: seahub/group/templates/group/group_wiki.html:46 +#: seahub/group/templates/group/group_wiki.html:91 #: seahub/group/templates/group/group_wiki_pages.html:30 -#: seahub/message/templates/message/all_msg_list.html:21 +#: seahub/message/templates/message/all_msg_list.html:22 #: seahub/share/templates/share/links.html:20 #: seahub/share/templates/share/links.html:56 #: seahub/share/templates/share/list_priv_shared_folders.html:15 @@ -850,45 +922,46 @@ msgstr "Correu electrònic" #: seahub/share/templates/share/priv_shared_files.html:53 #: seahub/share/templates/share/repos.html:15 #: seahub/share/templates/share/user_share_list.html:33 -#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52 +#: seahub/templates/my_group_repos.html:8 +#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16 +#: seahub/templates/repo_history_view.html:52 #: seahub/templates/repo_recycle_view.html:53 -#: seahub/templates/repo_settings.html:15 -#: seahub/templates/view_shared_dir.html:32 -#: seahub/templates/registration/registration_form.html:12 +#: seahub/templates/repo_settings.html:17 +#: seahub/templates/view_shared_dir.html:27 +#: seahub/templates/registration/registration_form.html:13 +#: seahub/templates/snippets/my_group_repos.html:8 #: seahub/templates/snippets/my_owned_repos.html:20 #: seahub/templates/snippets/my_owned_repos.html:67 -#: seahub/templates/snippets/my_owned_repos.html:114 -#: seahub/templates/snippets/my_owned_repos.html:168 -#: seahub/templates/snippets/my_owned_repos.html:217 +#: seahub/templates/snippets/my_owned_repos.html:121 +#: seahub/templates/snippets/my_shared_repos.html:6 #: seahub/templates/snippets/repo_create_form.html:4 -#: seahub/templates/snippets/repo_dir_data.html:38 +#: seahub/templates/snippets/repo_dir_data.html:40 #: seahub/templates/sysadmin/repoadmin_table.html:4 -#: seahub/templates/sysadmin/sys_group_admin.html:12 -#: seahub/templates/sysadmin/sys_list_system.html:20 +#: seahub/templates/sysadmin/sys_group_admin.html:13 +#: seahub/templates/sysadmin/sys_list_system.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:11 -#: seahub/templates/sysadmin/sys_publink_admin.html:10 -#: seahub/templates/sysadmin/sys_repo_search.html:9 -#: seahub/templates/sysadmin/userinfo.html:71 -#: seahub/templates/sysadmin/userinfo.html:97 -#: seahub/templates/wiki/personal_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:49 +#: seahub/templates/sysadmin/sys_publink_admin.html:12 +#: seahub/templates/sysadmin/sys_repo_search.html:11 +#: seahub/templates/sysadmin/userinfo.html:65 +#: seahub/templates/sysadmin/userinfo.html:91 +#: seahub/templates/wiki/personal_wiki.html:41 +#: seahub/templates/wiki/personal_wiki.html:82 #: seahub/templates/wiki/personal_wiki_pages.html:28 msgid "Name" msgstr "Nom" #: seahub/contacts/templates/contacts/contact_list.html:19 -#: seahub/templates/registration/registration_form.html:28 +#: seahub/templates/registration/registration_form.html:29 msgid "Note" msgstr "Nota" #: seahub/contacts/templates/contacts/contact_list.html:20 #: seahub/group/templates/group/group_info.html:25 #: seahub/group/templates/group/group_info_for_pub.html:17 -#: seahub/group/templates/group/group_manage.html:22 +#: seahub/group/templates/group/group_manage.html:25 #: seahub/group/templates/group/group_manage.html:49 #: seahub/group/templates/group/group_manage.html:79 -#: seahub/notifications/templates/notifications/notification_list.html:7 -#: seahub/notifications/templates/notifications/notification_list.html:26 +#: seahub/notifications/templates/notifications/notification_list.html:21 #: seahub/share/templates/share/links.html:23 #: seahub/share/templates/share/links.html:59 #: seahub/share/templates/share/list_priv_shared_folders.html:19 @@ -897,56 +970,64 @@ msgstr "Nota" #: seahub/share/templates/share/repos.html:19 #: seahub/share/templates/share/user_share_list.html:36 #: seahub/templates/client_mgmt.html:17 -#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17 +#: seahub/templates/file_revisions.html:28 +#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20 #: seahub/templates/repo_recycle_view.html:56 #: seahub/templates/repo_view_snapshot.html:18 -#: seahub/templates/view_shared_dir.html:34 +#: seahub/templates/view_shared_dir.html:29 #: seahub/templates/snippets/my_owned_repos.html:23 #: seahub/templates/snippets/my_owned_repos.html:70 -#: seahub/templates/snippets/my_owned_repos.html:118 -#: seahub/templates/snippets/my_owned_repos.html:220 -#: seahub/templates/snippets/repo_dir_data.html:41 +#: seahub/templates/snippets/my_owned_repos.html:124 +#: seahub/templates/snippets/my_shared_repos.html:10 +#: seahub/templates/snippets/repo_dir_data.html:43 #: seahub/templates/sysadmin/repoadmin_table.html:8 -#: seahub/templates/sysadmin/sys_group_admin.html:15 +#: seahub/templates/sysadmin/sys_group_admin.html:16 #: seahub/templates/sysadmin/sys_org_admin.html:15 -#: seahub/templates/sysadmin/sys_publink_admin.html:14 -#: seahub/templates/sysadmin/useradmin_table.html:8 -#: seahub/templates/sysadmin/userinfo.html:73 +#: seahub/templates/sysadmin/sys_publink_admin.html:16 +#: seahub/templates/sysadmin/useradmin_table.html:9 +#: seahub/templates/sysadmin/useradmin_table.html:74 +#: seahub/templates/sysadmin/userinfo.html:67 msgid "Operations" msgstr "Operacions" #: seahub/contacts/templates/contacts/contact_list.html:29 +#: seahub/group/templates/group/group_wiki.html:22 #: seahub/share/templates/share/list_priv_shared_folders.html:29 #: seahub/share/templates/share/repos.html:33 #: seahub/templates/file_edit.html:80 #: seahub/templates/view_file_markdown.html:13 #: seahub/templates/view_file_sf.html:6 #: seahub/templates/view_file_text.html:24 -#: seahub/templates/sysadmin/useradmin_table.html:23 +#: seahub/templates/sysadmin/useradmin_table.html:24 +#: seahub/templates/sysadmin/useradmin_table.html:90 +#: seahub/templates/wiki/personal_wiki.html:21 msgid "Edit" msgstr "Edita" #: seahub/contacts/templates/contacts/contact_list.html:30 -#: seahub/group/templates/group/group_discuss.html:33 -#: seahub/group/templates/group/group_discuss.html:138 -#: seahub/group/templates/group/group_manage.html:31 +#: seahub/group/templates/group/group_discuss.html:45 +#: seahub/group/templates/group/group_discuss.html:152 +#: seahub/group/templates/group/group_manage.html:34 #: seahub/group/templates/group/group_manage.html:58 -#: seahub/notifications/templates/notifications/notification_list.html:38 -#: seahub/profile/templates/profile/set_profile.html:102 -#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267 +#: seahub/message/templates/message/user_msg.html:8 +#: seahub/message/templates/message/user_msg_list.html:52 +#: seahub/notifications/templates/notifications/notification_list.html:33 +#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264 #: seahub/templates/view_shared_upload_link.html:87 -#: seahub/templates/snippets/file_share_popup.html:34 -#: seahub/templates/snippets/file_share_popup.html:54 +#: seahub/templates/snippets/file_share_popup.html:55 +#: seahub/templates/snippets/file_share_popup.html:88 #: seahub/templates/snippets/my_owned_repos.html:46 #: seahub/templates/snippets/my_owned_repos.html:94 -#: seahub/templates/snippets/my_owned_repos.html:232 +#: seahub/templates/snippets/my_owned_repos.html:136 #: seahub/templates/snippets/repo_dirents.html:35 #: seahub/templates/snippets/repo_dirents.html:89 -#: seahub/templates/sysadmin/repoadmin_table.html:18 -#: seahub/templates/sysadmin/sys_group_admin.html:22 +#: seahub/templates/sysadmin/repoadmin_table.html:24 +#: seahub/templates/sysadmin/sys_group_admin.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:23 -#: seahub/templates/sysadmin/useradmin_table.html:46 -#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/useradmin_table.html:49 +#: seahub/templates/sysadmin/useradmin_table.html:115 +#: seahub/templates/sysadmin/userinfo.html:76 msgid "Delete" msgstr "Elimina" @@ -962,17 +1043,19 @@ msgstr "Afegiu nous contactes per compartir llibreries més fàcilment" #: seahub/contacts/templates/contacts/contact_list.html:44 #: seahub/contacts/templates/contacts/contact_list.html:55 -#: seahub/group/templates/group/group_manage.html:21 +#: seahub/group/templates/group/group_manage.html:24 #: seahub/group/templates/group/group_manage.html:48 -#: seahub/templates/repo_settings.html:34 -#: seahub/templates/registration/login.html:8 -#: seahub/templates/registration/registration_form.html:16 +#: seahub/templates/repo_settings.html:37 +#: seahub/templates/registration/login.html:34 +#: seahub/templates/registration/registration_form.html:17 #: seahub/templates/snippets/add_to_contacts_form.html:2 #: seahub/templates/sysadmin/repo_transfer_form.html:5 -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18 -#: seahub/templates/sysadmin/sys_useradmin.html:24 -#: seahub/templates/sysadmin/user_search.html:9 -#: seahub/templates/sysadmin/useradmin_table.html:4 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22 +#: seahub/templates/sysadmin/sys_useradmin.html:29 +#: seahub/templates/sysadmin/user_search.html:11 +#: seahub/templates/sysadmin/useradmin_table.html:5 +#: seahub/templates/sysadmin/useradmin_table.html:70 +#: seahub/templates/sysadmin/userinfo.html:11 msgid "Email" msgstr "Correu electrònic" @@ -997,8 +1080,8 @@ msgid "Delete Contact" msgstr "Elimina el contacte" #: seahub/contacts/templates/contacts/contact_list.html:115 -#: seahub/notifications/templates/notifications/notification_list.html:57 -#: seahub/templates/sysadmin/sys_group_admin.html:63 +#: seahub/notifications/templates/notifications/notification_list.html:52 +#: seahub/templates/sysadmin/sys_group_admin.html:64 #: seahub/templates/sysadmin/sys_org_admin.html:63 #: seahub/templates/sysadmin/useradmin_js.html:4 #, python-format @@ -1074,400 +1157,415 @@ msgstr "El missatge de verificació és massa llarg (màxim de 255 caràcters)" msgid "\"%s\" is not a valid name" msgstr "El nom \"%s\" no és vàlid" -#: seahub/group/views.py:145 +#: seahub/group/views.py:140 #, python-format msgid "" "You can only create %d groups.Upgrade " "account." msgstr "Només pot crear %d grups. Actualitzi el compte" -#: seahub/group/views.py:160 +#: seahub/group/views.py:155 msgid "There is already a group with that name." msgstr "Aquest nom de grup ja existeix" -#: seahub/group/views.py:264 +#: seahub/group/views.py:259 #, python-format msgid "Successfully renamed group to \"%s\"." msgstr "S'ha reanomenat el grup a \"%s\"." -#: seahub/group/views.py:266 +#: seahub/group/views.py:261 msgid "" "Failed to rename group, group name can only contain letters, numbers or " "underscore" msgstr "No s'ha pogut reanomenar el grup. El nom de grup ha d'estar format només per lletres, nombres i '_'" -#: seahub/group/views.py:285 +#: seahub/group/views.py:280 #, python-format msgid "Email %s is not valid." msgstr "El correu electrònic %s no és vàlid." -#: seahub/group/views.py:314 seahub/group/views.py:336 +#: seahub/group/views.py:309 seahub/group/views.py:331 msgid "Only administrators can make the group public" msgstr "Només els administradors poden fer el grup públic" -#: seahub/group/views.py:382 +#: seahub/group/views.py:377 seahub/message/views.py:121 msgid "The message doesn't exist" msgstr "El missatge no existeix" -#: seahub/group/views.py:392 +#: seahub/group/views.py:387 seahub/message/views.py:130 msgid "You don't have the permission." msgstr "No té autorització" -#: seahub/group/views.py:630 seahub/group/views.py:781 +#: seahub/group/views.py:626 seahub/group/views.py:771 #, python-format msgid "" "You can only invite %d members.Upgrade " "account." msgstr "Només pot convidar a %d membres. Actualitzi el compte." -#: seahub/group/views.py:655 -msgid "Your friend added you to a group at Seafile." -msgstr "Un amic l'ha afegit a un grup de Seafile" +#: seahub/group/views.py:645 +#, python-format +msgid "You are invited to join a group on %s" +msgstr "" -#: seahub/group/views.py:681 +#: seahub/group/views.py:671 #, python-format msgid "Failed to add, %s is not registerd." msgstr "No s'ha afegit %s perquè no és un usuari registrat." -#: seahub/group/views.py:695 +#: seahub/group/views.py:685 #, python-format msgid "Successfully added. An email has been sent." msgid_plural "Successfully added. %(count)s emails have been sent." msgstr[0] "S'ha afegit i notificat per correu electrònic correctament." msgstr[1] "S'han afegit correctament. %(count)s notificats per correu electrònic." -#: seahub/group/views.py:703 +#: seahub/group/views.py:693 msgid "Successfully added." msgstr "S'han afegit correctament." -#: seahub/group/views.py:752 +#: seahub/group/views.py:742 #, python-format msgid "Failed to add, %s is not a valid email." msgstr "%s no és un correu electrònic vàlid." -#: seahub/group/views.py:762 +#: seahub/group/views.py:752 #, python-format msgid "Failed to add, %s is not registrated." msgstr "No s'ha afegit %s perquè no és un usuari registrat." -#: seahub/group/views.py:794 seahub/group/views.py:811 -#: seahub/group/views.py:838 +#: seahub/group/views.py:784 seahub/group/views.py:801 +#: seahub/group/views.py:828 msgid "Operation succeeded." msgstr "S'ha completat correctament." -#: seahub/group/views.py:840 +#: seahub/group/views.py:830 #, python-format msgid "Failed：%s" msgstr "Error: %s" -#: seahub/group/views.py:865 +#: seahub/group/views.py:855 msgid "Failed to unshare: the group doesn't exist." msgstr "No s'ha pogut deixar de compartir perquè el grup no existeix." -#: seahub/group/views.py:870 +#: seahub/group/views.py:860 msgid "" "Operation failed: only administrators and the owner of the library can " "unshare it." msgstr "Només els administradors i propietaris del grup poden deshabilitar la compartició." -#: seahub/group/views.py:873 +#: seahub/group/views.py:863 msgid "Failed to unshare: internal error." msgstr "Error intern al eliminar la compartició." -#: seahub/group/views.py:902 +#: seahub/group/views.py:892 msgid "Error: wrong group id" msgstr "L'identificador de grup no és correcte" -#: seahub/group/views.py:907 +#: seahub/group/views.py:897 msgid "Error: the group does not exist." msgstr "El grup no existeix." -#: seahub/group/views.py:939 +#: seahub/group/views.py:929 #, python-format msgid "Successfully posted to %(groups)s." msgstr "S'ha enviat a %(groups)s." -#: seahub/group/views.py:942 +#: seahub/group/views.py:932 #, python-format msgid "Error: you are not in group %s." msgstr "Vós no pertany al grup %s." -#: seahub/group/views.py:954 +#: seahub/group/views.py:944 msgid "Error: the library does not exist." msgstr "La llibreria no existeix." -#: seahub/group/views.py:957 +#: seahub/group/views.py:947 msgid "Error: no path." msgstr "Error: Ruta de fitxer errònia." -#: seahub/group/views.py:995 +#: seahub/group/views.py:985 msgid "Failed to create: the group does not exist." msgstr "Error: El grup no existeix." -#: seahub/group/views.py:999 +#: seahub/group/views.py:989 msgid "Failed to create: you are not in the group." msgstr "Error: Vós no pertany al grup." -#: seahub/group/views.py:1025 seahub/group/views.py:1056 -#: seahub/group/views.py:1436 seahub/views/wiki.py:127 +#: seahub/group/views.py:1015 seahub/group/views.py:1046 +#: seahub/group/views.py:1460 seahub/views/wiki.py:146 msgid "Failed to create" msgstr "No s'ha pogut crear" -#: seahub/group/views.py:1039 seahub/group/views.py:1069 -#: seahub/group/views.py:1445 +#: seahub/group/views.py:1029 seahub/group/views.py:1059 +#: seahub/group/views.py:1469 msgid "Failed to create: internal error." msgstr "No s'ha pogut crear." -#: seahub/group/views.py:1093 +#: seahub/group/views.py:1083 msgid "You are already in the group." msgstr "Ja pertany al grup." -#: seahub/group/views.py:1108 +#: seahub/group/views.py:1098 msgid "Sent successfully, the group admin will handle it." msgstr "S'ha notificat al administrador del grup." -#: seahub/group/views.py:1269 seahub/views/__init__.py:575 -#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596 -#: seahub/views/file.py:686 +#: seahub/group/views.py:1174 +msgid "Discussion is required." +msgstr "" + +#: seahub/group/views.py:1277 seahub/views/__init__.py:659 +#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618 +#: seahub/views/file.py:710 msgid "File does not exist" msgstr "El fitxer no existeix" -#: seahub/group/views.py:1305 +#: seahub/group/views.py:1313 msgid "Successfully enable \"Wiki\"." msgstr "La \"Wiki\" s'ha activat." -#: seahub/group/views.py:1310 +#: seahub/group/views.py:1318 msgid "Successfully disable \"Wiki\"." msgstr "La \"Wiki\" s'ha desactivat." -#: seahub/group/views.py:1346 seahub/group/views.py:1483 -#: seahub/views/wiki.py:54 seahub/views/wiki.py:161 +#: seahub/group/views.py:1357 seahub/group/views.py:1531 +#: seahub/views/wiki.py:60 seahub/views/wiki.py:202 msgid "Failed to create wiki page. Please retry later." msgstr "No s'ha pogut crear la pàgina. Proveu més tard. " -#: seahub/group/views.py:1388 seahub/views/__init__.py:569 -#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448 -#: seahub/views/wiki.py:90 +#: seahub/group/views.py:1412 seahub/views/__init__.py:653 +#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532 +#: seahub/views/wiki.py:109 msgid "Internal Server Error" msgstr "S'ha produït un error intern" -#: seahub/group/views.py:1390 seahub/views/wiki.py:92 +#: seahub/group/views.py:1414 seahub/views/wiki.py:111 msgid "Wiki does not exists." msgstr "El \"Wiki\" no existeix." -#: seahub/group/views.py:1452 seahub/views/wiki.py:134 +#: seahub/group/views.py:1476 seahub/group/views.py:1501 +#: seahub/views/wiki.py:153 seahub/views/wiki.py:176 msgid "Failed to create home page. Please retry later" msgstr "S'ha produït un error al crear la pàgina. Proveu més tard" -#: seahub/group/views.py:1473 seahub/group/views.py:1499 -#: seahub/group/views.py:1517 seahub/views/wiki.py:151 -#: seahub/views/wiki.py:174 seahub/views/wiki.py:189 +#: seahub/group/views.py:1492 seahub/views/wiki.py:167 +msgid "Failed to set wiki library." +msgstr "" + +#: seahub/group/views.py:1521 seahub/group/views.py:1547 +#: seahub/group/views.py:1565 seahub/views/wiki.py:192 +#: seahub/views/wiki.py:215 seahub/views/wiki.py:230 msgid "Wiki is not found." msgstr "No s'ha trobat la \"Wiki\"" -#: seahub/group/views.py:1480 seahub/views/wiki.py:158 +#: seahub/group/views.py:1528 seahub/views/wiki.py:199 #, python-format msgid "Page \"%s\" already exists." msgstr "La pàgina \"%s\" ja existeix." -#: seahub/group/templates/group/add_member_email.html:2 +#: seahub/group/views.py:1570 #, python-format -msgid "" -"%(email)s invite you to join group %(group.group_name)s. Please go to the " -"following page and sign up:" -msgstr "En %(email)s l'ha convidat a unir-se al grup %(group.group_name)s. Seguiu el següent enllaç per acceptar-ho:" +msgid "Successfully deleted \"%s\"." +msgstr "" -#: seahub/group/templates/group/add_member_email.html:5 -#: seahub/group/templates/group/group_join_email.html:6 -#: seahub/templates/shared_link_email.html:7 -#: seahub/templates/shared_upload_link_email.html:7 -#: seahub/templates/registration/password_reset_email.html:10 -#: seahub/templates/sysadmin/user_add_email.html:14 -#: seahub/templates/sysadmin/user_reset_email.html:6 -msgid "Thanks for using our site!" -msgstr "Gràcies per confiar en nosaltres." - -#: seahub/group/templates/group/add_member_email.html:7 -#: seahub/group/templates/group/group_join_email.html:8 -#: seahub/templates/shared_link_email.html:9 -#: seahub/templates/shared_upload_link_email.html:9 -#: seahub/templates/registration/password_reset_email.html:12 -#: seahub/templates/sysadmin/user_add_email.html:16 -#: seahub/templates/sysadmin/user_reset_email.html:8 +#: seahub/group/views.py:1572 #, python-format -msgid "The %(site_name)s team" -msgstr "L'equip %(site_name)s" +msgid "Failed to delete \"%s\". Please retry later." +msgstr "" + +#: seahub/group/templates/group/add_member_email.html:8 +msgid "Hi, " +msgstr "" + +#: seahub/group/templates/group/add_member_email.html:11 +#, python-format +msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: " +msgstr "" #: seahub/group/templates/group/discussion_list.html:18 -#: seahub/group/templates/group/group_discuss.html:72 -#: seahub/group/templates/group/group_discuss.html:148 -#: seahub/group/templates/group/new_msg_reply.html:46 +#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:161 +#: seahub/group/templates/group/new_msg_reply.html:48 msgid "Hide replies" msgstr "Oculta les respostes" #: seahub/group/templates/group/discussion_list.html:31 -#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:100 #: seahub/group/templates/group/group_reply_list.html:11 -#: seahub/group/templates/group/new_msg_reply.html:56 +#: seahub/group/templates/group/new_msg_reply.html:58 msgid "Reply" msgstr "Respon" #: seahub/group/templates/group/discussion_list.html:40 -#: seahub/group/templates/group/group_discuss.html:96 -#: seahub/group/templates/group/group_discuss.html:153 -#: seahub/group/templates/group/new_msg_reply.html:63 +#: seahub/group/templates/group/group_discuss.html:110 +#: seahub/group/templates/group/group_discuss.html:166 +#: seahub/group/templates/group/new_msg_reply.html:65 msgid "Add a reply..." msgstr "Afegeix una resposta..." #: seahub/group/templates/group/discussion_list.html:41 -#: seahub/group/templates/group/group_discuss.html:97 -#: seahub/group/templates/group/group_discuss.html:154 -#: seahub/group/templates/group/new_msg_reply.html:64 +#: seahub/group/templates/group/group_discuss.html:111 +#: seahub/group/templates/group/group_discuss.html:167 +#: seahub/group/templates/group/new_msg_reply.html:66 msgid "It can not be blank and should be no more than 2048 characters." msgstr "No pot estar buit i ha de tenir 2048 caràcters com a màxim." #: seahub/group/templates/group/discussion_list.html:43 -#: seahub/group/templates/group/group_discuss.html:17 -#: seahub/group/templates/group/group_discuss.html:99 -#: seahub/group/templates/group/group_discuss.html:156 +#: seahub/group/templates/group/group_discuss.html:18 +#: seahub/group/templates/group/group_discuss.html:30 +#: seahub/group/templates/group/group_discuss.html:113 +#: seahub/group/templates/group/group_discuss.html:169 #: seahub/group/templates/group/group_info.html:131 -#: seahub/group/templates/group/new_msg_reply.html:66 -#: seahub/message/templates/message/all_msg_list.html:51 -#: seahub/message/templates/message/user_msg_list.html:21 -#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/group/templates/group/group_wiki.html:62 +#: seahub/group/templates/group/new_msg_reply.html:68 +#: seahub/message/templates/message/all_msg_list.html:52 +#: seahub/message/templates/message/user_msg_list.html:22 +#: seahub/message/templates/message/user_msg_list.html:34 +#: seahub/profile/templates/profile/set_profile.html:124 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99 -#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153 -#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198 -#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266 -#: seahub/templates/shared_file_view.html:51 +#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144 +#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189 +#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205 +#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51 #: seahub/templates/view_shared_upload_link.html:86 -#: seahub/templates/snippets/file_share_popup.html:42 -#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:63 +#: seahub/templates/snippets/file_share_popup.html:96 #: seahub/templates/sysadmin/repo_transfer_form.html:9 +#: seahub/templates/wiki/personal_wiki.html:57 msgid "Cancel" msgstr "Cancela" -#: seahub/group/templates/group/group_base.html:13 -msgid "This group is public." -msgstr "Aquest grup és públic" - #: seahub/group/templates/group/group_base.html:16 -#: seahub/group/templates/group/group_base.html:50 -#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38 -#: seahub/templates/snippets/modules_toggle_tab.html:2 +#: seahub/group/templates/group/group_base.html:48 +#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39 msgid "Enable Modules" msgstr "Activa mòduls" -#: seahub/group/templates/group/group_base.html:19 -msgid "Quit" -msgstr "Surt" +#: seahub/group/templates/group/group_base.html:18 +msgid "This group is public." +msgstr "Aquest grup és públic" -#: seahub/group/templates/group/group_base.html:23 +#: seahub/group/templates/group/group_base.html:21 #: seahub/group/templates/group/group_info.html:11 #: seahub/group/templates/group/group_info_for_pub.html:8 #: seahub/group/templates/group/groups_right_panel.html:16 #: seahub/share/templates/share/repos.html:10 -#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12 -#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4 -#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12 -#: seahub/templates/pubrepo.html:8 +#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29 +#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11 +#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9 +#: seahub/templates/sysadmin/base.html:9 msgid "Libraries" msgstr "Llibreries" -#: seahub/group/templates/group/group_base.html:29 -#: seahub/group/templates/group/group_base.html:56 +#: seahub/group/templates/group/group_base.html:27 +#: seahub/group/templates/group/group_base.html:55 #: seahub/group/templates/group/groups_right_panel.html:19 msgid "Wiki" msgstr "Wiki" -#: seahub/group/templates/group/group_base.html:34 -#: seahub/templates/home_base.html:30 +#: seahub/group/templates/group/group_base.html:32 +#: seahub/templates/home_base.html:31 msgid "Files" msgstr "Fitxers" -#: seahub/group/templates/group/group_base.html:38 -#: seahub/group/templates/group/group_manage.html:9 -#: seahub/group/templates/group/group_members.html:7 +#: seahub/group/templates/group/group_base.html:36 +#: seahub/group/templates/group/group_manage.html:10 +#: seahub/group/templates/group/group_members.html:8 +#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16 msgid "Members" msgstr "Membres" -#: seahub/group/templates/group/group_base.html:42 +#: seahub/group/templates/group/group_base.html:40 +#: seahub/templates/sysadmin/sys_useradmin.html:16 msgid "Admin" msgstr "Administra" -#: seahub/group/templates/group/group_base.html:73 -msgid "Quit Group" -msgstr "Surt del grup" - -#: seahub/group/templates/group/group_base.html:74 -msgid "Are you sure you want to quit this group?" -msgstr "Esteu segur que voleu abandonar aquest grup?" - #: seahub/group/templates/group/group_discuss.html:12 msgid "Add a discussion..." msgstr "Afegeix un missatge..." -#: seahub/group/templates/group/group_discuss.html:21 +#: seahub/group/templates/group/group_discuss.html:19 +#: seahub/message/templates/message/all_msg_list.html:46 +#: seahub/message/templates/message/user_msg_list.html:23 +msgid "Add files" +msgstr "Afegeix fitxers" + +#: seahub/group/templates/group/group_discuss.html:25 +#: seahub/message/templates/message/user_msg_list.html:29 +msgid "Choose a file or files:" +msgstr "" + +#: seahub/group/templates/group/group_discuss.html:33 msgid "After login, you can post discussions and add replies." msgstr "Si inicieu sessió podreu respondre i publicar missatges." -#: seahub/group/templates/group/group_discuss.html:112 -#: seahub/message/templates/message/user_msg_list.html:65 -#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52 +#: seahub/group/templates/group/group_discuss.html:126 +#: seahub/message/templates/message/user_msg_list.html:80 +#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54 #: seahub/templates/repo_view_snapshot.html:51 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:29 -#: seahub/templates/sysadmin/sys_publink_admin.html:30 -#: seahub/templates/sysadmin/sys_repo_admin.html:23 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:30 +#: seahub/templates/sysadmin/sys_publink_admin.html:31 +#: seahub/templates/sysadmin/sys_repo_admin.html:25 +#: seahub/templates/sysadmin/sys_trafficadmin.html:41 #: seahub/templates/sysadmin/useradmin_paginator.html:4 msgid "Previous" msgstr "Anterior" -#: seahub/group/templates/group/group_discuss.html:122 -#: seahub/message/templates/message/user_msg_list.html:75 -#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55 +#: seahub/group/templates/group/group_discuss.html:136 +#: seahub/message/templates/message/user_msg_list.html:90 +#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57 #: seahub/templates/repo_view_snapshot.html:54 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:32 -#: seahub/templates/sysadmin/sys_publink_admin.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:26 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:33 +#: seahub/templates/sysadmin/sys_publink_admin.html:34 +#: seahub/templates/sysadmin/sys_repo_admin.html:28 +#: seahub/templates/sysadmin/sys_trafficadmin.html:44 #: seahub/templates/sysadmin/useradmin_paginator.html:7 msgid "Next" msgstr "Següent" -#: seahub/group/templates/group/group_discuss.html:128 -#: seahub/message/templates/message/user_msg_list.html:81 +#: seahub/group/templates/group/group_discuss.html:142 +#: seahub/message/templates/message/user_msg_list.html:96 msgid "↑Top" msgstr "Superior" -#: seahub/group/templates/group/group_discuss.html:248 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 msgid "Really want to delete this discussion?" msgstr "Esteu segurs que voleu eliminar aquest missatge?" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55 +#: seahub/templates/devices.html:45 #: seahub/templates/snippets/repo_del_popup.html:4 msgid "Yes" msgstr "Sí" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56 +#: seahub/templates/devices.html:46 #: seahub/templates/snippets/repo_del_popup.html:5 msgid "No" msgstr "No" -#: seahub/group/templates/group/group_discuss.html:263 +#: seahub/group/templates/group/group_discuss.html:276 +#: seahub/message/templates/message/user_msg_list.html:198 msgid "Successfully deleted" msgstr "S'ha eliminat correctament" -#: seahub/group/templates/group/group_discuss.html:265 +#: seahub/group/templates/group/group_discuss.html:278 +#: seahub/message/templates/message/user_msg_list.html:200 msgid "Failed to delete: " msgstr "No s'ha eliminat: " -#: seahub/group/templates/group/group_discuss.html:269 -#: seahub/templates/repo.html:771 +#: seahub/group/templates/group/group_discuss.html:282 +#: seahub/message/templates/message/user_msg_list.html:204 +#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761 msgid "Failed." msgstr "Error." @@ -1476,6 +1574,7 @@ msgid "Recent Changes" msgstr "Últims canvis" #: seahub/group/templates/group/group_info.html:14 +#: seahub/templates/pubrepo.html:10 #: seahub/templates/snippets/my_owned_repos.html:13 #: seahub/templates/snippets/repo_create_form.html:3 msgid "New Library" @@ -1484,77 +1583,58 @@ msgstr "Crea una llibreria" #: seahub/group/templates/group/group_info.html:22 #: seahub/group/templates/group/group_info.html:76 #: seahub/group/templates/group/group_info_for_pub.html:14 -#: seahub/group/templates/group/group_wiki.html:22 +#: seahub/group/templates/group/group_wiki.html:48 #: seahub/share/templates/share/list_priv_shared_folders.html:18 #: seahub/share/templates/share/repos.html:18 #: seahub/share/templates/share/user_share_list.html:34 -#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23 -#: seahub/templates/repo_settings.html:17 +#: seahub/templates/my_group_repos.html:9 +#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17 +#: seahub/templates/repo_history.html:23 +#: seahub/templates/repo_settings.html:19 +#: seahub/templates/snippets/my_group_repos.html:9 #: seahub/templates/snippets/my_owned_repos.html:21 -#: seahub/templates/snippets/my_owned_repos.html:115 -#: seahub/templates/snippets/my_owned_repos.html:169 -#: seahub/templates/snippets/my_owned_repos.html:218 +#: seahub/templates/snippets/my_owned_repos.html:122 +#: seahub/templates/snippets/my_shared_repos.html:7 #: seahub/templates/snippets/repo_create_form.html:6 #: seahub/templates/sysadmin/repoadmin_table.html:7 -#: seahub/templates/sysadmin/sys_list_system.html:22 -#: seahub/templates/sysadmin/userinfo.html:72 -#: seahub/templates/sysadmin/userinfo.html:99 -#: seahub/templates/wiki/personal_wiki.html:21 +#: seahub/templates/sysadmin/sys_list_system.html:25 +#: seahub/templates/sysadmin/userinfo.html:66 +#: seahub/templates/sysadmin/userinfo.html:93 +#: seahub/templates/wiki/personal_wiki.html:43 msgid "Description" msgstr "Descripció" #: seahub/group/templates/group/group_info.html:23 #: seahub/group/templates/group/group_info_for_pub.html:15 #: seahub/share/templates/share/user_share_list.html:35 -#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15 +#: seahub/templates/my_group_repos.html:10 +#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18 +#: seahub/templates/starred.html:15 +#: seahub/templates/snippets/my_group_repos.html:10 #: seahub/templates/snippets/my_owned_repos.html:22 #: seahub/templates/snippets/my_owned_repos.html:69 -#: seahub/templates/snippets/my_owned_repos.html:116 -#: seahub/templates/snippets/my_owned_repos.html:170 -#: seahub/templates/snippets/my_owned_repos.html:219 -#: seahub/templates/snippets/repo_dir_data.html:40 +#: seahub/templates/snippets/my_owned_repos.html:123 +#: seahub/templates/snippets/my_shared_repos.html:8 +#: seahub/templates/snippets/repo_dir_data.html:42 msgid "Last Update" msgstr "Última actualització" #: seahub/group/templates/group/group_info.html:24 #: seahub/group/templates/group/group_info_for_pub.html:16 -#: seahub/templates/snippets/my_owned_repos.html:117 -#: seahub/templates/snippets/my_owned_repos.html:171 +#: seahub/templates/my_group_repos.html:11 +#: seahub/templates/my_shared_repos.html:10 +#: seahub/templates/snippets/my_group_repos.html:11 +#: seahub/templates/snippets/my_shared_repos.html:9 msgid "Shared By" msgstr "Compartit per" -#: seahub/group/templates/group/group_info.html:31 -#: seahub/group/templates/group/group_info.html:34 -#: seahub/group/templates/group/group_info.html:36 -#: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/templates/share/list_priv_shared_folders.html:23 -#: seahub/share/templates/share/repos.html:24 -#: seahub/share/templates/share/repos.html:26 -#: seahub/share/templates/share/user_share_list.html:42 -#: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/snippets/my_owned_repos.html:29 -#: seahub/templates/snippets/my_owned_repos.html:31 -#: seahub/templates/snippets/my_owned_repos.html:75 -#: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:190 -#: seahub/templates/snippets/my_owned_repos.html:223 -#: seahub/templates/sysadmin/userinfo.html:78 -msgid "directory icon" -msgstr "Icona de directori" - #: seahub/group/templates/group/group_info.html:52 #: seahub/share/templates/share/user_share_list.html:56 -#: seahub/templates/pubrepo.html:38 +#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41 #: seahub/templates/snippets/my_owned_repos.html:43 #: seahub/templates/snippets/my_owned_repos.html:89 -#: seahub/templates/snippets/my_owned_repos.html:144 -#: seahub/templates/snippets/my_owned_repos.html:229 +#: seahub/templates/snippets/my_owned_repos.html:133 +#: seahub/templates/snippets/my_shared_repos.html:36 msgid "Download and Sync" msgstr "Descarrega i sincronitza" @@ -1570,7 +1650,7 @@ msgstr "Descarrega i sincronitza" #: seahub/share/templates/share/repos.html:54 #: seahub/share/templates/share/repos.html:56 #: seahub/share/templates/share/user_share_list.html:61 -#: seahub/templates/pubrepo.html:41 +#: seahub/templates/pubrepo.html:44 msgid "Unshare" msgstr "Elimina compartició" @@ -1607,15 +1687,16 @@ msgid "Modified at" msgstr "Modificat el " #: seahub/group/templates/group/group_info.html:78 +#: seahub/templates/file_revisions.html:26 #: seahub/templates/repo_history.html:22 msgid "Modifier" msgstr "Modifica" #: seahub/group/templates/group/group_info.html:98 #: seahub/group/templates/group/group_info.html:100 -#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164 -#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170 -#: seahub/templates/repo_history.html:44 +#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155 +#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161 +#: seahub/templates/repo_history.html:45 #: seahub/templates/repo_view_snapshot.html:38 #: seahub/templates/snippets/current_commit.html:4 #: seahub/templates/snippets/events_body.html:18 @@ -1624,23 +1705,23 @@ msgid "Details" msgstr "Detalls" #: seahub/group/templates/group/group_info.html:107 -#: seahub/group/templates/group/new_msg_reply.html:74 -#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35 +#: seahub/group/templates/group/new_msg_reply.html:76 +#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36 #: seahub/templates/repo_view_snapshot.html:29 -#: seahub/templates/sysadmin/sys_list_orphan.html:20 -#: seahub/templates/sysadmin/sys_list_system.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:49 -#: seahub/templates/sysadmin/userinfo.html:88 -#: seahub/templates/sysadmin/userinfo.html:112 +#: seahub/templates/sysadmin/sys_list_orphan.html:23 +#: seahub/templates/sysadmin/sys_list_system.html:36 +#: seahub/templates/sysadmin/sys_repo_admin.html:51 +#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/userinfo.html:106 msgid "None" msgstr "Cap" #: seahub/group/templates/group/group_info.html:112 -#: seahub/templates/file_revisions.html:45 -#: seahub/templates/repo_history.html:38 +#: seahub/templates/file_revisions.html:49 +#: seahub/templates/repo_history.html:39 #: seahub/templates/repo_history_view.html:21 #: seahub/templates/repo_view_snapshot.html:32 -#: seahub/templates/snippets/current_commit.html:15 +#: seahub/templates/snippets/current_commit.html:11 msgid "Unknown" msgstr "Desconegut" @@ -1659,15 +1740,43 @@ msgstr "Contrasenya: " msgid "The password will be kept in the server for only 1 hour." msgstr "El servidor guardarà la contrasenya només 1 hora." -#: seahub/group/templates/group/group_info.html:147 +#: seahub/group/templates/group/group_info.html:146 msgid "Unshare Library" msgstr "Deixa de compartir la llibreria" -#: seahub/group/templates/group/group_info.html:148 +#: seahub/group/templates/group/group_info.html:147 #, python-format msgid "Are you sure you want to unshare %s ?" msgstr "Esteu segur que voleu deixar de compartir %s ?" +#: seahub/group/templates/group/group_info_for_pub.html:24 +#: seahub/group/templates/group/group_info_for_pub.html:26 +#: seahub/share/templates/share/list_priv_shared_folders.html:23 +#: seahub/share/templates/share/repos.html:24 +#: seahub/share/templates/share/repos.html:26 +#: seahub/share/templates/share/user_share_list.html:42 +#: seahub/share/templates/share/user_share_list.html:44 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 +#: seahub/templates/my_shared_repos.html:23 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_owned_repos.html:29 +#: seahub/templates/snippets/my_owned_repos.html:31 +#: seahub/templates/snippets/my_owned_repos.html:75 +#: seahub/templates/snippets/my_owned_repos.html:77 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 +#: seahub/templates/snippets/my_shared_repos.html:22 +#: seahub/templates/sysadmin/userinfo.html:72 +msgid "directory icon" +msgstr "Icona de directori" + #: seahub/group/templates/group/group_info_for_pub.html:46 msgid "No public library is in this group" msgstr "Aquest grup no té llibreries públiques" @@ -1684,14 +1793,25 @@ msgid "" "message: " msgstr "%(user)s volen unir-se al grup \"%(group_name)s\", aquest és el missatge de verificació:" -#: seahub/group/templates/group/group_manage.html:10 +#: seahub/group/templates/group/group_join_email.html:6 +#: seahub/templates/email_base.html:9 +msgid "Thanks for using our site!" +msgstr "Gràcies per confiar en nosaltres." + +#: seahub/group/templates/group/group_join_email.html:8 +#: seahub/templates/email_base.html:13 +#, python-format +msgid "The %(site_name)s team" +msgstr "L'equip %(site_name)s" + +#: seahub/group/templates/group/group_manage.html:11 msgid "Admins" msgstr "Administradors" -#: seahub/group/templates/group/group_manage.html:11 -#: seahub/profile/templates/profile/set_profile.html:22 -#: seahub/templates/repo.html:28 -#: seahub/templates/snippets/space_and_traffic.html:27 +#: seahub/group/templates/group/group_manage.html:12 +#: seahub/profile/templates/profile/set_profile.html:5 +#: seahub/profile/templates/profile/set_profile.html:23 +#: seahub/templates/base.html:68 seahub/templates/repo.html:29 msgid "Settings" msgstr "Configuració" @@ -1699,7 +1819,7 @@ msgstr "Configuració" msgid "Add Members" msgstr "Afegeix membres" -#: seahub/group/templates/group/group_manage.html:42 +#: seahub/group/templates/group/group_manage.html:16 msgid "Add Admins" msgstr "Afegeix administradors" @@ -1708,7 +1828,7 @@ msgid "Avatar" msgstr "Avatar" #: seahub/group/templates/group/group_manage.html:73 -#: seahub/profile/templates/profile/set_profile.html:29 +#: seahub/profile/templates/profile/set_profile.html:30 msgid "Change" msgstr "Canvia" @@ -1727,7 +1847,7 @@ msgid "Make Public" msgstr "Dóna aquest públic" #: seahub/group/templates/group/group_manage.html:87 -#: seahub/templates/sysadmin/repoadmin_table.html:19 +#: seahub/templates/sysadmin/repoadmin_table.html:25 msgid "Transfer" msgstr "Transfereix" @@ -1751,29 +1871,41 @@ msgstr "Consell: Ha de ser un correu electrònic registrat." msgid "Rename Group To" msgstr "Reanomena el grup a" -#: seahub/group/templates/group/group_manage.html:121 +#: seahub/group/templates/group/group_manage.html:140 msgid "Dismiss Group" msgstr "Abandona el grup" -#: seahub/group/templates/group/group_manage.html:122 +#: seahub/group/templates/group/group_manage.html:141 msgid "Really want to dismiss this group?" msgstr "Esteu segur que voleu abandonar el grup?" -#: seahub/group/templates/group/group_manage.html:125 +#: seahub/group/templates/group/group_manage.html:144 msgid "Delete Member" msgstr "Elimina membre" -#: seahub/group/templates/group/group_manage.html:126 +#: seahub/group/templates/group/group_manage.html:145 #, python-format msgid "Really want to delete %s ?" msgstr "Segur que voleu eliminar %s ?" -#: seahub/group/templates/group/group_members.html:17 +#: seahub/group/templates/group/group_members.html:10 +msgid "Quit" +msgstr "Surt" + +#: seahub/group/templates/group/group_members.html:22 #: seahub/profile/templates/profile/user_profile.html:28 -#: seahub/templates/pubuser.html:19 +#: seahub/templates/pubuser.html:27 msgid "Add to Contacts" msgstr "Afegeix als contactes" +#: seahub/group/templates/group/group_members.html:35 +msgid "Quit Group" +msgstr "Surt del grup" + +#: seahub/group/templates/group/group_members.html:36 +msgid "Are you sure you want to quit this group?" +msgstr "Esteu segur que voleu abandonar aquest grup?" + #: seahub/group/templates/group/group_pubinfo.html:9 msgid "Join Group" msgstr "Uneix-te al grup" @@ -1800,12 +1932,29 @@ msgstr "Membres:" msgid "Verification Message" msgstr "Missatge de verificació" -#: seahub/group/templates/group/group_wiki.html:12 +#: seahub/group/templates/group/group_wiki.html:13 +#: seahub/group/templates/group/group_wiki.html:20 +#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/templates/wiki/personal_wiki.html:20 +msgid "Wiki Index" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:14 +#: seahub/templates/wiki/personal_wiki.html:16 +msgid "No index now." +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:16 +#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17 +msgid "Create" +msgstr "Crea" + +#: seahub/group/templates/group/group_wiki.html:35 msgid "This group currently has no wiki" msgstr "Aquest grup no té la wiki activada" -#: seahub/group/templates/group/group_wiki.html:13 -#: seahub/templates/wiki/personal_wiki.html:14 +#: seahub/group/templates/group/group_wiki.html:36 +#: seahub/templates/wiki/personal_wiki.html:33 msgid "" "Seafile Wiki enables you to organize your knowledge in a simple way. The " "contents of wiki is stored in a normal library with pre-defined file/folder " @@ -1813,82 +1962,105 @@ msgid "" "back to the server." msgstr "La Wiki del Seafile permet organitzar el coneixement d'una forma senzilla. Les pàgines de la wiki es guarden en una llibreria normal en forma de fitxers i directoris. Això permet editar-la des del seu ordinador i sincronitzar-la amb el servidor com qualsevol altre fitxer." -#: seahub/group/templates/group/group_wiki.html:15 -#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/group/templates/group/group_wiki.html:38 +#: seahub/templates/wiki/personal_wiki.html:34 msgid "Create Wiki Now" msgstr "Crea una wiki" -#: seahub/group/templates/group/group_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:18 +#: seahub/group/templates/group/group_wiki.html:40 +#: seahub/templates/wiki/personal_wiki.html:36 +msgid "Choose a library as wiki" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:45 +#: seahub/templates/wiki/personal_wiki.html:40 msgid "Create Wiki" msgstr "Crea una wiki" -#: seahub/group/templates/group/group_wiki.html:23 +#: seahub/group/templates/group/group_wiki.html:49 msgid "Wiki Pages" msgstr "Pàgines de la wiki" -#: seahub/group/templates/group/group_wiki.html:31 +#: seahub/group/templates/group/group_wiki.html:55 +#: seahub/templates/wiki/personal_wiki.html:50 +msgid "Choose a library as wiki:" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:60 +#: seahub/profile/templates/profile/set_profile.html:122 +#: seahub/templates/wiki/personal_wiki.html:55 +msgid "Please click and choose a library." +msgstr "Seleccioneu una llibreria." + +#: seahub/group/templates/group/group_wiki.html:68 #: seahub/group/templates/group/group_wiki_pages.html:11 -#: seahub/templates/wiki/personal_wiki.html:30 +#: seahub/templates/wiki/personal_wiki.html:63 #: seahub/templates/wiki/personal_wiki_pages.html:13 msgid "Home" msgstr "Inici" -#: seahub/group/templates/group/group_wiki.html:32 +#: seahub/group/templates/group/group_wiki.html:69 #: seahub/group/templates/group/group_wiki_pages.html:12 -#: seahub/templates/wiki/personal_wiki.html:31 +#: seahub/templates/wiki/personal_wiki.html:64 #: seahub/templates/wiki/personal_wiki_pages.html:14 msgid "Pages" msgstr "Pàgines" -#: seahub/group/templates/group/group_wiki.html:34 +#: seahub/group/templates/group/group_wiki.html:71 #: seahub/group/templates/group/group_wiki_pages.html:14 -#: seahub/templates/wiki/personal_wiki.html:32 +#: seahub/templates/wiki/personal_wiki.html:65 #: seahub/templates/wiki/personal_wiki_pages.html:15 msgid "Wiki History" msgstr "Historial" -#: seahub/group/templates/group/group_wiki.html:39 -#: seahub/group/templates/group/group_wiki.html:53 +#: seahub/group/templates/group/group_wiki.html:76 +#: seahub/group/templates/group/group_wiki.html:90 #: seahub/group/templates/group/group_wiki_pages.html:18 #: seahub/group/templates/group/group_wiki_pages.html:29 -#: seahub/templates/wiki/personal_wiki.html:35 -#: seahub/templates/wiki/personal_wiki.html:48 +#: seahub/templates/wiki/personal_wiki.html:68 +#: seahub/templates/wiki/personal_wiki.html:81 #: seahub/templates/wiki/personal_wiki_pages.html:17 #: seahub/templates/wiki/personal_wiki_pages.html:27 msgid "New Page" msgstr "Pàgina nova" -#: seahub/group/templates/group/group_wiki.html:40 -#: seahub/templates/wiki/personal_wiki.html:36 +#: seahub/group/templates/group/group_wiki.html:77 +#: seahub/group/templates/group/group_wiki.html:136 +#: seahub/templates/wiki/personal_wiki.html:69 +#: seahub/templates/wiki/personal_wiki.html:127 msgid "Delete Page" msgstr "Elimina la pàgina" -#: seahub/group/templates/group/group_wiki.html:41 -#: seahub/templates/wiki/personal_wiki.html:37 +#: seahub/group/templates/group/group_wiki.html:78 +#: seahub/templates/wiki/personal_wiki.html:70 msgid "Edit Page" msgstr "Edita la pàgina" -#: seahub/group/templates/group/group_wiki.html:42 -#: seahub/templates/wiki/personal_wiki.html:38 +#: seahub/group/templates/group/group_wiki.html:79 +#: seahub/templates/wiki/personal_wiki.html:71 msgid "Page History" msgstr "Historial de la pàgina" -#: seahub/group/templates/group/group_wiki.html:49 -#: seahub/templates/wiki/personal_wiki.html:44 +#: seahub/group/templates/group/group_wiki.html:86 +#: seahub/templates/wiki/personal_wiki.html:77 #, python-format msgid "Last modified by %(modifier)s, %(modify_time)s" msgstr "Última actualització: %(modifier)s, %(modify_time)s" -#: seahub/group/templates/group/group_wiki.html:112 -#: seahub/templates/repo_settings.html:60 -#: seahub/templates/wiki/personal_wiki.html:107 +#: seahub/group/templates/group/group_wiki.html:137 +#: seahub/templates/wiki/personal_wiki.html:128 +msgid "Are you sure you want to delete this page?" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:158 +#: seahub/templates/repo_settings.html:78 +#: seahub/templates/wiki/personal_wiki.html:149 msgid "Name is required." msgstr "El nom és obligatori." -#: seahub/group/templates/group/group_wiki.html:116 -#: seahub/templates/repo_settings.html:64 -#: seahub/templates/wiki/personal_wiki.html:111 +#: seahub/group/templates/group/group_wiki.html:162 +#: seahub/templates/repo_settings.html:82 +#: seahub/templates/wiki/personal_wiki.html:153 msgid "Description is required." msgstr "La descripció és obligatoria." @@ -1935,10 +2107,12 @@ msgstr "Afegeix membres" #: seahub/group/templates/group/grpmember_add_form.html:6 #: seahub/templates/snippets/repo_share_form.html:6 +#: seahub/templates/sysadmin/sys_useradmin.html:42 msgid "Enter" msgstr "Entra" #: seahub/group/templates/group/grpmember_add_form.html:10 +#: seahub/templates/sysadmin/sys_useradmin.html:45 msgid "emails, separated by ','" msgstr "Correus electrònics separats per ','" @@ -1954,7 +2128,8 @@ msgstr "Consell: Els correus electrònics han de ser d'usuaris registrats." msgid "Add administrators" msgstr "Afegeix administradors" -#: seahub/group/templates/group/grpmember_add_js.html:41 +#: seahub/group/templates/group/grpmember_add_js.html:33 +#: seahub/templates/sysadmin/sys_useradmin.html:167 msgid "Please enter emails, or select some." msgstr "Introduïu o seleccioneu correus electrònics." @@ -2093,7 +2268,7 @@ msgid "" "If the pattern ends with a slash, it would only match a folder. In other " "words, foo/ will match a folder \"foo\" and paths underneath it, but will " "not match a regular file or a symbolic link \"foo\"." -msgstr "" +msgstr "Si el patró acaba amb un '/' només seleccionarà directoris. Per exemple \"foo/\" seleccionarà un directori anomenat \"foo\" i tots els seus continguts, però no un fitxer o enllaç simbòlic que s'anomeni \"foo\"." #: seahub/help/templates/help/help_ignore.html:17 msgid "" @@ -2233,135 +2408,119 @@ msgid "" " the library, you'll have to enter password again." msgstr "" -#: seahub/message/views.py:134 -#: seahub/message/templates/message/all_msg_list.html:164 +#: seahub/message/views.py:156 +#: seahub/message/templates/message/all_msg_list.html:166 msgid "message is required" msgstr "El missatge és obligatori" -#: seahub/message/views.py:137 -#: seahub/message/templates/message/all_msg_list.html:168 +#: seahub/message/views.py:159 +#: seahub/message/templates/message/all_msg_list.html:170 msgid "contact is required" msgstr "El contacte és obligatori" -#: seahub/message/views.py:159 +#: seahub/message/views.py:184 msgid "You can not send message to yourself." msgstr "Vós no podeu ser el destinatari del missatge." -#: seahub/message/views.py:163 +#: seahub/message/views.py:188 #, python-format msgid "Failed to send message to %s, user not found." msgstr "No s'ha pogut enviar un missatge, %s no és un usuari registrat." -#: seahub/message/templates/message/all_msg_list.html:4 -#: seahub/message/templates/message/all_msg_list.html:15 -#: seahub/message/templates/message/user_msg_list.html:4 -#: seahub/share/templates/share/user_share_list.html:24 -#: seahub/templates/home_base.html:22 -msgid "Messages" -msgstr "Missatges" - -#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/all_msg_list.html:17 msgid "New Message" msgstr "Crea un missatge" -#: seahub/message/templates/message/all_msg_list.html:22 +#: seahub/message/templates/message/all_msg_list.html:23 #: seahub/notifications/templates/notifications/user_notification_list.html:20 msgid "Message" msgstr "Missatge" -#: seahub/message/templates/message/all_msg_list.html:23 +#: seahub/message/templates/message/all_msg_list.html:24 #: seahub/notifications/templates/notifications/user_notification_list.html:21 #: seahub/templates/file_revisions.html:25 #: seahub/templates/repo_history.html:21 msgid "Time" msgstr "Data" -#: seahub/message/templates/message/all_msg_list.html:42 +#: seahub/message/templates/message/all_msg_list.html:43 msgid "message..." msgstr "missatge..." -#: seahub/message/templates/message/all_msg_list.html:45 -msgid "Add files" -msgstr "Afegeix fitxers" - -#: seahub/message/templates/message/all_msg_list.html:95 +#: seahub/message/templates/message/all_msg_list.html:97 msgid "send to: click to select contacts" msgstr "envia a: cliqueu per seleccionar els contactes" -#: seahub/message/templates/message/all_msg_list.html:101 +#: seahub/message/templates/message/all_msg_list.html:103 msgid "please add contacts at first" msgstr "Primer heu d'afegir contactes" -#: seahub/message/templates/message/all_msg_list.html:105 +#: seahub/message/templates/message/all_msg_list.html:107 msgid "Failed to get your contacts for sending a message." msgstr "No s'ha pogut obtenir els contactes per enviar missatges" -#: seahub/message/templates/message/all_msg_list.html:136 +#: seahub/message/templates/message/all_msg_list.html:138 +#: seahub/templates/snippets/msg_form_js.html:25 msgid "You don't have any library at present" msgstr "No teniu creada cap llibreria" -#: seahub/message/templates/message/user_msg_list.html:9 -#, python-format -msgid "Messages with %(name)s" -msgstr "Missatges amb %(name)s" - #: seahub/message/templates/message/user_msg_list.html:15 msgid "Send a message..." msgstr "Envia un missatge..." -#: seahub/notifications/models.py:446 +#: seahub/notifications/models.py:450 #, python-format msgid "" "A file named %(file_name)s is uploaded to your " "folder %(folder)s" msgstr "S'ha actualitzat el fitxer %(file_name)s al directori %(folder)s" -#: seahub/notifications/models.py:469 +#: seahub/notifications/models.py:473 #, python-format msgid "" "%(user)s has shared a library named %(repo_name)s to " "you." msgstr "%(user)s ha compartit la llibreria %(repo_name)s amb vós." -#: seahub/notifications/models.py:487 +#: seahub/notifications/models.py:491 #, python-format msgid "" "%(user)s has shared a file named %(file_name)s to " "you." msgstr "%(user)s t'ha compartit el fitxer %(file_name)s." -#: seahub/notifications/models.py:503 +#: seahub/notifications/models.py:507 #, python-format -msgid "You have recieved a new message from %(user)s." +msgid "You have received a new message from %(user)s." msgstr "" -#: seahub/notifications/models.py:518 seahub/notifications/models.py:549 -#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778 +#: seahub/notifications/models.py:522 seahub/notifications/models.py:553 +#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832 msgid "Internal error" msgstr "Error intern" -#: seahub/notifications/models.py:529 +#: seahub/notifications/models.py:533 #, python-format msgid "%(group_name)s has new discussion" -msgstr "" +msgstr "%(group_name)s té missatges nous" -#: seahub/notifications/models.py:533 +#: seahub/notifications/models.py:537 #, python-format msgid "" "%(user)s posted a new discussion in %(group_name)s" -msgstr "" - -#: seahub/notifications/models.py:555 -#, python-format -msgid "One group discussion has new reply" -msgstr "" +msgstr "%(user)s a publicat un missatge a %(group_name)s" #: seahub/notifications/models.py:559 #, python-format -msgid "%(user)s replied your group discussion" -msgstr "" +msgid "One group discussion has new reply" +msgstr "Un grup té respostes noves" -#: seahub/notifications/models.py:582 +#: seahub/notifications/models.py:563 +#, python-format +msgid "%(user)s replied your group discussion" +msgstr "%(user)s a respost al seu missatge" + +#: seahub/notifications/models.py:586 #, python-format msgid "" "User %(username)s has asked to join group %(username)s ha sol·licitat unir-se a #: seahub/notifications/views.py:120 msgid "Successfully cleared all notices." +msgstr "S'han arxivat les notícies" + +#: seahub/notifications/templates/notifications/notice_email.html:8 +#, python-format +msgid "Hi %(name)s," msgstr "" -#: seahub/notifications/templates/notifications/notification_list.html:9 -#: seahub/notifications/templates/notifications/notification_list.html:13 -msgid "Add new notification" -msgstr "Afegeix una notificació" +#: seahub/notifications/templates/notifications/notice_email.html:11 +#, python-format +msgid "" +"\n" +"You've got 1 new notice on %(site_name)s.\n" +msgid_plural "" +"\n" +"You've got %(num)s new notices on %(site_name)s.\n" +msgstr[0] "" +msgstr[1] "" -#: seahub/notifications/templates/notifications/notification_list.html:21 +#: seahub/notifications/templates/notifications/notice_email.html:19 +msgid "Go check out at the following page:" +msgstr "" + +#: seahub/notifications/templates/notifications/notification_list.html:8 msgid "All Notifications" msgstr "Totes les notificacions" -#: seahub/notifications/templates/notifications/notification_list.html:25 +#: seahub/notifications/templates/notifications/notification_list.html:9 +#: seahub/notifications/templates/notifications/notification_list.html:12 +msgid "Add new notification" +msgstr "Afegeix una notificació" + +#: seahub/notifications/templates/notifications/notification_list.html:20 msgid "Notification Detail" msgstr "Detalls de la notificació" -#: seahub/notifications/templates/notifications/notification_list.html:32 +#: seahub/notifications/templates/notifications/notification_list.html:27 msgid "(current notification)" msgstr "(notificació actual)" -#: seahub/notifications/templates/notifications/notification_list.html:36 +#: seahub/notifications/templates/notifications/notification_list.html:31 msgid "Set to current" msgstr "Estableix com a actual" -#: seahub/notifications/templates/notifications/notification_list.html:44 -#: seahub/templates/sysadmin/sys_group_admin.html:55 +#: seahub/notifications/templates/notifications/notification_list.html:39 +#: seahub/templates/sysadmin/sys_group_admin.html:56 #: seahub/templates/sysadmin/sys_org_admin.html:55 -#: seahub/templates/sysadmin/sys_publink_admin.html:56 +#: seahub/templates/sysadmin/sys_publink_admin.html:57 msgid "Empty" msgstr "Buit" -#: seahub/notifications/templates/notifications/notification_list.html:56 +#: seahub/notifications/templates/notifications/notification_list.html:51 msgid "Delete Notification" msgstr "Elimina la notificació" @@ -2412,7 +2591,7 @@ msgstr "Novetats" #: seahub/notifications/templates/notifications/user_notification_list.html:11 msgid "Clear" -msgstr "" +msgstr "Buida " #: seahub/notifications/templates/notifications/user_notification_list.html:27 #: seahub/templates/activities.html:15 @@ -2421,34 +2600,34 @@ msgstr "Més" #: seahub/options/templates/options/set_user_options.html:7 msgid "Please choose how to view encrypted libraries online:" -msgstr "" +msgstr "Seleccioneu com mostrar les llibreries encriptades:" #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Send passwords to the server." -msgstr "" +msgstr "Envia les contrasenyes al servidor." #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Files will be decrypted in the server before being sent to you." -msgstr "" +msgstr "Els fitxers s'han de desencriptar." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Save passwords in your browser." -msgstr "" +msgstr "Guarda les contrasenyes al navegador." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Files will be decrypted in your browser when you download them." -msgstr "" +msgstr "Els fitxers es desencriptaran al teu navegador al descarregar-se." #: seahub/options/templates/options/set_user_options.html:13 -#: seahub/profile/templates/profile/set_profile.html:74 +#: seahub/profile/templates/profile/set_profile.html:85 msgid "" "Tip: the latter way is more secure, but it is not supported well by all " "browsers. We advise you to use the latest version of Chrome or Firefox." -msgstr "" +msgstr "Consell: l'últim sistema és el més segur, però no tots els navegadors la suporten. Us recomanem que feu servir l'última versió del Chrome o el Firefox." #: seahub/profile/views.py:37 msgid "Successfully edited profile." @@ -2464,7 +2643,7 @@ msgstr "Encara no ha acceptat la invitació" #: seahub/profile/views.py:166 msgid "Demo account can not be deleted." -msgstr "" +msgstr "La compte de demostració no es pot eliminar." #: seahub/profile/views.py:187 msgid "Failed to set default library." @@ -2473,84 +2652,91 @@ msgstr "No s'ha pogut definir la llibreria per defecte." #: seahub/profile/views.py:192 #, python-format msgid "Successfully set \"%s\" as your default library." -msgstr "" +msgstr "S'ha marcat \"%s\" com a llibreria per defecte." #: seahub/profile/templates/profile/profile_base.html:4 -#: seahub/profile/templates/profile/set_profile.html:5 -#: seahub/profile/templates/profile/set_profile.html:25 +#: seahub/profile/templates/profile/set_profile.html:26 msgid "Profile Setting" msgstr "Configuració " #: seahub/profile/templates/profile/set_profile.html:10 -#: seahub/templates/sysadmin/userinfo.html:17 +#: seahub/templates/sysadmin/userinfo.html:8 msgid "Profile" msgstr "Perfil" -#: seahub/profile/templates/profile/set_profile.html:12 +#: seahub/profile/templates/profile/set_profile.html:11 +msgid "Language" +msgstr "" + +#: seahub/profile/templates/profile/set_profile.html:13 msgid "Encrypted Libraries" msgstr "Llibreries encriptades" -#: seahub/profile/templates/profile/set_profile.html:14 +#: seahub/profile/templates/profile/set_profile.html:15 msgid "Sub-library" msgstr "Sub-llibreria" -#: seahub/profile/templates/profile/set_profile.html:15 +#: seahub/profile/templates/profile/set_profile.html:16 msgid "Default Library" msgstr "Llibreria per defecte" -#: seahub/profile/templates/profile/set_profile.html:16 -#: seahub/profile/templates/profile/set_profile.html:100 -#: seahub/profile/templates/profile/set_profile.html:127 +#: seahub/profile/templates/profile/set_profile.html:17 +#: seahub/profile/templates/profile/set_profile.html:111 +#: seahub/profile/templates/profile/set_profile.html:138 msgid "Delete Account" msgstr "Elimina el compte" -#: seahub/profile/templates/profile/set_profile.html:27 +#: seahub/profile/templates/profile/set_profile.html:28 msgid "Avatar:" msgstr "Avatar:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 msgid "Password:" msgstr "Contrasenya:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 #: seahub/templates/snippets/repo_dirents.html:79 msgid "Update" msgstr "Actualitza" -#: seahub/profile/templates/profile/set_profile.html:36 +#: seahub/profile/templates/profile/set_profile.html:37 msgctxt "true name" msgid "Name:" msgstr "Nom:" -#: seahub/profile/templates/profile/set_profile.html:41 +#: seahub/profile/templates/profile/set_profile.html:42 msgid "About me:" msgstr "Sobre mi:" -#: seahub/profile/templates/profile/set_profile.html:48 +#: seahub/profile/templates/profile/set_profile.html:49 msgid "Department:" msgstr "Departament:" -#: seahub/profile/templates/profile/set_profile.html:53 +#: seahub/profile/templates/profile/set_profile.html:54 msgid "Telephone:" msgstr "Telèfon:" #: seahub/profile/templates/profile/set_profile.html:66 +msgid "Language Setting" +msgstr "" + +#: seahub/profile/templates/profile/set_profile.html:77 msgid "Encrypted Libraries Setting" msgstr "Configuració de les llibreries encriptades" -#: seahub/profile/templates/profile/set_profile.html:68 +#: seahub/profile/templates/profile/set_profile.html:79 msgid "How to view encrypted libraries online:" msgstr "Com visualitzar llibreries encriptades a la web:" -#: seahub/profile/templates/profile/set_profile.html:81 +#: seahub/profile/templates/profile/set_profile.html:92 msgid "Sub-library Setting" msgstr "Configuració de la sub-llibreria" -#: seahub/profile/templates/profile/set_profile.html:83 +#: seahub/profile/templates/profile/set_profile.html:94 msgid "Enable sub-library" msgstr "Activa la sub-llibreria" -#: seahub/profile/templates/profile/set_profile.html:84 +#: seahub/profile/templates/profile/set_profile.html:95 msgid "" "This feature enables you to selectively sync a folder inside a library. A " "sub-library can be created from any folder. After being created, it will be " @@ -2559,7 +2745,7 @@ msgid "" "library." msgstr "" -#: seahub/profile/templates/profile/set_profile.html:85 +#: seahub/profile/templates/profile/set_profile.html:96 msgid "" "Sub-library is also used when sharing a folder to a group or another user. " "Without this option on, a hidden sub-library will be created automatically " @@ -2567,37 +2753,33 @@ msgid "" "listed, which enables you to manage them." msgstr "" -#: seahub/profile/templates/profile/set_profile.html:91 +#: seahub/profile/templates/profile/set_profile.html:102 msgid "Default Library Setting" msgstr "Configuració de la llibreria per defecte" -#: seahub/profile/templates/profile/set_profile.html:93 +#: seahub/profile/templates/profile/set_profile.html:104 msgid "Your default library:" msgstr "La llibreria per defecte:" -#: seahub/profile/templates/profile/set_profile.html:95 +#: seahub/profile/templates/profile/set_profile.html:106 msgid "" "Default library is the default place to store your personal documents and " "pictures." -msgstr "" +msgstr "La llibreria per defecte és la llibreria on es guardaran els documents i les imatges personals." -#: seahub/profile/templates/profile/set_profile.html:96 +#: seahub/profile/templates/profile/set_profile.html:107 msgid "Choose Default Library" msgstr "Seleccioneu la llibreria per defecte" -#: seahub/profile/templates/profile/set_profile.html:101 +#: seahub/profile/templates/profile/set_profile.html:112 msgid "This operation will not be reverted. Please think twice!" msgstr "Atenció, aquesta operació és irreversible. " -#: seahub/profile/templates/profile/set_profile.html:106 +#: seahub/profile/templates/profile/set_profile.html:117 msgid "Choose default library:" msgstr "Seleccioneu una llibreria per defecte:" -#: seahub/profile/templates/profile/set_profile.html:111 -msgid "Please click and choose a library." -msgstr "Seleccioneu una llibreria." - -#: seahub/profile/templates/profile/set_profile.html:128 +#: seahub/profile/templates/profile/set_profile.html:139 msgid "Really want to delete your account?" msgstr "Esteu segur que voleu eliminar el seu compte?" @@ -2610,25 +2792,25 @@ msgid "Info" msgstr "Informació" #: seahub/profile/templates/profile/user_profile.html:41 -#: seahub/templates/sysadmin/userinfo.html:21 +#: seahub/templates/sysadmin/userinfo.html:15 msgctxt "true name" msgid "Name" msgstr "Nom" #: seahub/profile/templates/profile/user_profile.html:44 -#: seahub/templates/sysadmin/userinfo.html:24 +#: seahub/templates/sysadmin/userinfo.html:18 msgid "Self-introduction" msgstr "Introducció" #: seahub/profile/templates/profile/user_profile.html:48 -#: seahub/templates/registration/registration_form.html:24 -#: seahub/templates/sysadmin/userinfo.html:29 +#: seahub/templates/registration/registration_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:23 msgid "Department" msgstr "Departament" #: seahub/profile/templates/profile/user_profile.html:51 -#: seahub/templates/registration/registration_form.html:26 -#: seahub/templates/sysadmin/userinfo.html:32 +#: seahub/templates/registration/registration_form.html:27 +#: seahub/templates/sysadmin/userinfo.html:26 msgid "Telephone" msgstr "Telèfon" @@ -2636,168 +2818,170 @@ msgstr "Telèfon" msgid "Email is not longer than 512 characters" msgstr "El correu electrònic no pot ser de més de 512 caràcters" -#: seahub/share/views.py:59 +#: seahub/share/views.py:57 msgid "Failed to share to all members, please try again later." msgstr "No s'ha pogut compartir amb tots els membres. Torneu-ho a provar més tard." -#: seahub/share/views.py:61 +#: seahub/share/views.py:59 #, python-format msgid "" "Shared to all members successfully, go check it at Shares." msgstr "S'ha compartit amb tots els membres, podeu comprovar-ho a Compartit." -#: seahub/share/views.py:73 +#: seahub/share/views.py:71 #, python-format msgid "\"%(repo)s\" is already in group %(group)s. View" msgstr "\"%(repo)s\" ja és accessible pel grup %(group)s. Mostra" -#: seahub/share/views.py:83 +#: seahub/share/views.py:81 #, python-format msgid "Failed to share %(repo)s to %(group)s, please try again later." msgstr "No s'ha pogut compartir %(repo)s amb %(group)s, torneu-ho ha provar més tard." -#: seahub/share/views.py:87 +#: seahub/share/views.py:85 #, python-format msgid "" "Shared to %(group)s successfully，go check it at Shares." msgstr "S'ha compartit amb %(group)s, podeu comprobar-ho a Compartit." -#: seahub/share/views.py:97 +#: seahub/share/views.py:95 msgid "You can not share libray to yourself." msgstr "Vós no podeu ser el destinatari d'una compartició." -#: seahub/share/views.py:106 +#: seahub/share/views.py:104 #, python-format msgid "Failed to share to %s, please try again later." msgstr "No s'ha pogut compartir amb %s. Torneu-ho a provar més tard." -#: seahub/share/views.py:113 +#: seahub/share/views.py:111 #, python-format msgid "" "Shared to %(email)s successfully，go check it at Shares." msgstr "S'ha compartit amb %(email)s. Podeu comprovar-ho a Compartit." -#: seahub/share/views.py:117 +#: seahub/share/views.py:115 #, python-format msgid "Failed to share to %s, as the email is not registered." msgstr "No s'ha pogut compartir amb %s, no consta com usuari registrat." -#: seahub/share/views.py:176 +#: seahub/share/views.py:174 msgid "Only the owner of the library has permission to share it." msgstr "Només el propietari de la llibreria pot compartir-la." -#: seahub/share/views.py:208 +#: seahub/share/views.py:204 #, python-format msgid "" "Failed to share \"%s\", no enough quota. Upgrade account." msgstr "No té espai suficient per compartir \"%s\". Actualitzi el compte." -#: seahub/share/views.py:233 seahub/share/views.py:240 +#: seahub/share/views.py:229 seahub/share/views.py:236 msgid "Argument is not valid" msgstr "El paràmetre no és vàlid" -#: seahub/share/views.py:244 seahub/share/views.py:254 +#: seahub/share/views.py:240 seahub/share/views.py:250 msgid "Failed to remove share" msgstr "No s'ha pogut eliminar la compartició" -#: seahub/share/views.py:250 +#: seahub/share/views.py:246 msgid "group id is not valid" msgstr "L'identificador de grup no és vàlid" -#: seahub/share/views.py:263 +#: seahub/share/views.py:259 msgid "Successfully removed share" msgstr "S'ha eliminat la compartició" -#: seahub/share/views.py:355 seahub/share/views.py:486 +#: seahub/share/views.py:352 seahub/share/views.py:483 msgid "all members" msgstr "Tots el membres" -#: seahub/share/views.py:665 seahub/share/views.py:1011 -#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543 -#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873 -#: seahub/views/ajax.py:890 seahub/views/file.py:770 +#: seahub/share/views.py:663 seahub/share/views.py:985 +#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623 +#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036 +#: seahub/views/ajax.py:1053 seahub/views/file.py:821 msgid "Invalid arguments" msgstr "Els arguments no són vàlids" -#: seahub/share/views.py:674 seahub/share/views.py:1016 +#: seahub/share/views.py:668 seahub/share/views.py:990 msgid "You cannot share the library in this way." msgstr "No podeu compartir la llibreria d'aquesta manera" -#: seahub/share/views.py:699 seahub/share/views.py:1039 -msgid "Failed to get the link, please retry later." -msgstr "S'ha produït un error al generar l'enllaç. Torneu-ho a provar més tard." - -#: seahub/share/views.py:721 seahub/share/views.py:754 +#: seahub/share/views.py:700 seahub/share/views.py:733 msgid "Removed successfully" msgstr "S'ha eliminat correctament" -#: seahub/share/views.py:738 seahub/share/views.py:771 +#: seahub/share/views.py:717 seahub/share/views.py:750 msgid "The link doesn't exist" msgstr "Aquest enllaç no existeix" -#: seahub/share/views.py:785 +#: seahub/share/views.py:764 msgid "" "Sending shared link failed. Email service is not properly configured, please" " contact administrator." msgstr "No s'ha pogut enviar l'enllaç. El servei de missatgeria no està ben configurat, aviseu l'administrador." -#: seahub/share/views.py:810 -msgid "Your friend shared a file to you on Seafile" -msgstr "Us han compartit un fitxer amb Seafile" +#: seahub/share/views.py:787 +#, python-format +msgid "A file is shared to you on %s" +msgstr "" -#: seahub/share/views.py:815 seahub/share/views.py:1089 +#: seahub/share/views.py:791 seahub/share/views.py:1060 msgid "Internal server error. Send failed." msgstr "No s'ha pogut enviar per un error intern." -#: seahub/share/views.py:818 seahub/share/views.py:1092 +#: seahub/share/views.py:794 seahub/share/views.py:1063 msgid "Successfully sent." msgstr "S'ha enviat correctament." -#: seahub/share/views.py:838 +#: seahub/share/views.py:814 msgid "Please choose a directory." msgstr "Seleccioneu un directori." -#: seahub/share/views.py:855 seahub/share/views.py:949 +#: seahub/share/views.py:831 seahub/share/views.py:923 msgid "Successfully saved." msgstr "S'ha guardat correctament." -#: seahub/share/views.py:874 +#: seahub/share/views.py:850 #, python-format msgid "Failed to share to \"%s\", user not found." msgstr "No s'ha pogut compartir amb \"%s\" perquè no consta com a usuari registrat." -#: seahub/share/views.py:888 +#: seahub/share/views.py:864 #, python-format msgid "Successfully shared %s." msgstr "%s s'ha compartit " -#: seahub/share/views.py:914 +#: seahub/share/views.py:888 #, python-format msgid "Successfully unshared \"%s\"." msgstr "S'ha deixat de compartir \"%s\"." -#: seahub/share/views.py:916 +#: seahub/share/views.py:890 #, python-format -msgid "You don't have permission to unshared %s." -msgstr "No teniu permís per deixar de compartir %s." +msgid "You don't have permission to unshare %s." +msgstr "" -#: seahub/share/views.py:952 +#: seahub/share/views.py:926 #, python-format msgid "You don't have permission to save %s." msgstr "No teniu permís per guardar %s." -#: seahub/share/views.py:1059 +#: seahub/share/views.py:1013 +msgid "Failed to get the link, please retry later." +msgstr "S'ha produït un error al generar l'enllaç. Torneu-ho a provar més tard." + +#: seahub/share/views.py:1033 msgid "" "Sending shared upload link failed. Email service is not properly configured," " please contact administrator." msgstr "" -#: seahub/share/views.py:1084 -msgid "Your friend shared a upload link to you on Seafile" +#: seahub/share/views.py:1056 +#, python-format +msgid "An upload link is shared to you on %s" msgstr "" #: seahub/share/templates/share/links.html:5 @@ -2819,14 +3003,15 @@ msgstr "Visites" #: seahub/share/templates/share/links.html:37 #: seahub/share/templates/share/links.html:68 -#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632 +#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621 +#: seahub/templates/repo.html.py:699 #: seahub/templates/repo_view_snapshot.html:42 msgid "View" msgstr "Mostra" #: seahub/share/templates/share/links.html:38 #: seahub/share/templates/share/links.html:69 -#: seahub/templates/sysadmin/sys_publink_admin.html:22 +#: seahub/templates/sysadmin/sys_publink_admin.html:24 msgid "Remove" msgstr "Elimina" @@ -2842,7 +3027,7 @@ msgstr "" #: seahub/share/templates/share/links.html:76 msgid "You don't have any upload link" -msgstr "" +msgstr "No teniu cap enllaç per pujar fitxers" #: seahub/share/templates/share/links.html:77 msgid "" @@ -2855,7 +3040,7 @@ msgid "Folders - Share" msgstr "Directoris - Compartit" #: seahub/share/templates/share/list_priv_shared_folders.html:10 -#: seahub/templates/home_base.html:29 +#: seahub/templates/home_base.html:30 msgid "Folders" msgstr "Directoris" @@ -2880,13 +3065,13 @@ msgid "" msgstr "" #: seahub/share/templates/share/list_priv_shared_folders.html:97 -#: seahub/share/templates/share/repos.html:101 +#: seahub/share/templates/share/repos.html:107 #: seahub/templates/sysadmin/useradmin_js.html:62 msgid "Edit succeeded" msgstr "S'ha actualitzat" #: seahub/share/templates/share/list_priv_shared_folders.html:104 -#: seahub/share/templates/share/repos.html:108 +#: seahub/share/templates/share/repos.html:114 #: seahub/templates/sysadmin/useradmin_js.html:71 msgid "Edit failed." msgstr "No s'ha pogut actualitzar." @@ -2953,7 +3138,7 @@ msgstr "Compartit" #: seahub/share/templates/share/user_share_list.html:8 #: seahub/templates/org_admin_base.html:8 -#: seahub/templates/repo_settings.html:13 +#: seahub/templates/repo_settings.html:15 msgid "Basic Info" msgstr "Informació bàsica" @@ -2966,7 +3151,8 @@ msgid "Add to contacts" msgstr "Afegeix als contactes" #: seahub/share/templates/share/user_share_list.html:59 -#: seahub/templates/snippets/my_owned_repos.html:147 +#: seahub/templates/my_shared_repos.html:40 +#: seahub/templates/snippets/my_shared_repos.html:39 msgid "Leave Share" msgstr "Deixa de compartir" @@ -2987,56 +3173,24 @@ msgstr "Activitat" msgid "Exit System Admin" msgstr "Surt de l'administrador de sistema" -#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14 -#: seahub/templates/pubuser.html:8 -msgid "Users" -msgstr "Usuaris" - -#: seahub/templates/admin_base.html:19 -msgid "Notifications" -msgstr "Notificacions" - -#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31 -msgid "Links" -msgstr "Enllaços" - -#: seahub/templates/base.html:38 -msgid "System Admin" -msgstr "Administrador de sistema" - -#: seahub/templates/base.html:49 +#: seahub/templates/base.html:48 msgid "unread notices" msgstr "novetats pendents" -#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3 -#: seahub/templates/registration/login.html:6 -#: seahub/templates/registration/password_reset_complete.html:8 -msgid "Log In" -msgstr "Inicia sessió" - -#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36 -#: seahub/templates/registration/registration_form.html:9 -msgid "Signup" -msgstr "Registra't" - -#: seahub/templates/base.html:63 +#: seahub/templates/base.html:69 msgid "Log out" msgstr "Tanca la sessió" -#: seahub/templates/base.html:123 -msgid "Server Version: " -msgstr "Versió del servidor:" +#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6 +msgid "System Admin" +msgstr "Administrador de sistema" -#: seahub/templates/base.html:124 -msgid "Seafile" -msgstr "Seafile" - -#: seahub/templates/base.html:125 -msgid "Contact Us" -msgstr "Contacte" +#: seahub/templates/base.html:163 +#: seahub/templates/sysadmin/sys_group_admin.html:8 +msgid "All Groups" +msgstr "Tots els grups" #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9 -#: seahub/templates/home_base.html:23 msgid "Clients" msgstr "Terminals" @@ -3044,7 +3198,7 @@ msgstr "Terminals" msgid "Client Name" msgstr "Nom del terminal" -#: seahub/templates/client_mgmt.html:15 +#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15 msgid "IP" msgstr "IP" @@ -3085,28 +3239,80 @@ msgid "" "it online. And the password will be kept on the server for only 1 hour." msgstr "Aquesta llibreria està encriptada. Heu d'introduir la contrasenya per tal de veure'n el contingut. La contrasenya només es guardarà durant 1 hora al servidor." -#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229 +#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227 +#: seahub/templates/share_access_validation.html:8 msgid "Password: " msgstr "Contrasenya:" -#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234 +#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232 #, python-format msgid "" "You can change how to view encrypted libraries online here." msgstr "" -#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337 +#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334 +#: seahub/templates/share_access_validation.html:25 msgid "Please enter the password." msgstr "Introduïu la contrasenya." -#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52 -#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25 +#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9 +#: seahub/templates/home_base.html:23 +msgid "Devices" +msgstr "" + +#: seahub/templates/devices.html:13 +msgid "Platform" +msgstr "" + +#: seahub/templates/devices.html:14 +msgid "Device Name" +msgstr "" + +#: seahub/templates/devices.html:16 +msgid "Last Access" +msgstr "" + +#: seahub/templates/devices.html:17 +msgid "# Libraries" +msgstr "" + +#: seahub/templates/devices.html:18 +msgid "Operation" +msgstr "" + +#: seahub/templates/devices.html:37 +msgid "Unlink" +msgstr "" + +#: seahub/templates/devices.html:43 +#, python-format +msgid "Really want to unlink %s?" +msgstr "" + +#: seahub/templates/devices.html:44 +msgid "It will immediately stop syncing." +msgstr "" + +#: seahub/templates/devices.html:50 +msgid "You do not have connected devices" +msgstr "" + +#: seahub/templates/devices.html:51 +msgid "Your clients (Desktop/Android/iOS) will be listed here." +msgstr "" + +#: seahub/templates/devices.html:110 +msgid "Successfully unlinked." +msgstr "" + +#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57 +#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26 #: seahub/templates/shared_file_view.html:35 -#: seahub/templates/view_file_base.html:74 +#: seahub/templates/view_file_base.html:75 #: seahub/templates/view_history_file.html:34 -#: seahub/templates/view_shared_dir.html:46 -#: seahub/templates/view_shared_dir.html:60 +#: seahub/templates/view_shared_dir.html:41 +#: seahub/templates/view_shared_dir.html:55 #: seahub/templates/snippets/repo_dirents.html:24 #: seahub/templates/snippets/repo_dirents.html:77 msgid "Download" @@ -3116,8 +3322,7 @@ msgstr "Descarrega" #: seahub/templates/repo_history_view.html:38 #: seahub/templates/repo_recycle_view.html:16 #: seahub/templates/shared_file_view.html:17 -#: seahub/templates/view_shared_dir.html:16 -#: seahub/templates/snippets/repo_dir_data.html:4 +#: seahub/templates/view_shared_dir.html:13 msgid "Current path: " msgstr "Ruta actual:" @@ -3432,9 +3637,9 @@ msgid "Password is required." msgstr "Es requereix contrasenya." #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5 -#: seahub/templates/repo_settings.html:21 -#: seahub/templates/view_file_base.html:66 -#: seahub/templates/snippets/current_commit.html:19 +#: seahub/templates/repo_settings.html:23 +#: seahub/templates/view_file_base.html:67 +#: seahub/templates/snippets/current_commit.html:15 #: seahub/templates/snippets/repo_dirents.html:93 msgid "History" msgstr "Historial" @@ -3453,16 +3658,11 @@ msgstr "Consell: Cada cop que es fa una modificació es guarda una nova versió msgid "Current Path:" msgstr "Ruta actual:" -#: seahub/templates/file_revisions.html:26 -#: seahub/templates/repo_view_snapshot.html:16 -msgid "Last Modifier" -msgstr "Últim editor" - #: seahub/templates/file_revisions.html:27 #: seahub/templates/repo_history_view.html:53 #: seahub/templates/repo_recycle_view.html:55 -#: seahub/templates/view_shared_dir.html:33 -#: seahub/templates/snippets/repo_dir_data.html:39 +#: seahub/templates/view_shared_dir.html:28 +#: seahub/templates/snippets/repo_dir_data.html:41 msgid "Size" msgstr "Mida" @@ -3470,38 +3670,55 @@ msgstr "Mida" msgid "(current version)" msgstr "(versió actual)" -#: seahub/templates/file_revisions.html:50 +#: seahub/templates/file_revisions.html:39 +#, python-format +msgid "(Renamed or moved from %(old_path)s)" +msgstr "" + +#: seahub/templates/file_revisions.html:55 #: seahub/templates/repo_recycle_view.html:66 #: seahub/templates/repo_recycle_view.html:83 #: seahub/templates/repo_view_snapshot.html:43 msgid "Restore" msgstr "Restaura" -#: seahub/templates/file_revisions.html:55 +#: seahub/templates/file_revisions.html:60 msgid "Diff" msgstr "Diferències" -#: seahub/templates/footer.html:3 +#: seahub/templates/footer.html:5 #: seahub/templates/snippets/search_form.html:44 msgid "Documents" msgstr "Documents" -#: seahub/templates/footer.html:5 +#: seahub/templates/footer.html:7 msgid "Introduction" msgstr "Introducció" -#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18 +#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17 msgid "Help" msgstr "Ajuda" -#: seahub/templates/footer.html:10 +#: seahub/templates/footer.html:12 msgid "Client" msgstr "Terminal" -#: seahub/templates/footer.html:12 +#: seahub/templates/footer.html:14 msgid "Seafile for Windows, Mac and Linux" msgstr "Seafile per Windows, Mac i Linux" +#: seahub/templates/footer.html:19 +msgid "Server Version: " +msgstr "Versió del servidor:" + +#: seahub/templates/footer.html:20 +msgid "Seafile" +msgstr "Seafile" + +#: seahub/templates/footer.html:21 +msgid "Contact Us" +msgstr "Contacte" + #: seahub/templates/history_file_view.html:16 #: seahub/templates/repo_view_snapshot.html:7 #: seahub/templates/view_snapshot_file.html:7 @@ -3530,12 +3747,13 @@ msgstr " brosa" #: seahub/templates/history_file_view.html:31 #: seahub/templates/repo_history.html:10 #: seahub/templates/repo_recycle_view.html:9 +#: seahub/templates/repo_settings.html:8 #: seahub/templates/view_trash_file.html:7 msgid "Back to Library" msgstr "Torna a la llibreria" #: seahub/templates/history_file_view.html:38 -#: seahub/templates/view_file_base.html:21 +#: seahub/templates/view_file_base.html:22 #: seahub/templates/view_history_file.html:27 #: seahub/templates/view_snapshot_file.html:13 #: seahub/templates/view_trash_file.html:11 @@ -3550,36 +3768,57 @@ msgstr "Personal" msgid "Starred" msgstr "Destacades" -#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44 +#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46 #: seahub/templates/wiki/personal_wiki.html:6 #: seahub/templates/wiki/personal_wiki_pages.html:6 msgid "Personal Wiki" msgstr "Wiki personal" -#: seahub/templates/home_base.html:26 +#: seahub/templates/home_base.html:27 msgid "Share Admin" msgstr "Comparteix l'administració" -#: seahub/templates/myhome.html:41 +#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21 +msgid "Links" +msgstr "Enllaços" + +#: seahub/templates/my_group_repos.html:6 +#: seahub/templates/snippets/bottom_bar.html:3 +#: seahub/templates/snippets/my_group_repos.html:6 +#: seahub/templates/snippets/my_owned_repos.html:11 +msgid "Group" +msgstr "Grup" + +#: seahub/templates/my_group_repos.html:47 +#: seahub/templates/snippets/my_group_repos.html:47 +msgid "No library is shared to your groups" +msgstr "No teniu cap llibreria compartida en els grups" + +#: seahub/templates/my_shared_repos.html:49 +#: seahub/templates/snippets/my_shared_repos.html:48 +msgid "No library is shared to you" +msgstr "No s'està compartint cap llibreria" + +#: seahub/templates/myhome.html:40 msgid "Welcome to Seafile!" msgstr "Benvingut a Seafile" -#: seahub/templates/myhome.html:42 +#: seahub/templates/myhome.html:41 msgid "" "Seafile organizes files into libraries. Each library can be synced and " "shared separately. We have created a personal library for you. You can " "create more libraries later." msgstr "" -#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215 +#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213 msgid "Close" msgstr "Tanca" -#: seahub/templates/myhome_base.html:7 +#: seahub/templates/myhome_base.html:6 msgid "My Home" msgstr "Inici" -#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5 +#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5 #: seahub/templates/pub_base.html.py:10 msgid "Organization" msgstr "Organització" @@ -3590,11 +3829,11 @@ msgid "" "current account." msgstr "Les organitzacions s'eliminaran a la pròxima versió i les seves dades passaran a la vostre compte." -#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33 +#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34 #: seahub/templates/snippets/my_owned_repos.html:45 #: seahub/templates/snippets/my_owned_repos.html:92 -#: seahub/templates/snippets/my_owned_repos.html:231 -#: seahub/templates/snippets/repo_dir_data.html:25 +#: seahub/templates/snippets/my_owned_repos.html:135 +#: seahub/templates/snippets/repo_dir_data.html:24 #: seahub/templates/snippets/repo_dirents.html:26 #: seahub/templates/snippets/repo_dirents.html:83 msgid "Share" @@ -3616,420 +3855,452 @@ msgstr "No s'ha creat cap grup" msgid "You can click \"Add Group\" button under \"Group\" label to create a group. " msgstr "Podeu clicar \"Afegeix grup\" per crear un nou grup." -#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98 +#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92 msgid "Share From" msgstr "Compartit desde" -#: seahub/templates/pubrepo.html:50 +#: seahub/templates/pubrepo.html:53 msgid "No public library" msgstr "No hi ha cap llibreria d'accés públic" -#: seahub/templates/pubrepo.html:51 +#: seahub/templates/pubrepo.html:54 msgid "" "You can create a public library by clicking \"New Library\" button, others " "can view and download this library." msgstr "Podeu crear una llibreria clicant a \"Crea una llibreria\" i tothom la podrà descarregar." -#: seahub/templates/repo.html:31 -msgid "Trash" -msgstr "Paperera" +#: seahub/templates/pubuser.html:10 +msgid "Search members..." +msgstr "" -#: seahub/templates/repo.html:38 +#: seahub/templates/repo.html:23 msgid "Size: " msgstr "Mida:" -#: seahub/templates/repo.html:59 +#: seahub/templates/repo.html:32 +msgid "Trash" +msgstr "Paperera" + +#: seahub/templates/repo.html:50 #: seahub/templates/snippets/repo_dirents.html:37 #: seahub/templates/snippets/repo_dirents.html:91 msgid "Move" msgstr "Mou" -#: seahub/templates/repo.html:60 +#: seahub/templates/repo.html:51 #: seahub/templates/snippets/repo_dirents.html:38 #: seahub/templates/snippets/repo_dirents.html:92 msgid "Copy" msgstr "Còpia" -#: seahub/templates/repo.html:64 +#: seahub/templates/repo.html:55 msgid "Upload Files" msgstr "Puja fitxers" -#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114 +#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105 #: seahub/templates/view_shared_upload_link.html:24 msgid "The owner of this library has run out of space." msgstr "El propietari d'aquesta llibreria ha excedit el seu límit de capacitat." -#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121 +#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112 msgid "Please select a file at first." msgstr "Primer seleccioneu un fitxer." -#: seahub/templates/repo.html:79 +#: seahub/templates/repo.html:70 #: seahub/templates/view_shared_upload_link.html:32 msgid "Add Files" msgstr "Afegeix fitxers" -#: seahub/templates/repo.html:84 +#: seahub/templates/repo.html:75 #: seahub/templates/view_shared_upload_link.html:37 msgid "Start All" msgstr "Inicia ho tot" -#: seahub/templates/repo.html:88 +#: seahub/templates/repo.html:79 #: seahub/templates/view_shared_upload_link.html:41 msgid "Cancel All" msgstr "Cancel·la-ho tot" -#: seahub/templates/repo.html:92 +#: seahub/templates/repo.html:83 #: seahub/templates/view_shared_upload_link.html:45 msgid "" "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+" msgstr "Arrossegar funciona amb el Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+" -#: seahub/templates/repo.html:94 +#: seahub/templates/repo.html:85 #: seahub/templates/view_shared_upload_link.html:46 #, python-format msgid "File size should be smaller than %(max_file_size)s" msgstr "La mida del fitxer no pot superar %(max_file_size)s" -#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139 +#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130 +#: seahub/templates/repo.html:1744 #: seahub/templates/view_shared_upload_link.html:54 msgid "Saving..." msgstr "Guardant..." -#: seahub/templates/repo.html:112 +#: seahub/templates/repo.html:103 #, python-format msgid "Update %(file_name)s" msgstr "Actualitza %(file_name)s" -#: seahub/templates/repo.html:127 +#: seahub/templates/repo.html:118 msgid "Choose a file" msgstr "Tria un fitxer" -#: seahub/templates/repo.html:131 +#: seahub/templates/repo.html:122 #, python-format msgid "Smaller than %(max_file_size)s" msgstr "Més petit que %(max_file_size)s" -#: seahub/templates/repo.html:148 -#: seahub/templates/snippets/repo_dir_data.html:16 +#: seahub/templates/repo.html:139 +#: seahub/templates/snippets/repo_dir_data.html:15 msgid "New Directory" msgstr "Crea un directori" -#: seahub/templates/repo.html:149 +#: seahub/templates/repo.html:140 msgid "Directory Name" msgstr "Nom del directori" -#: seahub/templates/repo.html:157 -#: seahub/templates/snippets/repo_dir_data.html:19 +#: seahub/templates/repo.html:148 +#: seahub/templates/snippets/repo_dir_data.html:18 msgid "New File" msgstr "Crea un fitxer" -#: seahub/templates/repo.html:159 +#: seahub/templates/repo.html:150 msgid "Featured File Type" msgstr "Tipus de fitxer destacat" -#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166 +#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157 msgid "Click to choose" msgstr "Clica per seleccionar" -#: seahub/templates/repo.html:160 +#: seahub/templates/repo.html:151 msgid "online Rich Text format." msgstr "Tipus de format \"rich text\"" -#: seahub/templates/repo.html:166 +#: seahub/templates/repo.html:157 msgid "simple markup format." msgstr "Tipus de format \"simple markup\"" -#: seahub/templates/repo.html:173 seahub/templates/starred.html:13 +#: seahub/templates/repo.html:164 seahub/templates/starred.html:13 msgid "File Name" msgstr "Nom de fitxer" -#: seahub/templates/repo.html:182 +#: seahub/templates/repo.html:173 msgid "Current Library" msgstr "Llibreria actual" -#: seahub/templates/repo.html:186 +#: seahub/templates/repo.html:177 msgid "Other Libraries" msgstr "Altres llibreries" -#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49 +#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49 msgid "Please click and choose a directory." msgstr "Seleccioneu un directori" -#: seahub/templates/repo.html:202 +#: seahub/templates/repo.html:200 #, python-format msgid "Rename %(name)s as:" msgstr "Reanomena %(name)s a:" -#: seahub/templates/repo.html:212 +#: seahub/templates/repo.html:210 #, python-format msgid "Sync %(dir_name)s" msgstr "Sincronitza %(dir_name)s" -#: seahub/templates/repo.html:213 +#: seahub/templates/repo.html:211 msgid "" "A sub-library will be created from this directory. It will be listed in your" " desktop client, and you can download it just like downloading a normal " "library." msgstr "" -#: seahub/templates/repo.html:214 -msgid "Create" -msgstr "Crea" - -#: seahub/templates/repo.html:228 +#: seahub/templates/repo.html:226 msgid "" "This library is encrypted. Please input the password if you want to browse " "it online. And the password will be kept in the browser for only 1 hour." msgstr "Aquesta llibreria està encriptada. Heu d'introduir la contrasenya per tal de veure'n el contingut. La contrasenya només es guardarà durant 1 hora al servidor." -#: seahub/templates/repo.html:257 +#: seahub/templates/repo.html:254 #: seahub/templates/view_shared_upload_link.html:77 msgid "File is too big" msgstr "El fitxer és massa gran" -#: seahub/templates/repo.html:258 +#: seahub/templates/repo.html:255 #: seahub/templates/view_shared_upload_link.html:78 msgid "File is too small" msgstr "El fitxer és massa petit" -#: seahub/templates/repo.html:259 +#: seahub/templates/repo.html:256 #: seahub/templates/view_shared_upload_link.html:79 msgid "Filetype not allowed" msgstr "Aquest tipus de fitxer no està permès" -#: seahub/templates/repo.html:260 +#: seahub/templates/repo.html:257 #: seahub/templates/view_shared_upload_link.html:80 msgid "Max number of files exceeded" msgstr "S'han excedit el nombre màxim de fitxers" -#: seahub/templates/repo.html:261 +#: seahub/templates/repo.html:258 #: seahub/templates/view_shared_upload_link.html:81 msgid "Uploaded bytes exceed file size" msgstr "El total de bytes pujats és superior a la mida del fitxer" -#: seahub/templates/repo.html:262 +#: seahub/templates/repo.html:259 #: seahub/templates/view_shared_upload_link.html:82 msgid "Empty file upload result" msgstr "S'ha pujat un fitxer buit" -#: seahub/templates/repo.html:264 -#: seahub/templates/view_shared_upload_link.html:84 +#: seahub/templates/repo.html:261 +#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956 msgid "Error" msgstr "Error" -#: seahub/templates/repo.html:265 +#: seahub/templates/repo.html:262 #: seahub/templates/view_shared_upload_link.html:85 msgid "Start" msgstr "Inicia" -#: seahub/templates/repo.html:393 +#: seahub/templates/repo.html:377 msgid "Delete Items" msgstr "Elimina els elements" -#: seahub/templates/repo.html:393 +#: seahub/templates/repo.html:377 msgid "Are you sure you want to delete these selected items?" msgstr "Esteu segur que voleu eliminar els elements seleccionats?" -#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580 +#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564 msgid "Processing..." msgstr "Processant..." -#: seahub/templates/repo.html:427 +#: seahub/templates/repo.html:411 #, python-format msgid "Successfully deleted %(name)s and %(amount)s other items." msgstr "S'ha eliminat %(name)s i %(amount)s elements més." -#: seahub/templates/repo.html:429 +#: seahub/templates/repo.html:413 #, python-format msgid "Successfully deleted %(name)s." msgstr "S'ha eliminat %(name)s." -#: seahub/templates/repo.html:438 +#: seahub/templates/repo.html:422 #, python-format msgid "Internal error. Failed to delete %(name)s and %(amount)s other items." msgstr "Error intern. No s'ha pogut eliminar %(name)s i %(amount)s més." -#: seahub/templates/repo.html:440 +#: seahub/templates/repo.html:424 #, python-format msgid "Internal error. Failed to delete %(name)s." msgstr "Error intern. No s'ha pogut eliminar %(name)s." -#: seahub/templates/repo.html:540 +#: seahub/templates/repo.html:524 msgid "Move selected directories/files to:" msgstr "Mou els fitxers/directoris seleccionats a:" -#: seahub/templates/repo.html:543 +#: seahub/templates/repo.html:527 msgid "Copy selected directories/files to:" msgstr "Copia els fitxers/directoris seleccionats a:" -#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580 -#: seahub/views/ajax.py:637 seahub/views/ajax.py:798 +#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684 +#: seahub/views/ajax.py:659 seahub/views/ajax.py:851 msgid "Invalid destination path" msgstr "La ruta de destí no és vàlida" -#: seahub/templates/repo.html:619 +#: seahub/templates/repo.html:608 #, python-format msgid "Successfully moved %(name)s and %(amount)s other items." msgstr "S'ha mogut %(name)s i %(amount)s més." -#: seahub/templates/repo.html:621 +#: seahub/templates/repo.html:610 #, python-format msgid "Successfully moved %(name)s." msgstr "S'ha mogut %(name)s." -#: seahub/templates/repo.html:626 +#: seahub/templates/repo.html:615 #, python-format msgid "Successfully copied %(name)s and %(amount)s other items." msgstr "S'ha copiat %(name)s i %(amount)s més." -#: seahub/templates/repo.html:628 +#: seahub/templates/repo.html:617 #, python-format msgid "Successfully copied %(name)s." msgstr "S'ha copiat %(name)s." -#: seahub/templates/repo.html:640 +#: seahub/templates/repo.html:629 #, python-format msgid "Internal error. Failed to move %(name)s and %(amount)s other items." msgstr "Error intern. No s'ha mogut %(name)s i %(amount)s més." -#: seahub/templates/repo.html:642 +#: seahub/templates/repo.html:631 #, python-format msgid "Internal error. Failed to move %(name)s." msgstr "Error intern. No s'ha mogut %(name)s." -#: seahub/templates/repo.html:646 +#: seahub/templates/repo.html:635 #, python-format msgid "Internal error. Failed to copy %(name)s and %(amount)s other items." msgstr "Error intern. No s'ha pogut copiar %(name)s i %(amount)s més." -#: seahub/templates/repo.html:648 +#: seahub/templates/repo.html:637 #, python-format msgid "Internal error. Failed to copy %(name)s." msgstr "Error intern. No s'ha copiat %(name)s." -#: seahub/templates/repo.html:707 +#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725 +msgid "Moving..." +msgstr "" + +#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727 +msgid "Copying..." +msgstr "" + +#: seahub/templates/repo.html:687 +#, python-format +msgid "Successfully moved %(s_num)s items." +msgstr "" + +#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694 +#, python-format +msgid "Failed to move %(f_num)s items." +msgstr "" + +#: seahub/templates/repo.html:692 +#, python-format +msgid "Successfully copied %(s_num)s items." +msgstr "" + +#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023 +msgid "Failed" +msgstr "" + +#: seahub/templates/repo.html:777 msgid "Encrypting the file..." msgstr "Encriptant el fitxer..." -#: seahub/templates/repo.html:729 +#: seahub/templates/repo.html:799 msgid "Error when encrypting." msgstr "S'ha produït un error al encriptar." -#: seahub/templates/repo.html:736 +#: seahub/templates/repo.html:806 #, python-format msgid "Encrypting, %(num)s% complete." msgstr "Encriptant, %(num)s% complet." -#: seahub/templates/repo.html:753 +#: seahub/templates/repo.html:823 msgid "Uploading ..." msgstr "Pujant les dades..." -#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025 +#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122 msgid "Done!" msgstr "Finalitzat" -#: seahub/templates/repo.html:1035 +#: seahub/templates/repo.html:1132 msgid "Downloading..." msgstr "Descarregant dades..." -#: seahub/templates/repo.html:1068 +#: seahub/templates/repo.html:1165 #, python-format msgid "Downloading, %(num)s% complete." msgstr "Descarregant, %(num)s% complet." -#: seahub/templates/repo.html:1089 +#: seahub/templates/repo.html:1186 msgid "Decrypting..." msgstr "Desencriptant..." -#: seahub/templates/repo.html:1106 +#: seahub/templates/repo.html:1203 #, python-format msgid "Decrypting, %(num)s% complete." msgstr "Desencriptant, %(num)s% complet." -#: seahub/templates/repo.html:1209 +#: seahub/templates/repo.html:1306 #, python-format msgid "Successfully deleted %(name)s" msgstr "S'ha eliminat %(name)s" -#: seahub/templates/repo.html:1231 +#: seahub/templates/repo.html:1328 msgid "Rename File" msgstr "Reanomena el fitxer" -#: seahub/templates/repo.html:1233 +#: seahub/templates/repo.html:1330 msgid "Rename Directory" msgstr "Reanomena el directori" -#: seahub/templates/repo.html:1251 +#: seahub/templates/repo.html:1348 msgid "Copy File" msgstr "Copia el fitxer" -#: seahub/templates/repo.html:1253 +#: seahub/templates/repo.html:1350 msgid "Move File" msgstr "Mou el fitxer" -#: seahub/templates/repo.html:1255 +#: seahub/templates/repo.html:1352 msgid "Copy Directory" msgstr "Copia el directori" -#: seahub/templates/repo.html:1257 +#: seahub/templates/repo.html:1354 msgid "Move Directory" msgstr "Mou el directori" -#: seahub/templates/repo.html:1262 +#: seahub/templates/repo.html:1359 #, python-format msgid "Copy %(name)s to:" msgstr "Copia %(name)s a:" -#: seahub/templates/repo.html:1265 +#: seahub/templates/repo.html:1362 #, python-format msgid "Move %(name)s to:" msgstr "Mou %(name)s a:" -#: seahub/templates/repo.html:1288 +#: seahub/templates/repo.html:1385 msgid "Directory download is not supported in this library." msgstr "En aquesta llibreria no es poden descarregar directoris." -#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550 +#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654 #: seahub/templates/snippets/repo_dirents.html:54 msgid "unstarred" msgstr "no destacat" -#: seahub/templates/repo.html:1398 +#: seahub/templates/repo.html:1503 #: seahub/templates/snippets/repo_dirents.html:52 msgid "starred" msgstr "destacat" -#: seahub/templates/repo.html:1446 +#: seahub/templates/repo.html:1551 msgid "Sub-library is created." msgstr "S'ha creat una sub-llibreria." -#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518 +#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622 msgid "It is required." msgstr "És obligatori." -#: seahub/templates/repo.html:1483 +#: seahub/templates/repo.html:1588 msgid "Only an extension there, please input a name." msgstr "Cal el nom complet, no només l'extensió." -#: seahub/templates/repo.html:1493 +#: seahub/templates/repo.html:1598 msgid "Creating..." msgstr "Creant..." -#: seahub/templates/repo.html:1522 +#: seahub/templates/repo.html:1626 msgid "You have not renamed it." msgstr "No ha estat reanomenat." -#: seahub/templates/repo.html:1559 +#: seahub/templates/repo.html:1663 #, python-format msgid "Successfully renamed %(old_name)s to %(new_name)s" msgstr "S'ha reanomenat %(old_name)s a %(new_name)s" -#: seahub/templates/repo.html:1677 +#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791 +msgid "Canceled." +msgstr "" + +#: seahub/templates/repo.html:1878 msgid "Please select at least one contact." msgstr "Seleccioneu un contacte com a mínim." -#: seahub/templates/repo.html:1788 -#: seahub/templates/snippets/myhome_extra_script.html:47 +#: seahub/templates/repo.html:1989 +#: seahub/templates/snippets/myhome_extra_script.html:86 msgid "Please enter emails or groups, or select some." msgstr "Introduïu correus electrònics o grups, o bé seleccioneu-ne alguns." @@ -4051,11 +4322,12 @@ msgstr "Consell: Abans d'una modificació es realitza una captura de l'estat en msgid "View Snapshot" msgstr "Visualitza la captura" -#: seahub/templates/repo_history.html:60 +#: seahub/templates/repo_history.html:62 #: seahub/templates/repo_view_snapshot.html:59 -#: seahub/templates/sysadmin/sys_group_admin.html:37 -#: seahub/templates/sysadmin/sys_publink_admin.html:38 -#: seahub/templates/sysadmin/sys_repo_admin.html:31 +#: seahub/templates/sysadmin/sys_group_admin.html:38 +#: seahub/templates/sysadmin/sys_publink_admin.html:39 +#: seahub/templates/sysadmin/sys_repo_admin.html:33 +#: seahub/templates/sysadmin/sys_trafficadmin.html:49 #: seahub/templates/sysadmin/useradmin_paginator.html:12 msgid "Per page: " msgstr "Per pàgina:" @@ -4096,34 +4368,78 @@ msgstr "tot" msgid "Delete Time" msgstr "Elimina la data" -#: seahub/templates/repo_settings.html:11 +#: seahub/templates/repo_settings.html:13 msgid "Library Settings" msgstr "Configuració de la llibreria" -#: seahub/templates/repo_settings.html:22 +#: seahub/templates/repo_settings.html:24 msgid "Keep full history" msgstr "Conserva tot l'historial" -#: seahub/templates/repo_settings.html:23 +#: seahub/templates/repo_settings.html:25 msgid "Don't keep history" msgstr "No conservis l'historial" -#: seahub/templates/repo_settings.html:24 +#: seahub/templates/repo_settings.html:26 msgid "Only keep a period of history:" msgstr "Només conserva l'historial dels darrers:" -#: seahub/templates/repo_settings.html:24 +#: seahub/templates/repo_settings.html:27 msgid "days" msgstr "dies" -#: seahub/templates/repo_settings.html:31 +#: seahub/templates/repo_settings.html:34 msgid "Transfer Ownership" msgstr "Transfereix la propietat" -#: seahub/templates/repo_settings.html:33 +#: seahub/templates/repo_settings.html:36 msgid "Transfer this library to another user:" msgstr "Transfereix aquesta llibreria a un altre usuari:" +#: seahub/templates/repo_settings.html:43 +msgid "Change Password" +msgstr "" + +#: seahub/templates/repo_settings.html:45 +msgid "Change the password of this library:" +msgstr "" + +#: seahub/templates/repo_settings.html:46 +msgid "Old Password" +msgstr "" + +#: seahub/templates/repo_settings.html:48 +msgid "New Password(at least 6 characters)" +msgstr "" + +#: seahub/templates/repo_settings.html:50 +msgid "New Password Again" +msgstr "" + +#: seahub/templates/repo_settings.html:173 +msgid "Please enter the old password" +msgstr "" + +#: seahub/templates/repo_settings.html:177 +msgid "Please enter the new password" +msgstr "" + +#: seahub/templates/repo_settings.html:181 +msgid "New password is too short" +msgstr "" + +#: seahub/templates/repo_settings.html:185 +msgid "New password is too long (maximum is 35 characters)" +msgstr "" + +#: seahub/templates/repo_settings.html:189 +msgid "Please enter the new password again" +msgstr "" + +#: seahub/templates/repo_settings.html:193 +msgid "New passwords don't match" +msgstr "" + #: seahub/templates/repo_view_snapshot.html:8 msgid "Back to modification history" msgstr "Torna a la actualització de l'historial" @@ -4132,6 +4448,10 @@ msgstr "Torna a la actualització de l'historial" msgid "Create Time" msgstr "Crea una data" +#: seahub/templates/repo_view_snapshot.html:16 +msgid "Last Modifier" +msgstr "Últim editor" + #: seahub/templates/repo_view_snapshot.html:17 #: seahub/templates/view_file_markdown.html:7 #: seahub/templates/view_file_text.html:18 @@ -4174,8 +4494,14 @@ msgstr "Cal que actualitzeu el terminal Seafile a la última versió disponible. msgid "Click to download." msgstr "Cliqueu per descarregar." +#: seahub/templates/share_access_validation.html:6 +msgid "" +"Please input the password if you want to browse the shared file/directory. " +"And the password will be kept on the server for only 1 hour." +msgstr "" + #: seahub/templates/shared_file_view.html:26 -#: seahub/templates/view_shared_dir.html:9 +#: seahub/templates/view_shared_dir.html:8 msgid "Shared by: " msgstr "Compartit per:" @@ -4187,27 +4513,28 @@ msgstr "Guarda a..." msgid "Save To:" msgstr "Guarda a:" -#: seahub/templates/shared_link_email.html:2 -#, python-format -msgid "" -"You're receiving this e-mail because %(email)s is sharing a file to you on " -"%(site_name)s." -msgstr "Heu rebut aquest correu electrònic perquè en %(email)s vol compartir un fitxer a %(site_name)s." - -#: seahub/templates/shared_link_email.html:4 -msgid "Please go to the following page and view the file:" -msgstr "Aneu a la següent pàgina i visualitzeu el fitxer:" - -#: seahub/templates/shared_upload_link_email.html:2 -#, python-format -msgid "" -"You're receiving this e-mail because %(email)s has shared an upload link to " -"you on %(site_name)s." +#: seahub/templates/shared_link_email.html:9 +#: seahub/templates/shared_upload_link_email.html:8 +#: seahub/templates/registration/password_reset_email.html:9 +#: seahub/templates/sysadmin/user_activation_email.html:9 +#: seahub/templates/sysadmin/user_add_email.html:9 +#: seahub/templates/sysadmin/user_reset_email.html:9 +msgid "Hi," msgstr "" -#: seahub/templates/shared_upload_link_email.html:4 +#: seahub/templates/shared_link_email.html:12 +#, python-format +msgid "%(email)s shared a file to you on %(site_name)s:" +msgstr "" + +#: seahub/templates/shared_upload_link_email.html:11 +#, python-format +msgid "%(email)s shared an upload link to you on %(site_name)s." +msgstr "" + +#: seahub/templates/shared_upload_link_email.html:15 msgid "You can go to the following page and upload your files:" -msgstr "" +msgstr "Podeu anar a la següent pàgina i pujar fitxers:" #: seahub/templates/starred.html:4 msgid "Stars" @@ -4217,8 +4544,8 @@ msgstr "Destaca" msgid "icon" msgstr "icona" -#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36 -#: seahub/templates/view_file_base.html:142 +#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37 +#: seahub/templates/view_file_base.html:144 msgid "Unstar" msgstr "No destaquis" @@ -4273,49 +4600,49 @@ msgstr "a" msgid "Sorry, this user is not registered yet." msgstr "Aquest usuari encara no està registrat." -#: seahub/templates/view_file_base.html:38 -#: seahub/templates/view_file_base.html:138 +#: seahub/templates/view_file_base.html:39 +#: seahub/templates/view_file_base.html:140 msgid "Star" msgstr "Destaca" -#: seahub/templates/view_file_base.html:55 +#: seahub/templates/view_file_base.html:56 #: seahub/templates/view_file_markdown.html:7 #: seahub/templates/view_file_text.html:18 msgid "updated this file" msgstr "S'ha actualitzat el fitxer" -#: seahub/templates/view_file_base.html:59 +#: seahub/templates/view_file_base.html:60 #, python-format msgid "one contributor" msgid_plural " %(counter)s contributors " msgstr[0] "un col·laborador" msgstr[1] "%(counter)s col·laboradors" -#: seahub/templates/view_file_base.html:136 +#: seahub/templates/view_file_base.html:138 msgid "Unstarred successfully" msgstr "Ja no està destacat" -#: seahub/templates/view_file_base.html:140 +#: seahub/templates/view_file_base.html:142 msgid "Starred successfully" msgstr "S'ha destacat" #: seahub/templates/view_file_image.html:15 -#: seahub/templates/snippets/file_content_html.html:31 +#: seahub/templates/snippets/file_content_html.html:30 msgid "you can also press ← " msgstr "també pots prémer ←" #: seahub/templates/view_file_image.html:15 -#: seahub/templates/snippets/file_content_html.html:31 +#: seahub/templates/snippets/file_content_html.html:30 msgid "prev" msgstr "anterior" #: seahub/templates/view_file_image.html:21 -#: seahub/templates/snippets/file_content_html.html:37 +#: seahub/templates/snippets/file_content_html.html:36 msgid "you can also press → " msgstr "també pots prémer →" #: seahub/templates/view_file_image.html:21 -#: seahub/templates/snippets/file_content_html.html:37 +#: seahub/templates/snippets/file_content_html.html:36 msgid "next" msgstr "següent" @@ -4334,7 +4661,7 @@ msgid "auto detect" msgstr "detecció automàtica" #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "" " / / " #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "Full Screen" msgstr "Pantalla completa" #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "loading..." msgstr "carregant..." #: seahub/templates/view_file_pdf.html:77 -#: seahub/templates/snippets/file_content_js.html:110 +#: seahub/templates/snippets/file_content_js.html:136 msgid "" "You can use IE 10 or other browsers, for example, firefox, to view it " "online." msgstr "Pot fer servir IE 10 o altres navegadors com el firfox per veureu a la web." #: seahub/templates/view_file_svg.html:7 -#: seahub/templates/snippets/file_content_js.html:41 +#: seahub/templates/snippets/file_content_js.html:63 msgid "To view it online, you can use firefox, chrome or IE 9." msgstr "Per visualitzar-ho a la web pot fer servir firefox, chrome o IE 9." #: seahub/templates/view_file_unknown.html:6 -#: seahub/templates/snippets/file_content_js.html:124 +#: seahub/templates/snippets/file_content_js.html:150 msgid "This type of file cannot be viewed online." msgstr "Aquest tipus de fitxer no es pot visualitzar a la web." -#: seahub/templates/view_shared_dir.html:26 +#: seahub/templates/view_shared_dir.html:22 msgid "ZIP" msgstr "ZIP" @@ -4381,41 +4708,55 @@ msgstr "Puja els fitxers a %(dir_name)s" msgid "shared by:" msgstr "compartit per:" -#: seahub/templates/registration/login.html:11 +#: seahub/templates/registration/login.html:4 +#: seahub/templates/registration/login.html:32 +#: seahub/templates/registration/login.html:60 +#: seahub/templates/registration/password_reset_complete.html:8 +#: seahub/templates/sysadmin/user_activation_email.html:15 +#: seahub/templates/sysadmin/user_add_email.html:25 +msgid "Log In" +msgstr "Inicia sessió" + +#: seahub/templates/registration/login.html:37 msgid "(forgot password)" msgstr "(contrasenya oblidava)" -#: seahub/templates/registration/login.html:14 +#: seahub/templates/registration/login.html:40 msgid "CAPTCHA" msgstr "CAPTCHA" -#: seahub/templates/registration/login.html:16 +#: seahub/templates/registration/login.html:42 msgid "Not clear? Refresh it." msgstr "Genera una nova imatge." -#: seahub/templates/registration/login.html:23 +#: seahub/templates/registration/login.html:49 msgid "Incorrect email or password" msgstr "La contrasenya o correu electrònic són incorrectes" -#: seahub/templates/registration/login.html:31 +#: seahub/templates/registration/login.html:57 #, python-format msgid "Remember me for %(remember_days)s days " msgstr "Recorda la sessió durant %(remember_days)s dies" -#: seahub/templates/registration/login.html:61 +#: seahub/templates/registration/login.html:62 +#: seahub/templates/registration/registration_form.html:6 +msgid "Signup" +msgstr "Registra't" + +#: seahub/templates/registration/login.html:87 msgid "Failed to refresh the CAPTCHA, please try again later." msgstr "No s'ha pogut carregar el CAPTCHA, torna-ho a provar. " -#: seahub/templates/registration/login.html:68 -#: seahub/templates/registration/registration_form.html:47 +#: seahub/templates/registration/login.html:94 +#: seahub/templates/registration/registration_form.html:49 #: seahub/templates/sysadmin/repoadmin_js.html:21 -#: seahub/templates/sysadmin/sys_useradmin.html:56 +#: seahub/templates/sysadmin/sys_useradmin.html:94 msgid "Email cannot be blank" msgstr "El correu electrònic és obligatori" -#: seahub/templates/registration/login.html:72 -#: seahub/templates/registration/registration_form.html:51 -#: seahub/templates/sysadmin/sys_useradmin.html:60 +#: seahub/templates/registration/login.html:98 +#: seahub/templates/registration/registration_form.html:53 +#: seahub/templates/sysadmin/sys_useradmin.html:98 msgid "Password cannot be blank" msgstr "La contrasenya és obligatoria" @@ -4469,13 +4810,13 @@ msgstr "La contrasenya s'ha reinicialitzat" #: seahub/templates/registration/password_reset_confirm.html:4 #: seahub/templates/registration/password_reset_form.html:4 #: seahub/templates/registration/password_reset_form.html:7 -#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468 +#: seahub/templates/sysadmin/useradmin_js.html:7 msgid "Password Reset" msgstr "Reinicialitza la contrasenya" #: seahub/templates/registration/password_reset_confirm.html:11 -msgid "Input new password" -msgstr "Introduïu una nova contrasenya" +msgid "Reset Password" +msgstr "" #: seahub/templates/registration/password_reset_confirm.html:26 msgid "Failed to reset password: this link is no longer available." @@ -4486,23 +4827,19 @@ msgid "Password Reset Successfully" msgstr "S'ha reinicialitzat la contrasenya" #: seahub/templates/registration/password_reset_done.html:8 -msgid "We've send a password reset email to your email." -msgstr "Li hem enviat un correu electrònic per reinicialitzar la contrasenya" +msgid "We've sent a password reset email to your mailbox." +msgstr "" -#: seahub/templates/registration/password_reset_email.html:2 +#: seahub/templates/registration/password_reset_email.html:12 #, python-format msgid "" -"You're receiving this e-mail because you requested a password reset for your" -" user account at %(site_name)s. " -msgstr "Heu sol·licitat una reinicialització de la contrasenya del seu usuari a %(site_name)s. " +"To reset the password of your account %(account)s on %(site_name)s, please " +"click the following link: " +msgstr "" -#: seahub/templates/registration/password_reset_email.html:4 -msgid "Please go to the following page and choose a new password:" -msgstr "Seguiu el següent enllaç per modificar la contrasenya:" - -#: seahub/templates/registration/password_reset_email.html:8 -msgid "Your username, in case you've forgotten:" -msgstr "El seu nom d'usuari és:" +#: seahub/templates/registration/password_reset_email.html:17 +msgid "If you did not request it, just skip it." +msgstr "" #: seahub/templates/registration/password_reset_form.html:9 msgid "Your email used in login: " @@ -4532,23 +4869,31 @@ msgstr "El procés de registre a finalitzat correctament. Pròximament l'adminis msgid "Register" msgstr "Registre" -#: seahub/templates/registration/registration_form.html:7 +#: seahub/templates/registration/registration_form.html:9 msgid "Welcome back, you are already signed in." msgstr "S'ha iniciat sessió correctament. Benvingut." -#: seahub/templates/registration/registration_form.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:28 +#: seahub/templates/registration/registration_form.html:21 +#: seahub/templates/sysadmin/sys_useradmin.html:33 msgid "Confirm Password" msgstr "Confirmeu la contrasenya" -#: seahub/templates/registration/registration_form.html:55 -#: seahub/templates/snippets/repo_create_js.html:58 -#: seahub/templates/sysadmin/sys_useradmin.html:64 +#: seahub/templates/registration/registration_form.html:34 +msgid "Sign Up" +msgstr "" + +#: seahub/templates/registration/registration_form.html:57 +#: seahub/templates/snippets/repo_create_js.html:53 +#: seahub/templates/snippets/shared_link_js.html:235 +#: seahub/templates/snippets/shared_link_js.html:404 +#: seahub/templates/sysadmin/sys_useradmin.html:102 msgid "Please enter the password again" msgstr "Torneu a introduir la contrasenya" -#: seahub/templates/registration/registration_form.html:59 -#: seahub/templates/snippets/repo_create_js.html:62 +#: seahub/templates/registration/registration_form.html:61 +#: seahub/templates/snippets/repo_create_js.html:57 +#: seahub/templates/snippets/shared_link_js.html:239 +#: seahub/templates/snippets/shared_link_js.html:408 msgid "Passwords don't match" msgstr "Les contrasenyes no coincideixen" @@ -4568,12 +4913,6 @@ msgstr "És massa gran. El màxim permès és de 1MB" msgid "Discuss" msgstr "Missatges" -#: seahub/templates/snippets/bottom_bar.html:3 -#: seahub/templates/snippets/my_owned_repos.html:11 -#: seahub/templates/snippets/my_owned_repos.html:166 -msgid "Group" -msgstr "Grup" - #: seahub/templates/snippets/bottom_bar.html:66 msgid "Please select at least 1 group." msgstr "Seleccioneu 1 grup com a mínim" @@ -4582,10 +4921,6 @@ msgstr "Seleccioneu 1 grup com a mínim" msgid "Please input a discussion." msgstr "Introduïu un missatge." -#: seahub/templates/snippets/current_commit.html:12 -msgid "Generated by system" -msgstr "S'ha generat automàticament" - #: seahub/templates/snippets/file_share_popup.html:3 #, python-format msgid "Share %(name)s" @@ -4604,42 +4939,66 @@ msgstr "Enllaç de pujada" msgid "Private Share" msgstr "Compartit en privat" -#: seahub/templates/snippets/file_share_popup.html:30 -#: seahub/templates/snippets/file_share_popup.html:50 +#: seahub/templates/snippets/file_share_popup.html:34 +#: seahub/templates/snippets/file_share_popup.html:75 +msgid "Use Password" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:36 +#: seahub/templates/snippets/file_share_popup.html:77 +msgid "(at least 6 characters)" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:38 +#: seahub/templates/snippets/file_share_popup.html:79 +#: seahub/templates/snippets/repo_create_form.html:22 +msgid "Password again" +msgstr "Repeteix la contrasenya" + +#: seahub/templates/snippets/file_share_popup.html:43 +msgid "Set Expiration" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:45 +msgid "Days" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:51 +#: seahub/templates/snippets/file_share_popup.html:84 msgid "Generate" msgstr "Genera" -#: seahub/templates/snippets/file_share_popup.html:32 +#: seahub/templates/snippets/file_share_popup.html:53 msgid "Link: " msgstr "Enllaç:" -#: seahub/templates/snippets/file_share_popup.html:33 -#: seahub/templates/snippets/file_share_popup.html:53 +#: seahub/templates/snippets/file_share_popup.html:54 +#: seahub/templates/snippets/file_share_popup.html:87 msgid "Send" msgstr "Envia" -#: seahub/templates/snippets/file_share_popup.html:37 -#: seahub/templates/snippets/file_share_popup.html:57 +#: seahub/templates/snippets/file_share_popup.html:58 +#: seahub/templates/snippets/file_share_popup.html:91 msgid "Send to:" msgstr "Envia a:" -#: seahub/templates/snippets/file_share_popup.html:38 -#: seahub/templates/snippets/file_share_popup.html:58 +#: seahub/templates/snippets/file_share_popup.html:59 +#: seahub/templates/snippets/file_share_popup.html:92 msgid "Emails, Seperated by ','" msgstr "Correus electrònics separats per ','" -#: seahub/templates/snippets/file_share_popup.html:43 -#: seahub/templates/snippets/file_share_popup.html:63 +#: seahub/templates/snippets/file_share_popup.html:64 +#: seahub/templates/snippets/file_share_popup.html:97 msgid "Sending..." msgstr "Enviant..." -#: seahub/templates/snippets/file_share_popup.html:49 +#: seahub/templates/snippets/file_share_popup.html:70 msgid "" "You can share the generated link to others and then they can upload files to" " this directory via the link." msgstr "Pots compartir aquest enllaç amb qui vulguis i podrà penjar fitxers directament en aquest directori." -#: seahub/templates/snippets/file_share_popup.html:52 +#: seahub/templates/snippets/file_share_popup.html:86 msgid "Upload Link: " msgstr "Enllaç de pujada:" @@ -4692,7 +5051,7 @@ msgid "Sub-libraries" msgstr "Sub-llibreries" #: seahub/templates/snippets/my_owned_repos.html:10 -#: seahub/templates/sysadmin/userinfo.html:62 +#: seahub/templates/sysadmin/userinfo.html:56 msgid "Shared" msgstr "Compartides" @@ -4723,29 +5082,23 @@ msgid "" " library." msgstr "Podeu crear una sub-llibreria amb un directori de dins d'una llibreria. Una sub-llibreria es pot sincronitzar i compartir de forma independent i en tot moment es mantindrà sincronitzada amb la llibreria superior." -#: seahub/templates/snippets/my_owned_repos.html:156 -msgid "No library is shared to you" -msgstr "No s'està compartint cap llibreria" - -#: seahub/templates/snippets/my_owned_repos.html:207 -msgid "No library is shared to your groups" -msgstr "No teniu cap llibreria compartida en els grups" - #: seahub/templates/snippets/office_convert_html.html:4 +#: seahub/templates/snippets/spreadsheet_convert_html.html:4 msgid "The file is being processed, please wait..." msgstr "El fitxer s'està processant, un moment..." -#: seahub/templates/snippets/office_convert_js.html:39 +#: seahub/templates/snippets/office_convert_js.html:40 msgid "hide outline" msgstr "oculta l'esquema" -#: seahub/templates/snippets/office_convert_js.html:40 +#: seahub/templates/snippets/office_convert_js.html:41 msgid "show outline" msgstr "mostra l'esquema" -#: seahub/templates/snippets/office_convert_js.html:163 -#: seahub/templates/snippets/office_convert_js.html:170 -#: seahub/templates/snippets/office_convert_js.html:195 +#: seahub/templates/snippets/office_convert_js.html:168 +#: seahub/templates/snippets/office_convert_js.html:175 +#: seahub/templates/snippets/office_convert_js.html:200 +#: seahub/templates/snippets/spreadsheet_convert_js.html:30 msgid "Document convertion failed." msgstr "S'ha produït un error al convertir el document." @@ -4762,27 +5115,29 @@ msgstr "Encripta" msgid "(at least %(repo_password_min_length)s characters)" msgstr "(longitud mínima de %(repo_password_min_length)s caràcters)" -#: seahub/templates/snippets/repo_create_form.html:22 -msgid "Password again" -msgstr "Repeteix la contrasenya" - -#: seahub/templates/snippets/repo_create_js.html:34 +#: seahub/templates/snippets/repo_create_js.html:29 msgid "Name is required" msgstr "El nom és obligatori" -#: seahub/templates/snippets/repo_create_js.html:38 +#: seahub/templates/snippets/repo_create_js.html:33 msgid "Description is required" msgstr "La descripció és obligatòria" -#: seahub/templates/snippets/repo_create_js.html:46 +#: seahub/templates/snippets/repo_create_js.html:41 +#: seahub/templates/snippets/shared_link_js.html:223 +#: seahub/templates/snippets/shared_link_js.html:392 msgid "Please enter password" msgstr "Introduïu la contrasenya" -#: seahub/templates/snippets/repo_create_js.html:50 +#: seahub/templates/snippets/repo_create_js.html:45 +#: seahub/templates/snippets/shared_link_js.html:227 +#: seahub/templates/snippets/shared_link_js.html:396 msgid "Password is too short" msgstr "La contrasenya és massa curta" -#: seahub/templates/snippets/repo_create_js.html:54 +#: seahub/templates/snippets/repo_create_js.html:49 +#: seahub/templates/snippets/shared_link_js.html:231 +#: seahub/templates/snippets/shared_link_js.html:400 msgid "Password is too long (maximum is 35 characters)" msgstr "La contrasenya és massa llarga (màxim de 35 caràcters)" @@ -4795,7 +5150,7 @@ msgstr "S'ha eliminat correctament." msgid "Really want to delete %(lib_name)s ?" msgstr "Esteu segur que voleu eliminar %(lib_name)s ?" -#: seahub/templates/snippets/repo_dir_data.html:15 +#: seahub/templates/snippets/repo_dir_data.html:14 msgid "Upload" msgstr "Puja" @@ -4922,15 +5277,23 @@ msgid "" "Please select at least one file type or input at least one file extension" msgstr "Seleccioneu un tipus de fitxer o introduïu una extensió com a mínim." -#: seahub/templates/snippets/shared_link_js.html:79 +#: seahub/templates/snippets/shared_link_js.html:120 msgid "Select contacts" msgstr "Seleccioneu els contactes" -#: seahub/templates/snippets/shared_link_js.html:121 -#: seahub/templates/snippets/shared_link_js.html:243 +#: seahub/templates/snippets/shared_link_js.html:164 +#: seahub/templates/snippets/shared_link_js.html:338 msgid "Please input at least an email." msgstr "Introduïu un correu electrònic com a mínim." +#: seahub/templates/snippets/shared_link_js.html:250 +msgid "Please enter days" +msgstr "" + +#: seahub/templates/snippets/shared_link_js.html:256 +msgid "Please enter valid days" +msgstr "" + #: seahub/templates/snippets/space_and_traffic.html:4 #: seahub/templates/snippets/space_and_traffic.html:12 msgid "Used:" @@ -4943,7 +5306,7 @@ msgstr "Propi" #: seahub/templates/snippets/space_and_traffic.html:6 #: seahub/templates/snippets/space_and_traffic.html:8 -#: seahub/templates/sysadmin/userinfo.html:41 +#: seahub/templates/sysadmin/userinfo.html:35 msgid "Sharing" msgstr "Compartint" @@ -4955,6 +5318,22 @@ msgstr "Accessos mensuals:" msgid "Payment" msgstr "Pagament" +#: seahub/templates/sysadmin/base.html:12 +msgid "Users" +msgstr "Usuaris" + +#: seahub/templates/sysadmin/base.html:18 +msgid "Notifications" +msgstr "Notificacions" + +#: seahub/templates/sysadmin/base.html:25 +msgid "Traffic" +msgstr "" + +#: seahub/templates/sysadmin/base.html:30 +msgid "Logs" +msgstr "" + #: seahub/templates/sysadmin/repo_transfer_form.html:3 msgid "Transfer Library" msgstr "Transfereix la llibreria" @@ -4965,74 +5344,74 @@ msgid "Transfer %(lib_name)s to:" msgstr "Transfereix %(lib_name)s a:" #: seahub/templates/sysadmin/repoadmin_table.html:6 -#: seahub/templates/sysadmin/sys_publink_admin.html:11 -#: seahub/templates/sysadmin/sys_repo_search.html:10 +#: seahub/templates/sysadmin/sys_publink_admin.html:13 +#: seahub/templates/sysadmin/sys_repo_search.html:12 msgid "Owner" msgstr "Propietari" -#: seahub/templates/sysadmin/sys_group_admin.html:8 -msgid "All Groups" -msgstr "Tots els grups" - -#: seahub/templates/sysadmin/sys_group_admin.html:13 +#: seahub/templates/sysadmin/sys_group_admin.html:14 #: seahub/templates/sysadmin/sys_org_admin.html:13 msgid "Creator" msgstr "Autor" -#: seahub/templates/sysadmin/sys_group_admin.html:14 +#: seahub/templates/sysadmin/sys_group_admin.html:15 #: seahub/templates/sysadmin/sys_org_admin.html:14 -#: seahub/templates/sysadmin/sys_publink_admin.html:12 +#: seahub/templates/sysadmin/sys_publink_admin.html:14 msgid "Create At" msgstr "Creat el" -#: seahub/templates/sysadmin/sys_group_admin.html:62 +#: seahub/templates/sysadmin/sys_group_admin.html:63 msgid "Delete Group" msgstr "Elimina el grup" #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8 -#: seahub/templates/sysadmin/sys_useradmin.html:8 +#: seahub/templates/sysadmin/sys_useradmin.html:7 +msgid "Search users..." +msgstr "" + +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15 msgid "Database" msgstr "base de dades" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9 -#: seahub/templates/sysadmin/sys_useradmin.html:10 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16 +#: seahub/templates/sysadmin/sys_useradmin.html:18 msgid "LDAP" msgstr "LDAP" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11 -#: seahub/templates/sysadmin/sys_list_orphan.html:12 -#: seahub/templates/sysadmin/sys_list_system.html:12 -#: seahub/templates/sysadmin/sys_repo_admin.html:12 -#: seahub/templates/sysadmin/sys_useradmin.html:13 -msgid "Search" -msgstr "Cerca" - -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19 -#: seahub/templates/sysadmin/useradmin_table.html:7 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23 +#: seahub/templates/sysadmin/useradmin_table.html:8 +#: seahub/templates/sysadmin/useradmin_table.html:73 msgid "Create At / Last Login" msgstr "Alta / Última sessió" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20 -#: seahub/templates/sysadmin/useradmin_table.html:6 -#: seahub/templates/sysadmin/userinfo.html:37 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24 +#: seahub/templates/sysadmin/useradmin_table.html:7 +#: seahub/templates/sysadmin/useradmin_table.html:72 +#: seahub/templates/sysadmin/userinfo.html:31 msgid "Space Used" msgstr "Espai ocupat" -#: seahub/templates/sysadmin/sys_list_orphan.html:8 -#: seahub/templates/sysadmin/sys_list_system.html:8 -#: seahub/templates/sysadmin/sys_repo_admin.html:8 +#: seahub/templates/sysadmin/sys_list_orphan.html:7 +#: seahub/templates/sysadmin/sys_list_system.html:7 +#: seahub/templates/sysadmin/sys_repo_admin.html:7 +msgid "Search libraries by name..." +msgstr "" + +#: seahub/templates/sysadmin/sys_list_orphan.html:14 +#: seahub/templates/sysadmin/sys_list_system.html:14 +#: seahub/templates/sysadmin/sys_repo_admin.html:14 msgid "All" msgstr "Tots" -#: seahub/templates/sysadmin/sys_list_orphan.html:9 -#: seahub/templates/sysadmin/sys_list_system.html:9 -#: seahub/templates/sysadmin/sys_repo_admin.html:9 +#: seahub/templates/sysadmin/sys_list_orphan.html:15 +#: seahub/templates/sysadmin/sys_list_system.html:15 +#: seahub/templates/sysadmin/sys_repo_admin.html:15 msgid "Orphan" msgstr "Orfe" -#: seahub/templates/sysadmin/sys_list_orphan.html:10 -#: seahub/templates/sysadmin/sys_list_system.html:10 -#: seahub/templates/sysadmin/sys_repo_admin.html:10 +#: seahub/templates/sysadmin/sys_list_orphan.html:16 +#: seahub/templates/sysadmin/sys_list_system.html:16 +#: seahub/templates/sysadmin/sys_repo_admin.html:16 msgid "System" msgstr "Sistema" @@ -5048,96 +5427,117 @@ msgstr "Prefix URL" msgid "Delete Organization" msgstr "Elimina la organització" -#: seahub/templates/sysadmin/sys_publink_admin.html:6 +#: seahub/templates/sysadmin/sys_publink_admin.html:7 msgid "All Public Links" msgstr "Tot els enllaços públics" -#: seahub/templates/sysadmin/sys_publink_admin.html:13 +#: seahub/templates/sysadmin/sys_publink_admin.html:15 msgid "Count" msgstr "Compte" -#: seahub/templates/sysadmin/sys_repo_search.html:5 +#: seahub/templates/sysadmin/sys_repo_search.html:7 msgid "Search Library" msgstr "Cerca a la llibreria" -#: seahub/templates/sysadmin/sys_repo_search.html:8 +#: seahub/templates/sysadmin/sys_repo_search.html:10 msgid "Tip: you can search by keyword in name or owner or both." msgstr "Consell: pot cercar per paraula clau al nom i al propietari" -#: seahub/templates/sysadmin/sys_repo_search.html:14 -#: seahub/templates/sysadmin/user_search.html:12 +#: seahub/templates/sysadmin/sys_repo_search.html:16 +#: seahub/templates/sysadmin/user_search.html:14 msgid "Result" msgstr "Resultat" -#: seahub/templates/sysadmin/sys_repo_search.html:18 -#: seahub/templates/sysadmin/user_search.html:16 +#: seahub/templates/sysadmin/sys_repo_search.html:20 +#: seahub/templates/sysadmin/user_search.html:18 msgid "No result" msgstr "Cap resultat" -#: seahub/templates/sysadmin/sys_useradmin.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:23 -msgid "Add new user" -msgstr "Afegeix un usuari" +#: seahub/templates/sysadmin/sys_trafficadmin.html:19 +msgid "User Traffic" +msgstr "" -#: seahub/templates/sysadmin/sys_useradmin.html:38 -#: seahub/templates/sysadmin/user_search.html:20 +#: seahub/templates/sysadmin/sys_trafficadmin.html:22 +msgid "Month:" +msgstr "" + +#: seahub/templates/sysadmin/sys_trafficadmin.html:28 +#: seahub/templates/sysadmin/sys_useradmin.html:15 +msgid "User" +msgstr "" + +#: seahub/templates/sysadmin/sys_trafficadmin.html:29 +msgid "Total Usage" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:22 +#: seahub/templates/sysadmin/sys_useradmin.html:28 +msgid "Add user" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:23 +msgid "Add admin" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:39 +msgid "Add admins" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:46 +msgid "Tip: the emails should be the users already added." +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:58 +#: seahub/templates/sysadmin/user_search.html:22 msgid "Activating..., please wait" msgstr "Activant... espereu." -#: seahub/templates/sysadmin/sys_useradmin.html:68 +#: seahub/templates/sysadmin/sys_useradmin.html:106 msgid "Passwords do not match" msgstr "Les contrasenyes no coincideixen" -#: seahub/templates/sysadmin/user_add_email.html:3 +#: seahub/templates/sysadmin/user_activation_email.html:12 +#, python-format +msgid "Your account %(username)s on %(site_name)s has been activated." +msgstr "" + +#: seahub/templates/sysadmin/user_add_email.html:13 #, python-format msgid "" -"You're receiving this e-mail because %(user)s added you to organization " -"\"%(org.org_name)s\" on %(site_name)s." -msgstr "Heu rebut aquest correu electrònic perquè en %(user)s us ha afegit a la organització \"%(org.org_name)s\" a %(site_name)s." +"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s." +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:5 +#: seahub/templates/sysadmin/user_add_email.html:15 #, python-format -msgid "" -"You're receiving this e-mail because %(user)s added you to %(site_name)s." -msgstr "Heu rebut aquest correu electrònic perquè en %(user)s us ha afegit a %(site_name)s." +msgid "%(user)s invited you to join %(site_name)s." +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:7 -msgid "Following is your account information:" -msgstr "A continuació teniu la informació del vostre compte:" +#: seahub/templates/sysadmin/user_add_email.html:20 +msgid "Here is your account information:" +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:8 +#: seahub/templates/sysadmin/user_add_email.html:21 #, python-format msgid "Email: %(email)s" msgstr "Correu electrònic: %(email)s" -#: seahub/templates/sysadmin/user_add_email.html:9 +#: seahub/templates/sysadmin/user_add_email.html:22 #, python-format -msgid "Password: %(password)s" -msgstr "Contrasenya: %(password)s" +msgid "Password: %(password)s" +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:11 -msgid "Please go to the following page and log in:" -msgstr "Aneu a la següent pàgina i inicieu sessió:" - -#: seahub/templates/sysadmin/user_reset_email.html:2 +#: seahub/templates/sysadmin/user_reset_email.html:12 #, python-format msgid "" -"You're receiving this e-mail because staff has reset your password at " -"%(site_name)s. " -msgstr "Heu rebut aquest correu electrònic perquè l'administrador ha reinicialitzat la vostre contrasenya a %(site_name)s." +"Your password on %(site_name)s has been reset. Now it is %(password)s. " +"Please change it as soon as possible. " +msgstr "" -#: seahub/templates/sysadmin/user_reset_email.html:4 -#, python-format -msgid "" -"Your new password is %(password)s, please modify your password as soon as " -"possible." -msgstr "La seva contrasenya és %(password)s. Cal que la modifiqueu com abans millor." - -#: seahub/templates/sysadmin/user_search.html:5 +#: seahub/templates/sysadmin/user_search.html:7 msgid "Search User" msgstr "Cerca un usuari" -#: seahub/templates/sysadmin/user_search.html:8 +#: seahub/templates/sysadmin/user_search.html:10 msgid "Tip: Use * to match any number of characters." msgstr "Consell: Podeu fer servir * per cercar qualsevol caràcter." @@ -5151,7 +5551,7 @@ msgid "Are you sure you want to reset the password of %s ?" msgstr "Esteu segur que voleu reinicialitzar la contrasenya de %s ?" #: seahub/templates/sysadmin/useradmin_js.html:11 -#: seahub/templates/sysadmin/useradmin_table.html:49 +#: seahub/templates/sysadmin/useradmin_table.html:117 msgid "Revoke Admin" msgstr "Revoca el permís d'administrador" @@ -5161,7 +5561,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?" msgstr "Esteu segur que voleu revocar el permís d'administrador a %s ?" #: seahub/templates/sysadmin/useradmin_js.html:15 -#: seahub/templates/sysadmin/useradmin_table.html:51 msgid "Set Admin" msgstr "Activa el permís d'administrador" @@ -5180,437 +5579,466 @@ msgid "" "configuration." msgstr "S'ha editat però no s'ha pogut notificar per correu electrònic. Revisa la configuració del correu." -#: seahub/templates/sysadmin/useradmin_table.html:5 +#: seahub/templates/sysadmin/useradmin_table.html:6 +#: seahub/templates/sysadmin/useradmin_table.html:71 msgid "Status" msgstr "Estat" -#: seahub/templates/sysadmin/useradmin_table.html:19 -#: seahub/templates/sysadmin/useradmin_table.html:26 +#: seahub/templates/sysadmin/useradmin_table.html:20 +#: seahub/templates/sysadmin/useradmin_table.html:27 +#: seahub/templates/sysadmin/useradmin_table.html:86 +#: seahub/templates/sysadmin/useradmin_table.html:93 msgid "Active" msgstr "Actiu" -#: seahub/templates/sysadmin/useradmin_table.html:21 -#: seahub/templates/sysadmin/useradmin_table.html:27 +#: seahub/templates/sysadmin/useradmin_table.html:22 +#: seahub/templates/sysadmin/useradmin_table.html:28 +#: seahub/templates/sysadmin/useradmin_table.html:88 +#: seahub/templates/sysadmin/useradmin_table.html:94 msgid "Inactive" msgstr "Inactiu" -#: seahub/templates/sysadmin/useradmin_table.html:47 +#: seahub/templates/sysadmin/useradmin_table.html:50 +#: seahub/templates/sysadmin/useradmin_table.html:116 msgid "ResetPwd" msgstr "ReiniContra" -#: seahub/templates/sysadmin/userinfo.html:39 +#: seahub/templates/sysadmin/userinfo.html:7 +msgid "Back to user list" +msgstr "" + +#: seahub/templates/sysadmin/userinfo.html:33 msgid "Total" msgstr "Total" -#: seahub/templates/sysadmin/userinfo.html:40 +#: seahub/templates/sysadmin/userinfo.html:34 msgid "Used" msgstr "Usat" -#: seahub/templates/sysadmin/userinfo.html:45 +#: seahub/templates/sysadmin/userinfo.html:39 msgid "Set Quota" msgstr "Estableix quota" -#: seahub/templates/sysadmin/userinfo.html:48 +#: seahub/templates/sysadmin/userinfo.html:42 msgid "Set user storage limit" msgstr "Estableix el límit d'espai" -#: seahub/templates/sysadmin/userinfo.html:51 +#: seahub/templates/sysadmin/userinfo.html:45 msgid "Tip: 0 means default limit" msgstr "Consell: El 0 equival al límit per defecte" -#: seahub/templates/sysadmin/userinfo.html:61 +#: seahub/templates/sysadmin/userinfo.html:55 msgid "Owned" msgstr "Propietat" -#: seahub/templates/wiki/personal_wiki.html:13 +#: seahub/templates/wiki/personal_wiki.html:32 msgid "You do not have personal wiki" msgstr "No teniu cap wiki personal" -#: seahub/templates/wiki/personal_wiki.html:20 +#: seahub/templates/wiki/personal_wiki.html:42 msgid "personal-wiki" msgstr "wiki-personal" -#: seahub/templates/wiki/personal_wiki.html:22 +#: seahub/templates/wiki/personal_wiki.html:44 msgid "Personal Wiki Pages" msgstr "Pàgines de Wiki personals" -#: seahub/utils/__init__.py:97 +#: seahub/utils/__init__.py:100 msgid "permission error" msgstr "permís incorrecte" -#: seahub/views/__init__.py:401 +#: seahub/views/__init__.py:429 msgid "Unable to view recycle page" msgstr "No es pot visualitzar la pàgina de reciclar" -#: seahub/views/__init__.py:427 seahub/views/ajax.py:216 -#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457 -#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600 -#: seahub/views/ajax.py:760 seahub/views/ajax.py:923 +#: seahub/views/__init__.py:455 seahub/views/ajax.py:231 +#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479 +#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622 +#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086 msgid "Library does not exist." msgstr "Aquesta llibreria no existeix" -#: seahub/views/__init__.py:438 +#: seahub/views/__init__.py:466 msgid "You do not have permission to perform this action." msgstr "No teniu permís per realitzar aquesta acció." -#: seahub/views/__init__.py:445 seahub/views/__init__.py:502 +#: seahub/views/__init__.py:473 seahub/views/__init__.py:530 msgid "Failed to edit library information." msgstr "No s'ha pogut editar la informació de la llibreria." -#: seahub/views/__init__.py:453 seahub/views/__init__.py:511 +#: seahub/views/__init__.py:481 seahub/views/__init__.py:539 msgid "Failed to save settings on server" msgstr "No s'ha pogut guardar la configuració al servidor" -#: seahub/views/__init__.py:460 seahub/views/__init__.py:514 +#: seahub/views/__init__.py:488 seahub/views/__init__.py:542 msgid "Settings saved." msgstr "S'ha guardat la configuració." -#: seahub/views/__init__.py:550 +#: seahub/views/__init__.py:603 #, python-format msgid "Username %s is not valid." msgstr "El nom d'usuari %s no és vàlid." -#: seahub/views/__init__.py:557 +#: seahub/views/__init__.py:610 #, python-format msgid "User %s is not found." msgstr "No s'ha trobat l'usuari %s." -#: seahub/views/__init__.py:563 +#: seahub/views/__init__.py:616 #, python-format msgid "Library %(repo_name)s has been transfered to %(new_owner)s." msgstr "S'ha transferit la llibreria %(repo_name)s a en %(new_owner)s." -#: seahub/views/__init__.py:571 +#: seahub/views/__init__.py:648 +#, python-format +msgid "Successfully updated the password of Library %(repo_name)s." +msgstr "" + +#: seahub/views/__init__.py:655 msgid "Filename contains invalid character" msgstr "El nom del fitxer conté caràcters no vàlids" -#: seahub/views/__init__.py:573 +#: seahub/views/__init__.py:657 msgid "Duplicated filename" msgstr "Nom de fitxer duplicat" -#: seahub/views/__init__.py:577 +#: seahub/views/__init__.py:661 msgid "File size surpasses the limit" msgstr "La mida del fitxer supera el màxim permès" -#: seahub/views/__init__.py:579 +#: seahub/views/__init__.py:663 msgid "The space of owner is used up, upload failed" msgstr "No s'ha pujat el fitxer perquè s'ha exhaurit l'espai de disc del propietari" -#: seahub/views/__init__.py:581 +#: seahub/views/__init__.py:665 msgid "An error occurs during file transfer" msgstr "S'ha produït un error al transferir el fitxer" -#: seahub/views/__init__.py:593 seahub/views/__init__.py:615 +#: seahub/views/__init__.py:677 seahub/views/__init__.py:699 msgid "Invalid url" msgstr "L'enllaç no és vàlid" -#: seahub/views/__init__.py:635 +#: seahub/views/__init__.py:719 msgid "Unable to view library modification" msgstr "No es poden visualitzar les modificacions de la llibreria" -#: seahub/views/__init__.py:699 +#: seahub/views/__init__.py:785 msgid "Unable to view library snapshots" msgstr "No es poden veure les captures de la llibreria" -#: seahub/views/__init__.py:764 +#: seahub/views/__init__.py:850 msgid "You have no permission to restore library" msgstr "No teniu permís per restaurar la llibreria" -#: seahub/views/__init__.py:788 +#: seahub/views/__init__.py:874 msgid "Please specify history ID" msgstr "Especifiqueu un identificador d'historial" -#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483 -#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107 +#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568 +#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279 msgid "Library does not exist" msgstr "La llibreria no existeix" -#: seahub/views/__init__.py:798 +#: seahub/views/__init__.py:884 msgid "History you specified does not exist" msgstr "L'historial que heu especificat no existeix" -#: seahub/views/__init__.py:800 +#: seahub/views/__init__.py:886 msgid "Unknown error" msgstr "Error desconegut" -#: seahub/views/__init__.py:882 +#: seahub/views/__init__.py:968 msgid "No conflict in the merge." msgstr "S'ha sincronitzat correctament" -#: seahub/views/__init__.py:904 seahub/views/__init__.py:905 +#: seahub/views/__init__.py:989 seahub/views/__init__.py:990 msgid "My Library" msgstr "Personal" -#: seahub/views/__init__.py:1187 +#: seahub/views/__init__.py:1271 msgid "Failed to unshare the library, as it does not exist." msgstr "No es pot deixar de compartir la llibreria perquè no existeix." -#: seahub/views/__init__.py:1192 +#: seahub/views/__init__.py:1276 #, python-format msgid "Unshare \"%s\" successfully." msgstr "S'ha deixat de compartir \"%s\"." -#: seahub/views/__init__.py:1194 +#: seahub/views/__init__.py:1278 #, python-format msgid "Failed to unshare \"%s\"." msgstr "No s'ha pogut deixar de compartir \"%s\"." -#: seahub/views/__init__.py:1228 +#: seahub/views/__init__.py:1312 msgid "Failed to delete file." msgstr "No s'ha pogut eliminar el fitxer." -#: seahub/views/__init__.py:1235 +#: seahub/views/__init__.py:1319 #, python-format msgid "%s successfully deleted." msgstr "S'ha eliminat %s." -#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540 +#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562 #, python-format msgid "Internal error. Failed to delete %s." msgstr "Error intern. No s'ha pogut eliminar %s." -#: seahub/views/__init__.py:1283 +#: seahub/views/__init__.py:1367 msgid "Unable to access file" msgstr "No es pot accedir al fitxer" -#: seahub/views/__init__.py:1309 +#: seahub/views/__init__.py:1393 msgid "Failed to download library, unable to find server" msgstr "No es pot descarregar la llibreria. La connexió amb el servidor ha fallat." -#: seahub/views/__init__.py:1320 +#: seahub/views/__init__.py:1404 msgid "Invalid server setting" msgstr "Els paràmetres del servidor no són vàlids " -#: seahub/views/__init__.py:1564 +#: seahub/views/__init__.py:1644 #, python-format msgid "Successfully revert %(path)s to root directory." msgstr "S'ha revertit %(path)s al directori arrel." -#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594 +#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674 #, python-format msgid "Successfully revert %(path)s" msgstr "S'ha revertit %(path)s" -#: seahub/views/__init__.py:1590 +#: seahub/views/__init__.py:1670 #, python-format msgid "Successfully revert %(path)s to root directory." msgstr "S'ha revertit %(path)s al directori arrel." -#: seahub/views/__init__.py:1888 seahub/views/file.py:748 +#: seahub/views/__init__.py:1970 seahub/views/file.py:799 msgid "Internal Error" msgstr "Error intern" -#: seahub/views/__init__.py:1891 +#: seahub/views/__init__.py:1973 #, python-format msgid "Unable to download directory \"%s\": size is too large." msgstr "No s'ha pogut descarregar el directori \"%s\" perquè és massa gran." -#: seahub/views/__init__.py:1905 +#: seahub/views/__init__.py:1987 #, python-format msgid "Unable to download \"%s\"" msgstr "No s'ha pogut descarregar \"%s\"" -#: seahub/views/__init__.py:2067 +#: seahub/views/__init__.py:2148 msgid "Successfully enable \"Personal Wiki\"." msgstr "S'ha activat la Wiki personal." -#: seahub/views/__init__.py:2072 +#: seahub/views/__init__.py:2153 msgid "Successfully disable \"Personal Wiki\"." msgstr "S'ha desactivat la Wiki personal." -#: seahub/views/ajax.py:69 +#: seahub/views/ajax.py:72 msgid "You don't have permission to access the library." msgstr "No teniu permís per accedir a la llibreria." -#: seahub/views/ajax.py:77 +#: seahub/views/ajax.py:80 msgid "No path." msgstr "Ruta inexistent" -#: seahub/views/ajax.py:150 +#: seahub/views/ajax.py:160 msgid "The group doesn't exist" msgstr "Aquest grup no existeix" -#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463 -#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767 -#: seahub/views/ajax.py:792 seahub/views/file.py:755 +#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485 +#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820 +#: seahub/views/ajax.py:845 seahub/views/file.py:806 msgid "Permission denied" msgstr "S'ha denegat l'accés " -#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521 -#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130 -#: seahub/views/ajax.py:1148 +#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543 +#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093 +#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320 msgid "Permission denied." msgstr "Permís denegat." -#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943 +#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106 msgid "Library is encrypted." msgstr "La llibreria està encriptada." -#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949 +#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112 msgid "Error: no head commit id" msgstr "Error: falta el identificador del \"head commit\"" -#: seahub/views/ajax.py:529 seahub/views/ajax.py:571 +#: seahub/views/ajax.py:551 seahub/views/ajax.py:593 msgid "Argument missing." msgstr "Falten paràmetres." -#: seahub/views/ajax.py:625 +#: seahub/views/ajax.py:647 msgid "Destination path is too long." msgstr "La ruta de destí és massa llarga." -#: seahub/views/ajax.py:654 seahub/views/ajax.py:706 +#: seahub/views/ajax.py:686 seahub/views/ajax.py:753 #, python-format msgid "Successfully moved %(name)s view" msgstr "S'ha mogut %(name)s mostra" -#: seahub/views/ajax.py:676 seahub/views/ajax.py:735 +#: seahub/views/ajax.py:715 seahub/views/ajax.py:790 #, python-format msgid "Successfully copied %(name)s view" msgstr "S'ha copiat %(name)s mostra" -#: seahub/views/ajax.py:694 seahub/views/ajax.py:813 +#: seahub/views/ajax.py:732 seahub/views/ajax.py:866 #, python-format msgid "Can not move directory %(src)s to its subdirectory %(des)s" msgstr "No és possible moure el directori %(src)s al subdirectori %(des)s" -#: seahub/views/ajax.py:724 seahub/views/ajax.py:843 +#: seahub/views/ajax.py:769 seahub/views/ajax.py:905 #, python-format msgid "Can not copy directory %(src)s to its subdirectory %(des)s" msgstr "No es pot copiar el directori %(src)s al seu subdirectori %(des)s" -#: seahub/views/ajax.py:786 +#: seahub/views/ajax.py:839 #, python-format msgid "Destination path is too long for %s." msgstr "La ruta de destí és massa llarga per %s." -#: seahub/views/ajax.py:1020 +#: seahub/views/ajax.py:1188 msgid "Failed to get file block list" msgstr "No s'ha pogut obtenir els blocs del fitxer" -#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063 +#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231 msgid "Wrong repo id" msgstr "Identificador incorrecte" -#: seahub/views/file.py:111 +#: seahub/views/ajax.py:1274 +msgid "System library can not be deleted." +msgstr "" + +#: seahub/views/file.py:117 msgid "HTTPError: failed to open file online" msgstr "HTTPError: no s'ha pogut obrir el fitxer" -#: seahub/views/file.py:115 +#: seahub/views/file.py:121 msgid "URLError: failed to open file online" msgstr "URLError: No s'ha pogut obrir el fitxer" -#: seahub/views/file.py:122 +#: seahub/views/file.py:128 msgid "The encoding you chose is not proper." msgstr "La codificació seleccionada no és vàlida." -#: seahub/views/file.py:139 seahub/views/file.py:142 +#: seahub/views/file.py:145 seahub/views/file.py:148 msgid "Unknown file encoding" msgstr "Codificació de fitxer desconeguda" -#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491 -#: seahub/views/file.py:496 +#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509 +#: seahub/views/file.py:514 #, python-format msgid "File size surpasses %s, can not be opened online." msgstr "El fitxers és més gran de %s i no es pot obrir a la web." -#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544 -#: seahub/views/file.py:566 +#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567 +#: seahub/views/file.py:589 msgid "Unable to view file" msgstr "No es pot visualitzar el fitxer" -#: seahub/views/file.py:339 +#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646 msgid "Invalid file format." msgstr "Format de fitxer no vàlid." -#: seahub/views/file.py:759 +#: seahub/views/file.py:810 msgid "The library does not exist." msgstr "La llibreria no existeix." -#: seahub/views/file.py:763 +#: seahub/views/file.py:814 msgid "The library is encrypted." msgstr "La llibreria està encriptada." -#: seahub/views/file.py:831 +#: seahub/views/file.py:882 msgid "Unable to edit file" msgstr "No es pot editar el fitxer" -#: seahub/views/file.py:843 +#: seahub/views/file.py:894 msgid "The file does not exist." msgstr "El fitxer no existeix." -#: seahub/views/file.py:871 +#: seahub/views/file.py:922 msgid "Edit online is not offered for this type of file." msgstr "Aquest tipus de fitxer no es pot editar a la web." -#: seahub/views/sysadmin.py:314 +#: seahub/views/sysadmin.py:313 msgid "Failed to set quota: internal error" msgstr "No s'ha pogut establir la quota: error intern" -#: seahub/views/sysadmin.py:330 +#: seahub/views/sysadmin.py:329 #, python-format msgid "Successfully deleted %s" msgstr "S'ha eliminat %s" -#: seahub/views/sysadmin.py:332 +#: seahub/views/sysadmin.py:331 msgid "Failed to delete: the user does not exist" msgstr "No s'ha pogut eliminar: l'usuari no existeix" -#: seahub/views/sysadmin.py:347 +#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734 #, python-format msgid "Successfully set %s as admin" msgstr "S'ha establert %s com administrador" -#: seahub/views/sysadmin.py:349 +#: seahub/views/sysadmin.py:348 msgid "Failed to set admin: the user does not exist" msgstr "L'usuari no existeix i no s'ha pogut establir com administrador" -#: seahub/views/sysadmin.py:364 +#: seahub/views/sysadmin.py:363 #, python-format msgid "Successfully revoke the admin permission of %s" msgstr "S'ha revocat el permís d'administrador a %s" -#: seahub/views/sysadmin.py:366 +#: seahub/views/sysadmin.py:365 msgid "Failed to revoke admin: the user does not exist" msgstr "L'usuari no existeix i no s'ha revocat el permís d'administrador" -#: seahub/views/sysadmin.py:380 +#: seahub/views/sysadmin.py:379 #, python-format msgid "Successfully activated \"%s\"." msgstr "S'ha activat \"%s\"." -#: seahub/views/sysadmin.py:382 +#: seahub/views/sysadmin.py:381 msgid "Failed to activate: user does not exist." msgstr "No existeix l'usuari i no s'ha pogut activar." -#: seahub/views/sysadmin.py:397 +#: seahub/views/sysadmin.py:396 #, python-format msgid "Successfully deactivated \"%s\"." msgstr "S'ha desactivat \"%s\"." -#: seahub/views/sysadmin.py:399 +#: seahub/views/sysadmin.py:398 msgid "Failed to deactivate: user does not exist." msgstr "L'usuari no existeix, no s'ha pogut desactivar." -#: seahub/views/sysadmin.py:488 +#: seahub/views/sysadmin.py:412 +#, python-format +msgid "Your account on %s is activated" +msgstr "" + +#: seahub/views/sysadmin.py:456 +#, python-format +msgid "Password has been reset on %s" +msgstr "" + +#: seahub/views/sysadmin.py:476 #, python-format msgid "" "Successfully reset password to %(passwd)s, an email has been sent to " "%(user)s." msgstr "S'ha reinicialitzar la contrasenya a %(passwd)s. S'ha notificat per correu a %(user)s." -#: seahub/views/sysadmin.py:493 +#: seahub/views/sysadmin.py:481 #, python-format msgid "" "Successfully reset password to %(passwd)s, but failed to send email to " "%(user)s, please check your email configuration." msgstr "S'ha reinicialitzat la contrasenya a %(passwd)s, però no s'ha pogut enviar un correu electrònic a %(user)s. Reviseu la configuració del correu." -#: seahub/views/sysadmin.py:497 +#: seahub/views/sysadmin.py:485 #, python-format msgid "Successfully reset password to %(passwd)s for user %(user)s." msgstr "S'ha reinicialitzat la contrasenya a %(passwd)s per l'usuari %(user)s." -#: seahub/views/sysadmin.py:500 +#: seahub/views/sysadmin.py:488 #, python-format msgid "" "Successfully reset password to %(passwd)s for user %(user)s. But email " @@ -5618,47 +6046,53 @@ msgid "" "configured." msgstr "S'ha reinicialitzat la contrasenya %(passwd)s de l'usuari %(user)s. Però no s'ha pogut notificar per correu electrònic. El servei de missatgeria no està ben configurat." -#: seahub/views/sysadmin.py:503 +#: seahub/views/sysadmin.py:491 msgid "Failed to reset password: user does not exist" msgstr "L'usuari no existeix i no s'ha pogut reinicialitzar la contrasenya" -#: seahub/views/sysadmin.py:524 -msgid "Seafile Registration Information" -msgstr "Informació de registre a Seafile" +#: seahub/views/sysadmin.py:507 +#, python-format +msgid "You are invited to join %s" +msgstr "" -#: seahub/views/sysadmin.py:563 +#: seahub/views/sysadmin.py:546 #, python-format msgid "Successfully added user %s. An email notification has been sent." msgstr "S'ha registrat l'usuari %s. S'ha enviat una notificació per correu electrònic." -#: seahub/views/sysadmin.py:566 +#: seahub/views/sysadmin.py:549 #, python-format msgid "" "Successfully added user %s. An error accurs when sending email notification," " please check your email configuration." msgstr "S'ha registrat l'usuari %s. Però no s'ho pogut notificar per correu electrònic. Reviseu la configuració del correu." -#: seahub/views/sysadmin.py:568 +#: seahub/views/sysadmin.py:551 #, python-format msgid "Successfully added user %s." msgstr "S'ha registrat l'usuari %s." -#: seahub/views/sysadmin.py:570 +#: seahub/views/sysadmin.py:553 #, python-format msgid "" "Successfully added user %s. But email notification can not be sent, because " "Email service is not properly configured." msgstr "S'ha registrat l'usuari %s. No s'ha pogut notificar per correu electrònic. Reviseu la configuració del servei de missatgeria." -#: seahub/views/sysadmin.py:681 +#: seahub/views/sysadmin.py:664 msgid "Successfully transfered." msgstr "S'ha transferit correctament." -#: seahub/views/sysadmin.py:683 +#: seahub/views/sysadmin.py:666 #, python-format msgid "Failed to transfer, user %s not found" msgstr "No s'ha transferit perquè no s'ha trobat l'usuari %s" -#: seahub/views/sysadmin.py:685 +#: seahub/views/sysadmin.py:668 msgid "Failed to transfer, invalid arguments." msgstr "No s'ha transferit perquè el paràmetres no són vàlids." + +#: seahub/views/sysadmin.py:736 +#, python-format +msgid "Failed set %s as admin" +msgstr "" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 2b89ccf270..cf5dceb1d2 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -11,18 +11,20 @@ # j0w , 2014 # jbbr , 2013-2014 # jbbr , 2013 +# Lucas Ribic, 2014 # j0w , 2014 # Matthias Hub , 2013 # Phillip Thelen , 2013 +# sl , 2014 # garyletshurry, 2013 # Phillip Thelen , 2013-2014 msgid "" msgstr "" "Project-Id-Version: seahub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-11 13:47+0800\n" -"PO-Revision-Date: 2014-02-02 18:54+0000\n" -"Last-Translator: FlorinPeter \n" +"POT-Creation-Date: 2014-04-10 11:01+0800\n" +"PO-Revision-Date: 2014-04-10 05:44+0000\n" +"Last-Translator: sl \n" "Language-Team: German (http://www.transifex.com/projects/p/seahub/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,175 +32,207 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: seahub/forms.py:26 seahub/base/accounts.py:410 +#: seahub/forms.py:27 seahub/base/accounts.py:410 msgid "A user with this email already" msgstr "Es existiert bereits ein Nutzer mit dieser E-Mail-Adresse." -#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171 +#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164 #: seahub/base/accounts.py:427 msgid "The two password fields didn't match." msgstr "Die Passwortfelder stimmen nicht überein." -#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16 +#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16 msgid "Name can't be empty" msgstr "Name darf nicht leer sein" -#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17 +#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17 msgid "Name is too long (maximum is 255 characters)" msgstr "Name ist zu lang (maximal 255 Zeichen)" -#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20 +#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20 msgid "Description can't be empty" msgstr "Beschreibung darf nicht leer sein" -#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21 +#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21 msgid "Description is too long (maximum is 100 characters)" msgstr "Beschreibung ist zu lang (maximal 100 Zeichen)" -#: seahub/forms.py:63 +#: seahub/forms.py:64 #, python-format msgid "Name %s is not valid" msgstr "Name %s ist ungültig" -#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729 -#: seahub/share/views.py:762 seahub/views/__init__.py:1074 -#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484 -#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977 -#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049 -#: seahub/views/ajax.py:1053 +#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708 +#: seahub/share/views.py:741 seahub/views/__init__.py:1107 +#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356 +#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641 +#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980 +#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145 +#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217 +#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455 msgid "Argument missing" msgstr "Argument fehlt" -#: seahub/forms.py:91 +#: seahub/forms.py:92 msgid "Oldname is required" msgstr "Alter Name wird benötigt" -#: seahub/forms.py:94 seahub/forms.py:115 +#: seahub/forms.py:95 seahub/forms.py:116 msgid "It's too long." msgstr "Dieser Dateiname ist zu lang." -#: seahub/forms.py:95 seahub/forms.py:116 +#: seahub/forms.py:96 seahub/forms.py:117 msgid "It's required." msgstr "Erforderlich." -#: seahub/forms.py:102 seahub/forms.py:123 +#: seahub/forms.py:103 seahub/forms.py:124 #, python-format msgid "Name \"%s\" is not valid" msgstr "Name \"%s\" ist ungültig" -#: seahub/forms.py:134 +#: seahub/forms.py:135 msgid "Repo id is required" msgstr "Repo-ID wird benötigt" -#: seahub/forms.py:135 +#: seahub/forms.py:136 msgid "Username is required" msgstr "Nutzername wird benötigt" -#: seahub/forms.py:136 +#: seahub/forms.py:137 seahub/forms.py:181 msgid "Password can't be empty" msgstr "Passwort darf nicht leer sein" -#: seahub/forms.py:147 +#: seahub/forms.py:148 msgid "Bad url format" msgstr "Ungültiges URL-Format" -#: seahub/forms.py:152 seahub/templates/repo.html:361 +#: seahub/forms.py:153 seahub/templates/repo.html:358 msgid "Wrong password" msgstr "Falsches Passwort" -#: seahub/forms.py:154 seahub/views/__init__.py:1083 +#: seahub/forms.py:155 seahub/views/__init__.py:1113 +#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680 +#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784 msgid "Internal server error" msgstr "Interner Serverfehler" -#: seahub/forms.py:156 +#: seahub/forms.py:157 msgid "Decrypt library error" msgstr "Fehler beim Entschlüsseln der Bibliothek" -#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29 +#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29 msgid "Email is required" msgstr "E-Mail wird benötigt" -#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135 +#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129 msgid "Quota can't be empty" msgstr "Quota darf nicht leer sein" -#: seahub/forms.py:165 +#: seahub/forms.py:166 msgid "Quota is too low (minimum value is 0)" msgstr "Quota ist zu niedrig (Mindestwert ist 0)" -#: seahub/forms.py:171 +#: seahub/forms.py:172 msgid "Library name is required" msgstr "Es wird ein Name für die Bibliothek benötigt." -#: seahub/forms.py:172 +#: seahub/forms.py:173 msgid "Library description is required" msgstr "Es wird eine Beschreibung für die Bibliothek benötigt." -#: seahub/forms.py:174 +#: seahub/forms.py:175 msgid "Please enter a number" msgstr "Bitte eine Nummer eingeben" +#: seahub/forms.py:188 +msgid "Please enter a correct password." +msgstr "Bitte geben sie ein korrektes Passwort ein. " + #: seahub/settings.py:133 +msgid "català" +msgstr "Katalanisch" + +#: seahub/settings.py:134 msgid "Deutsch" msgstr "Deutsch" -#: seahub/settings.py:134 +#: seahub/settings.py:135 msgid "English" msgstr "Englisch" -#: seahub/settings.py:135 +#: seahub/settings.py:136 msgid "Español" msgstr "Spanisch" -#: seahub/settings.py:136 +#: seahub/settings.py:137 +msgid "Argentinian Spanish" +msgstr "" + +#: seahub/settings.py:138 msgid "Mexican Spanish" msgstr "Mexikanisches Spanisch" -#: seahub/settings.py:137 -msgid "Français" -msgstr "Französisch" - -#: seahub/settings.py:138 -msgid "Hebrew" -msgstr "Hebräisch" - #: seahub/settings.py:139 +msgid "français" +msgstr "" + +#: seahub/settings.py:140 +msgid "עברית" +msgstr "" + +#: seahub/settings.py:141 msgid "Magyar" msgstr "Ungarisch" -#: seahub/settings.py:140 +#: seahub/settings.py:142 +msgid "Íslenska" +msgstr "" + +#: seahub/settings.py:143 msgid "Italiano" msgstr "Italienisch" -#: seahub/settings.py:141 +#: seahub/settings.py:144 +msgid "한국어" +msgstr "" + +#: seahub/settings.py:145 msgid "Latvian" msgstr "Lettisch" -#: seahub/settings.py:142 -msgid "Dutch" -msgstr "Niederländisch" +#: seahub/settings.py:146 +msgid "Nederlands" +msgstr "Niederlande" -#: seahub/settings.py:143 +#: seahub/settings.py:147 +msgid "Polski" +msgstr "Polnisch" + +#: seahub/settings.py:148 msgid "Portuguese, Brazil" msgstr "Portugisisch, Brasilien" -#: seahub/settings.py:144 +#: seahub/settings.py:149 msgid "Русский" msgstr "Russisch" -#: seahub/settings.py:145 +#: seahub/settings.py:150 msgid "Slovak" msgstr "Slowakisch" -#: seahub/settings.py:146 -msgid "Ukrainian" -msgstr "Ukrainisch" +#: seahub/settings.py:151 +msgid "Svenska" +msgstr "" -#: seahub/settings.py:147 +#: seahub/settings.py:152 +msgid "українська мова" +msgstr "" + +#: seahub/settings.py:153 msgid "简体中文" msgstr "Vereinfachtes Chinesisch" -#: seahub/settings.py:148 +#: seahub/settings.py:154 msgid "繁體中文" msgstr "Traditionelles Chinesisch" @@ -207,8 +241,9 @@ msgid "File Collaboration Team Organization" msgstr "File Collaboration Team Organization" #: seahub/api2/templates/api2/discussion.html:6 -#: seahub/group/templates/group/group_base.html:25 +#: seahub/group/templates/group/group_base.html:23 #: seahub/group/templates/group/groups_right_panel.html:17 +#: seahub/templates/base.html:160 msgid "Discussion" msgstr "Diskussionen" @@ -220,16 +255,17 @@ msgstr "Diskussionen" #: seahub/api2/templates/api2/discussions_body.html:37 #: seahub/api2/templates/api2/new_msg_reply.html:27 #: seahub/api2/templates/api2/new_msg_reply.html:43 -#: seahub/group/templates/group/group_discuss.html:45 -#: seahub/group/templates/group/group_discuss.html:61 -#: seahub/group/templates/group/new_msg_reply.html:26 -#: seahub/group/templates/group/new_msg_reply.html:35 -#: seahub/message/templates/message/user_msg_list.html:47 +#: seahub/api2/templates/api2/user_msg_body.html:20 +#: seahub/group/templates/group/group_discuss.html:74 +#: seahub/group/templates/group/new_msg_reply.html:27 +#: seahub/group/templates/group/new_msg_reply.html:36 +#: seahub/message/templates/message/user_msg.html:17 +#: seahub/message/templates/message/user_msg_list.html:62 #: seahub/share/templates/share/links.html:28 #: seahub/share/templates/share/priv_shared_files.html:61 #: seahub/templates/repo_history_view.html:66 #: seahub/templates/repo_recycle_view.html:78 -#: seahub/templates/view_shared_dir.html:53 +#: seahub/templates/view_shared_dir.html:48 #: seahub/templates/snippets/group_recommend_form.html:28 #: seahub/templates/snippets/repo_dirents.html:57 msgid "File" @@ -239,13 +275,13 @@ msgstr "Datei" #: seahub/api2/templates/api2/discussion_posted.html:29 #: seahub/api2/templates/api2/discussions_body.html:31 #: seahub/api2/templates/api2/new_msg_reply.html:37 -#: seahub/group/templates/group/group_discuss.html:55 -#: seahub/group/templates/group/new_msg_reply.html:29 +#: seahub/group/templates/group/group_discuss.html:68 +#: seahub/group/templates/group/new_msg_reply.html:30 #: seahub/share/templates/share/links.html:31 #: seahub/share/templates/share/links.html:63 #: seahub/share/templates/share/priv_shared_files.html:64 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 -#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39 +#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29 +#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34 #: seahub/templates/snippets/group_recommend_form.html:22 #: seahub/templates/snippets/repo_dirents.html:8 msgid "Directory icon" @@ -254,9 +290,9 @@ msgstr "Ordnersymbol" #: seahub/api2/templates/api2/discussion_posted.html:46 #: seahub/api2/templates/api2/discussions_body.html:48 #: seahub/group/templates/group/discussion_list.html:17 -#: seahub/group/templates/group/group_discuss.html:71 -#: seahub/group/templates/group/group_discuss.html:147 -#: seahub/group/templates/group/new_msg_reply.html:45 +#: seahub/group/templates/group/group_discuss.html:85 +#: seahub/group/templates/group/group_discuss.html:160 +#: seahub/group/templates/group/new_msg_reply.html:47 #, python-format msgid "%(amount)s replies" msgstr "%(amount)s Nachrichten" @@ -267,43 +303,48 @@ msgstr "Keine Diskussionen vorhanden." #: seahub/api2/templates/api2/discussions.html:29 #: seahub/api2/templates/api2/events.html:13 +#: seahub/api2/templates/api2/user_msg_list.html:25 #: seahub/notifications/templates/notifications/user_notification_list.html:26 -#: seahub/templates/activities.html:13 seahub/templates/repo.html:957 -#: seahub/templates/snippets/list_commit_detail.html:3 -#: seahub/templates/snippets/repo_dir_data.html:46 +#: seahub/templates/activities.html:13 +#: seahub/templates/snippets/repo_dir_data.html:48 msgid "Loading..." msgstr "Laden..." #: seahub/api2/templates/api2/discussions.html:75 #: seahub/api2/templates/api2/events_js.html:34 +#: seahub/api2/templates/api2/user_msg_list.html:72 #: seahub/contacts/templates/contacts/contact_list.html:107 #: seahub/contacts/templates/contacts/contact_list.html:153 -#: seahub/group/templates/group/group_discuss.html:231 +#: seahub/group/templates/group/group_discuss.html:244 #: seahub/group/templates/group/msg_js.html:155 -#: seahub/message/templates/message/all_msg_list.html:141 -#: seahub/message/templates/message/all_msg_list.html:208 -#: seahub/message/templates/message/user_msg_list.html:156 +#: seahub/message/templates/message/all_msg_list.html:143 +#: seahub/message/templates/message/all_msg_list.html:219 +#: seahub/message/templates/message/user_msg_list.html:168 #: seahub/notifications/templates/notifications/user_notification_list.html:66 -#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592 -#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406 -#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628 -#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806 -#: seahub/templates/repo_settings.html:100 -#: seahub/templates/repo_settings.html:136 -#: seahub/templates/view_file_base.html:151 +#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592 +#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714 +#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559 +#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800 +#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935 +#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118 +#: seahub/templates/repo_settings.html:154 +#: seahub/templates/repo_settings.html:219 +#: seahub/templates/view_file_base.html:153 #: seahub/templates/snippets/bottom_bar.html:109 #: seahub/templates/snippets/events_js.html:56 -#: seahub/templates/snippets/office_convert_js.html:172 -#: seahub/templates/snippets/office_convert_js.html:197 +#: seahub/templates/snippets/msg_form_js.html:30 +#: seahub/templates/snippets/office_convert_js.html:177 +#: seahub/templates/snippets/office_convert_js.html:202 #: seahub/templates/snippets/repo_decrypt_js.html:35 -#: seahub/templates/snippets/shared_link_js.html:154 -#: seahub/templates/snippets/shared_link_js.html:189 -#: seahub/templates/snippets/shared_link_js.html:213 -#: seahub/templates/snippets/shared_link_js.html:276 -#: seahub/templates/snippets/shared_link_js.html:306 -#: seahub/templates/snippets/shared_link_js.html:330 -#: seahub/templates/sysadmin/sys_useradmin.html:94 -#: seahub/templates/sysadmin/userinfo.html:158 +#: seahub/templates/snippets/shared_link_js.html:197 +#: seahub/templates/snippets/shared_link_js.html:283 +#: seahub/templates/snippets/shared_link_js.html:308 +#: seahub/templates/snippets/shared_link_js.html:371 +#: seahub/templates/snippets/shared_link_js.html:437 +#: seahub/templates/snippets/shared_link_js.html:462 +#: seahub/templates/snippets/spreadsheet_convert_js.html:32 +#: seahub/templates/sysadmin/sys_useradmin.html:132 +#: seahub/templates/sysadmin/userinfo.html:152 msgid "Failed. Please check the network." msgstr "Fehlgeschlagen. Bitte überprüfen Sie die Netzwerkverbindung." @@ -352,6 +393,25 @@ msgstr "Fehlgeschlagen. Bitte überprüfen Sie die Netzwerkverbindung." msgid "New Replies" msgstr "Neue Nachrichten vorhanden" +#: seahub/api2/templates/api2/user_msg_list.html:6 +#: seahub/message/templates/message/all_msg_list.html:4 +#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/user_msg_list.html:4 +#: seahub/share/templates/share/user_share_list.html:24 +#: seahub/templates/home_base.html:22 +msgid "Messages" +msgstr "Nachrichten" + +#: seahub/api2/templates/api2/user_msg_list.html:10 +#: seahub/message/templates/message/user_msg_list.html:9 +#, python-format +msgid "Messages with %(name)s" +msgstr "Nachrichten mit %(name)s" + +#: seahub/api2/templates/api2/user_msg_list.html:19 +msgid "No messages." +msgstr "Keine Nachrichten vorhanden" + #: seahub/auth/admin.py:29 msgid "Personal info" msgstr "Persönliche Informationen" @@ -365,10 +425,11 @@ msgid "Important dates" msgstr "Wichtige Daten" #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5 -#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10 -#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15 -#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8 +#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14 +#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13 +#: seahub/templates/pubgrp.html:8 #: seahub/templates/snippets/repo_share_form.html:7 +#: seahub/templates/sysadmin/base.html:15 msgid "Groups" msgstr "Gruppen" @@ -381,72 +442,74 @@ msgstr "Passwort erfolgreich geändert." msgid "Change password: %s" msgstr "Passwort ändern: %s" -#: seahub/auth/forms.py:19 seahub/base/accounts.py:396 +#: seahub/auth/forms.py:18 seahub/base/accounts.py:396 msgid "Username" msgstr "Benutzername" -#: seahub/auth/forms.py:20 seahub/auth/forms.py:159 -#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10 -#: seahub/templates/registration/registration_form.html:18 +#: seahub/auth/forms.py:19 seahub/auth/forms.py:152 +#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36 +#: seahub/templates/registration/registration_form.html:19 +#: seahub/templates/snippets/file_share_popup.html:36 +#: seahub/templates/snippets/file_share_popup.html:77 #: seahub/templates/snippets/repo_create_form.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:26 +#: seahub/templates/sysadmin/sys_useradmin.html:31 msgid "Password" msgstr "Passwort" -#: seahub/auth/forms.py:40 +#: seahub/auth/forms.py:39 msgid "" "Please enter a correct username and password. Note that both fields are " "case-sensitive." msgstr "Bitte geben Sie einen korrekten Benutzernamen und ein korrektes Passwort ein. Beide Felder berücksichtigen Groß-/Kleinschreibung." -#: seahub/auth/forms.py:42 +#: seahub/auth/forms.py:41 msgid "This account is inactive." msgstr "Dieses Benutzerkonto ist deaktiviert." -#: seahub/auth/forms.py:47 +#: seahub/auth/forms.py:46 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "Ihr Web Browser scheint keine Cookies zu erlauben. Diese werden aber für den Login benötigt." -#: seahub/auth/forms.py:63 +#: seahub/auth/forms.py:62 msgid "E-mail" msgstr "E-Mail" -#: seahub/auth/forms.py:70 +#: seahub/auth/forms.py:69 msgid "" "Failed to send email, email service is not properly configured, please " "contact administrator." msgstr "Eine E-Mail konnte nicht versendet werden. Der E-Mail-Service ist nicht korrekt konfiguriert. Bitte kontaktieren Sie den/die Administrator." -#: seahub/auth/forms.py:78 +#: seahub/auth/forms.py:77 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft. Sind Sie sicher, dass Sie registriert sind?" -#: seahub/auth/forms.py:108 +#: seahub/auth/forms.py:101 #, python-format -msgid "Password reset on %s" -msgstr "Passwort zurücksetzen für %s" +msgid "Reset Password on %s" +msgstr "" -#: seahub/auth/forms.py:116 +#: seahub/auth/forms.py:109 msgid "New password" msgstr "Neues Passwort" -#: seahub/auth/forms.py:117 +#: seahub/auth/forms.py:110 msgid "New password confirmation" msgstr "Neues Passwort bestätigen" -#: seahub/auth/forms.py:143 +#: seahub/auth/forms.py:136 msgid "Old password" msgstr "Altes Passwort" -#: seahub/auth/forms.py:151 +#: seahub/auth/forms.py:144 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Das alte Passwort, das Sie eingegeben haben, war nicht korrekt. Bitte geben Sie es erneut ein." -#: seahub/auth/forms.py:160 seahub/base/accounts.py:402 +#: seahub/auth/forms.py:153 seahub/base/accounts.py:402 msgid "Password (again)" msgstr "Passwort erneut eingeben:" @@ -484,7 +547,7 @@ msgid "" "%(nb_max_avatars)d." msgstr "Sie haben bereits %(nb_avatars)d Avatare. Maximal sind %(nb_max_avatars)d erlaubt." -#: seahub/avatar/models.py:138 seahub/avatar/models.py:163 +#: seahub/avatar/models.py:137 seahub/avatar/models.py:165 #, python-format msgid "Avatar for %s" msgstr "Avatar für %s" @@ -552,57 +615,62 @@ msgstr "Aktueller Avatar: " #: seahub/contacts/templates/contacts/contact_list.html:62 #: seahub/group/templates/group/discussion_list.html:42 #: seahub/group/templates/group/group_base.html:61 -#: seahub/group/templates/group/group_discuss.html:16 -#: seahub/group/templates/group/group_discuss.html:98 -#: seahub/group/templates/group/group_discuss.html:155 +#: seahub/group/templates/group/group_discuss.html:17 +#: seahub/group/templates/group/group_discuss.html:29 +#: seahub/group/templates/group/group_discuss.html:112 +#: seahub/group/templates/group/group_discuss.html:168 #: seahub/group/templates/group/group_info.html:130 #: seahub/group/templates/group/group_manage.html:100 #: seahub/group/templates/group/group_manage.html:108 #: seahub/group/templates/group/group_pubinfo.html:24 -#: seahub/group/templates/group/group_wiki.html:25 -#: seahub/group/templates/group/group_wiki.html:57 +#: seahub/group/templates/group/group_wiki.html:51 +#: seahub/group/templates/group/group_wiki.html:61 +#: seahub/group/templates/group/group_wiki.html:94 #: seahub/group/templates/group/group_wiki_pages.html:33 #: seahub/group/templates/group/groups_right_panel.html:37 #: seahub/group/templates/group/grpmember_add_form.html:32 -#: seahub/group/templates/group/new_msg_reply.html:65 -#: seahub/message/templates/message/all_msg_list.html:50 -#: seahub/message/templates/message/user_msg_list.html:20 -#: seahub/notifications/templates/notifications/notification_list.html:15 +#: seahub/group/templates/group/new_msg_reply.html:67 +#: seahub/message/templates/message/all_msg_list.html:51 +#: seahub/message/templates/message/user_msg_list.html:21 +#: seahub/message/templates/message/user_msg_list.html:33 +#: seahub/notifications/templates/notifications/notification_list.html:14 #: seahub/options/templates/options/set_user_options.html:14 -#: seahub/profile/templates/profile/set_profile.html:60 -#: seahub/profile/templates/profile/set_profile.html:75 +#: seahub/profile/templates/profile/set_profile.html:61 #: seahub/profile/templates/profile/set_profile.html:86 -#: seahub/profile/templates/profile/set_profile.html:112 +#: seahub/profile/templates/profile/set_profile.html:97 +#: seahub/profile/templates/profile/set_profile.html:123 #: seahub/templates/activities.html:25 #: seahub/templates/decrypt_repo_form.html:13 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245 -#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72 -#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152 -#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197 -#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231 -#: seahub/templates/repo_settings.html:28 -#: seahub/templates/repo_settings.html:36 +#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63 +#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143 +#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188 +#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229 +#: seahub/templates/repo_settings.html:31 +#: seahub/templates/repo_settings.html:39 +#: seahub/templates/repo_settings.html:53 +#: seahub/templates/share_access_validation.html:10 #: seahub/templates/shared_file_view.html:50 -#: seahub/templates/registration/login.html:34 #: seahub/templates/registration/password_change_form.html:18 #: seahub/templates/registration/password_reset_confirm.html:19 #: seahub/templates/registration/password_reset_form.html:13 -#: seahub/templates/registration/registration_form.html:33 #: seahub/templates/snippets/add_to_contacts_form.html:8 #: seahub/templates/snippets/file_share_popup.html:24 -#: seahub/templates/snippets/file_share_popup.html:41 -#: seahub/templates/snippets/file_share_popup.html:61 +#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:95 #: seahub/templates/snippets/group_recommend_form.html:19 #: seahub/templates/snippets/repo_create_form.html:26 -#: seahub/templates/snippets/repo_share_form.html:52 +#: seahub/templates/snippets/repo_share_form.html:30 #: seahub/templates/snippets/search_form.html:57 #: seahub/templates/sysadmin/repo_transfer_form.html:8 -#: seahub/templates/sysadmin/sys_repo_search.html:11 -#: seahub/templates/sysadmin/sys_useradmin.html:31 -#: seahub/templates/sysadmin/user_search.html:10 -#: seahub/templates/sysadmin/userinfo.html:53 -#: seahub/templates/wiki/personal_wiki.html:24 -#: seahub/templates/wiki/personal_wiki.html:52 +#: seahub/templates/sysadmin/sys_repo_search.html:13 +#: seahub/templates/sysadmin/sys_useradmin.html:36 +#: seahub/templates/sysadmin/sys_useradmin.html:51 +#: seahub/templates/sysadmin/user_search.html:12 +#: seahub/templates/sysadmin/userinfo.html:47 +#: seahub/templates/wiki/personal_wiki.html:46 +#: seahub/templates/wiki/personal_wiki.html:56 +#: seahub/templates/wiki/personal_wiki.html:85 #: seahub/templates/wiki/personal_wiki_pages.html:31 msgid "Submit" msgstr "Absenden" @@ -619,7 +687,7 @@ msgstr "%(avatar_creator)s hat seinen Avatar aktual msgid "You have updated your avatar %(avatar)s." msgstr "Sie haben Ihren Avatar aktualisiert %(avatar)s." -#: seahub/avatar/templatetags/avatar_tags.py:46 +#: seahub/avatar/templatetags/avatar_tags.py:47 msgid "Default Avatar" msgstr "Standard-Avatar" @@ -651,7 +719,7 @@ msgstr "Telefon" msgid "note" msgstr "Anmerkung" -#: seahub/base/decorators.py:85 +#: seahub/base/decorators.py:102 msgid "Files in this library can not be viewed online." msgstr "Dateien in dieser Bibliothek können nicht online geöffnet weden." @@ -708,7 +776,7 @@ msgstr "Datei \"%(file)s\" zurückgesetzt auf Stand um %(time)s." msgid "Recovered deleted directory" msgstr "Gelöschter Ordner wieder hergestellt" -#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879 +#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965 msgid "Changed library name or description" msgstr "Bibliotheksname oder -beschreibung geändert." @@ -718,9 +786,9 @@ msgstr "Automatisch von Seafile zusammengeführt" #: seahub/base/templatetags/seahub_tags.py:179 #: seahub/base/templatetags/seahub_tags.py:213 -#: seahub/group/templates/group/group_discuss.html:140 -#: seahub/templates/repo.html:1543 -#: seahub/templates/snippets/my_owned_repos.html:226 +#: seahub/group/templates/group/group_discuss.html:154 +#: seahub/templates/repo.html:1647 +#: seahub/templates/snippets/my_owned_repos.html:130 msgid "Just now" msgstr "Gerade eben" @@ -756,42 +824,48 @@ msgstr[1] "vor %(seconds)d Sekunden" #: seahub/group/templates/group/group_info.html:31 #: seahub/group/templates/group/group_info.html:34 #: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/share/views.py:365 seahub/share/views.py:496 +#: seahub/share/views.py:362 seahub/share/views.py:493 #: seahub/share/templates/share/list_priv_shared_folders.html:23 #: seahub/share/templates/share/list_priv_shared_folders.html:36 #: seahub/share/templates/share/repos.html:24 #: seahub/share/templates/share/repos.html:26 #: seahub/share/templates/share/repos.html:40 #: seahub/share/templates/share/user_share_list.html:42 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26 +#: seahub/templates/pubrepo.html.py:29 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 #: seahub/templates/snippets/my_owned_repos.html:29 #: seahub/templates/snippets/my_owned_repos.html:31 #: seahub/templates/snippets/my_owned_repos.html:75 #: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:223 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 #: seahub/templates/snippets/repo_create_form.html:11 -#: seahub/templates/snippets/repo_share_form.html:47 -#: seahub/templates/sysadmin/userinfo.html:78 -#: seahub/templates/sysadmin/userinfo.html:104 +#: seahub/templates/snippets/repo_share_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:72 +#: seahub/templates/sysadmin/userinfo.html:98 msgid "Read-Write" msgstr "Lesen und Schreiben" #: seahub/base/templatetags/seahub_tags.py:312 #: seahub/group/templates/group/group_info.html:36 #: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/views.py:367 seahub/share/views.py:498 +#: seahub/share/views.py:364 seahub/share/views.py:495 #: seahub/share/templates/share/list_priv_shared_folders.html:34 #: seahub/share/templates/share/repos.html:38 #: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:190 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31 +#: seahub/templates/repo.html:20 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_shared_repos.html:22 #: seahub/templates/snippets/repo_create_form.html:12 -#: seahub/templates/snippets/repo_share_form.html:48 +#: seahub/templates/snippets/repo_share_form.html:26 msgid "Read-Only" msgstr "Nur Lesen" @@ -800,33 +874,33 @@ msgstr "Nur Lesen" msgid "Email is required." msgstr "E-Mail ist erforderlich." -#: seahub/contacts/views.py:62 seahub/contacts/views.py:99 -#: seahub/group/views.py:806 +#: seahub/contacts/views.py:64 seahub/contacts/views.py:101 +#: seahub/group/views.py:796 #, python-format msgid "%s is not a valid email." msgstr "%s ist keine gültige E-Mail." -#: seahub/contacts/views.py:67 seahub/contacts/views.py:103 +#: seahub/contacts/views.py:69 seahub/contacts/views.py:105 #, python-format msgid "%s is already in your contacts." msgstr "%s ist bereits in Ihren Kontakten." -#: seahub/contacts/views.py:76 seahub/contacts/views.py:111 +#: seahub/contacts/views.py:78 seahub/contacts/views.py:113 #, python-format msgid "Successfully added %s to contacts." msgstr "%s erfolgreich zu den Kontakten hinzugefügt." -#: seahub/contacts/views.py:81 seahub/contacts/views.py:114 +#: seahub/contacts/views.py:83 seahub/contacts/views.py:116 #, python-format msgid "Failed to add %s to contacts." msgstr "Hinzufügen des Kontakts %s fehlgeschlagen." -#: seahub/contacts/views.py:136 +#: seahub/contacts/views.py:138 #, python-format msgid "Successfully edited %s." msgstr "%s erfolgreich bearbeitet." -#: seahub/contacts/views.py:149 +#: seahub/contacts/views.py:151 #, python-format msgid "Successfully Deleted %s" msgstr "%s erfolgreich gelöscht" @@ -851,10 +925,10 @@ msgstr "E-Mail " #: seahub/contacts/templates/contacts/contact_list.html:18 #: seahub/group/templates/group/group_info.html:21 #: seahub/group/templates/group/group_info_for_pub.html:13 -#: seahub/group/templates/group/group_wiki.html:20 -#: seahub/group/templates/group/group_wiki.html:54 +#: seahub/group/templates/group/group_wiki.html:46 +#: seahub/group/templates/group/group_wiki.html:91 #: seahub/group/templates/group/group_wiki_pages.html:30 -#: seahub/message/templates/message/all_msg_list.html:21 +#: seahub/message/templates/message/all_msg_list.html:22 #: seahub/share/templates/share/links.html:20 #: seahub/share/templates/share/links.html:56 #: seahub/share/templates/share/list_priv_shared_folders.html:15 @@ -862,45 +936,46 @@ msgstr "E-Mail " #: seahub/share/templates/share/priv_shared_files.html:53 #: seahub/share/templates/share/repos.html:15 #: seahub/share/templates/share/user_share_list.html:33 -#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52 +#: seahub/templates/my_group_repos.html:8 +#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16 +#: seahub/templates/repo_history_view.html:52 #: seahub/templates/repo_recycle_view.html:53 -#: seahub/templates/repo_settings.html:15 -#: seahub/templates/view_shared_dir.html:32 -#: seahub/templates/registration/registration_form.html:12 +#: seahub/templates/repo_settings.html:17 +#: seahub/templates/view_shared_dir.html:27 +#: seahub/templates/registration/registration_form.html:13 +#: seahub/templates/snippets/my_group_repos.html:8 #: seahub/templates/snippets/my_owned_repos.html:20 #: seahub/templates/snippets/my_owned_repos.html:67 -#: seahub/templates/snippets/my_owned_repos.html:114 -#: seahub/templates/snippets/my_owned_repos.html:168 -#: seahub/templates/snippets/my_owned_repos.html:217 +#: seahub/templates/snippets/my_owned_repos.html:121 +#: seahub/templates/snippets/my_shared_repos.html:6 #: seahub/templates/snippets/repo_create_form.html:4 -#: seahub/templates/snippets/repo_dir_data.html:38 +#: seahub/templates/snippets/repo_dir_data.html:40 #: seahub/templates/sysadmin/repoadmin_table.html:4 -#: seahub/templates/sysadmin/sys_group_admin.html:12 -#: seahub/templates/sysadmin/sys_list_system.html:20 +#: seahub/templates/sysadmin/sys_group_admin.html:13 +#: seahub/templates/sysadmin/sys_list_system.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:11 -#: seahub/templates/sysadmin/sys_publink_admin.html:10 -#: seahub/templates/sysadmin/sys_repo_search.html:9 -#: seahub/templates/sysadmin/userinfo.html:71 -#: seahub/templates/sysadmin/userinfo.html:97 -#: seahub/templates/wiki/personal_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:49 +#: seahub/templates/sysadmin/sys_publink_admin.html:12 +#: seahub/templates/sysadmin/sys_repo_search.html:11 +#: seahub/templates/sysadmin/userinfo.html:65 +#: seahub/templates/sysadmin/userinfo.html:91 +#: seahub/templates/wiki/personal_wiki.html:41 +#: seahub/templates/wiki/personal_wiki.html:82 #: seahub/templates/wiki/personal_wiki_pages.html:28 msgid "Name" msgstr "Name" #: seahub/contacts/templates/contacts/contact_list.html:19 -#: seahub/templates/registration/registration_form.html:28 +#: seahub/templates/registration/registration_form.html:29 msgid "Note" msgstr "Anmerkung" #: seahub/contacts/templates/contacts/contact_list.html:20 #: seahub/group/templates/group/group_info.html:25 #: seahub/group/templates/group/group_info_for_pub.html:17 -#: seahub/group/templates/group/group_manage.html:22 +#: seahub/group/templates/group/group_manage.html:25 #: seahub/group/templates/group/group_manage.html:49 #: seahub/group/templates/group/group_manage.html:79 -#: seahub/notifications/templates/notifications/notification_list.html:7 -#: seahub/notifications/templates/notifications/notification_list.html:26 +#: seahub/notifications/templates/notifications/notification_list.html:21 #: seahub/share/templates/share/links.html:23 #: seahub/share/templates/share/links.html:59 #: seahub/share/templates/share/list_priv_shared_folders.html:19 @@ -909,56 +984,64 @@ msgstr "Anmerkung" #: seahub/share/templates/share/repos.html:19 #: seahub/share/templates/share/user_share_list.html:36 #: seahub/templates/client_mgmt.html:17 -#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17 +#: seahub/templates/file_revisions.html:28 +#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20 #: seahub/templates/repo_recycle_view.html:56 #: seahub/templates/repo_view_snapshot.html:18 -#: seahub/templates/view_shared_dir.html:34 +#: seahub/templates/view_shared_dir.html:29 #: seahub/templates/snippets/my_owned_repos.html:23 #: seahub/templates/snippets/my_owned_repos.html:70 -#: seahub/templates/snippets/my_owned_repos.html:118 -#: seahub/templates/snippets/my_owned_repos.html:220 -#: seahub/templates/snippets/repo_dir_data.html:41 +#: seahub/templates/snippets/my_owned_repos.html:124 +#: seahub/templates/snippets/my_shared_repos.html:10 +#: seahub/templates/snippets/repo_dir_data.html:43 #: seahub/templates/sysadmin/repoadmin_table.html:8 -#: seahub/templates/sysadmin/sys_group_admin.html:15 +#: seahub/templates/sysadmin/sys_group_admin.html:16 #: seahub/templates/sysadmin/sys_org_admin.html:15 -#: seahub/templates/sysadmin/sys_publink_admin.html:14 -#: seahub/templates/sysadmin/useradmin_table.html:8 -#: seahub/templates/sysadmin/userinfo.html:73 +#: seahub/templates/sysadmin/sys_publink_admin.html:16 +#: seahub/templates/sysadmin/useradmin_table.html:9 +#: seahub/templates/sysadmin/useradmin_table.html:74 +#: seahub/templates/sysadmin/userinfo.html:67 msgid "Operations" msgstr "Aktionen" #: seahub/contacts/templates/contacts/contact_list.html:29 +#: seahub/group/templates/group/group_wiki.html:22 #: seahub/share/templates/share/list_priv_shared_folders.html:29 #: seahub/share/templates/share/repos.html:33 #: seahub/templates/file_edit.html:80 #: seahub/templates/view_file_markdown.html:13 #: seahub/templates/view_file_sf.html:6 #: seahub/templates/view_file_text.html:24 -#: seahub/templates/sysadmin/useradmin_table.html:23 +#: seahub/templates/sysadmin/useradmin_table.html:24 +#: seahub/templates/sysadmin/useradmin_table.html:90 +#: seahub/templates/wiki/personal_wiki.html:21 msgid "Edit" msgstr "Bearbeiten" #: seahub/contacts/templates/contacts/contact_list.html:30 -#: seahub/group/templates/group/group_discuss.html:33 -#: seahub/group/templates/group/group_discuss.html:138 -#: seahub/group/templates/group/group_manage.html:31 +#: seahub/group/templates/group/group_discuss.html:45 +#: seahub/group/templates/group/group_discuss.html:152 +#: seahub/group/templates/group/group_manage.html:34 #: seahub/group/templates/group/group_manage.html:58 -#: seahub/notifications/templates/notifications/notification_list.html:38 -#: seahub/profile/templates/profile/set_profile.html:102 -#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267 +#: seahub/message/templates/message/user_msg.html:8 +#: seahub/message/templates/message/user_msg_list.html:52 +#: seahub/notifications/templates/notifications/notification_list.html:33 +#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264 #: seahub/templates/view_shared_upload_link.html:87 -#: seahub/templates/snippets/file_share_popup.html:34 -#: seahub/templates/snippets/file_share_popup.html:54 +#: seahub/templates/snippets/file_share_popup.html:55 +#: seahub/templates/snippets/file_share_popup.html:88 #: seahub/templates/snippets/my_owned_repos.html:46 #: seahub/templates/snippets/my_owned_repos.html:94 -#: seahub/templates/snippets/my_owned_repos.html:232 +#: seahub/templates/snippets/my_owned_repos.html:136 #: seahub/templates/snippets/repo_dirents.html:35 #: seahub/templates/snippets/repo_dirents.html:89 -#: seahub/templates/sysadmin/repoadmin_table.html:18 -#: seahub/templates/sysadmin/sys_group_admin.html:22 +#: seahub/templates/sysadmin/repoadmin_table.html:24 +#: seahub/templates/sysadmin/sys_group_admin.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:23 -#: seahub/templates/sysadmin/useradmin_table.html:46 -#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/useradmin_table.html:49 +#: seahub/templates/sysadmin/useradmin_table.html:115 +#: seahub/templates/sysadmin/userinfo.html:76 msgid "Delete" msgstr "Löschen" @@ -974,17 +1057,19 @@ msgstr "Fügen Sie Kontakte hinzu, um schneller Bibliotheken freigeben oder Link #: seahub/contacts/templates/contacts/contact_list.html:44 #: seahub/contacts/templates/contacts/contact_list.html:55 -#: seahub/group/templates/group/group_manage.html:21 +#: seahub/group/templates/group/group_manage.html:24 #: seahub/group/templates/group/group_manage.html:48 -#: seahub/templates/repo_settings.html:34 -#: seahub/templates/registration/login.html:8 -#: seahub/templates/registration/registration_form.html:16 +#: seahub/templates/repo_settings.html:37 +#: seahub/templates/registration/login.html:34 +#: seahub/templates/registration/registration_form.html:17 #: seahub/templates/snippets/add_to_contacts_form.html:2 #: seahub/templates/sysadmin/repo_transfer_form.html:5 -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18 -#: seahub/templates/sysadmin/sys_useradmin.html:24 -#: seahub/templates/sysadmin/user_search.html:9 -#: seahub/templates/sysadmin/useradmin_table.html:4 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22 +#: seahub/templates/sysadmin/sys_useradmin.html:29 +#: seahub/templates/sysadmin/user_search.html:11 +#: seahub/templates/sysadmin/useradmin_table.html:5 +#: seahub/templates/sysadmin/useradmin_table.html:70 +#: seahub/templates/sysadmin/userinfo.html:11 msgid "Email" msgstr "E-Mail" @@ -1009,8 +1094,8 @@ msgid "Delete Contact" msgstr "Kontakt löschen" #: seahub/contacts/templates/contacts/contact_list.html:115 -#: seahub/notifications/templates/notifications/notification_list.html:57 -#: seahub/templates/sysadmin/sys_group_admin.html:63 +#: seahub/notifications/templates/notifications/notification_list.html:52 +#: seahub/templates/sysadmin/sys_group_admin.html:64 #: seahub/templates/sysadmin/sys_org_admin.html:63 #: seahub/templates/sysadmin/useradmin_js.html:4 #, python-format @@ -1086,400 +1171,415 @@ msgstr "Bestätigungsnachricht ist zu lang (maximal 255 Zeichen)" msgid "\"%s\" is not a valid name" msgstr "Name \"%s\" ist ungültig" -#: seahub/group/views.py:145 +#: seahub/group/views.py:140 #, python-format msgid "" "You can only create %d groups.Upgrade " "account." msgstr "Sie können nur %d Gruppen erzeugen. Konto-Upgrade." -#: seahub/group/views.py:160 +#: seahub/group/views.py:155 msgid "There is already a group with that name." msgstr "Es existiert bereits eine Gruppe mit diesem Namen." -#: seahub/group/views.py:264 +#: seahub/group/views.py:259 #, python-format msgid "Successfully renamed group to \"%s\"." msgstr "Gruppe \"%s\" erfolgreich umbenannt." -#: seahub/group/views.py:266 +#: seahub/group/views.py:261 msgid "" "Failed to rename group, group name can only contain letters, numbers or " "underscore" msgstr "Gruppe umbenennen fehlgeschlagen, Gruppennamen dürfen nur Buchstaben, Zahlen und Unterstriche enthalten" -#: seahub/group/views.py:285 +#: seahub/group/views.py:280 #, python-format msgid "Email %s is not valid." msgstr "Email %s ist ungültig." -#: seahub/group/views.py:314 seahub/group/views.py:336 +#: seahub/group/views.py:309 seahub/group/views.py:331 msgid "Only administrators can make the group public" msgstr "Nur Administratoren können diese Gruppe zu einer öffentlichen Gruppe machen." -#: seahub/group/views.py:382 +#: seahub/group/views.py:377 seahub/message/views.py:121 msgid "The message doesn't exist" msgstr "Diese Nachricht existiert nicht" -#: seahub/group/views.py:392 +#: seahub/group/views.py:387 seahub/message/views.py:130 msgid "You don't have the permission." msgstr "Sie haben nicht die benötigte Berechtigung." -#: seahub/group/views.py:630 seahub/group/views.py:781 +#: seahub/group/views.py:626 seahub/group/views.py:771 #, python-format msgid "" "You can only invite %d members.Upgrade " "account." msgstr "Sie können nur %d Mitglieder einladen. Konto-Upgrade." -#: seahub/group/views.py:655 -msgid "Your friend added you to a group at Seafile." -msgstr "Jemand hat Sie einer Gruppe bei Seafile hinzugefügt" +#: seahub/group/views.py:645 +#, python-format +msgid "You are invited to join a group on %s" +msgstr "" -#: seahub/group/views.py:681 +#: seahub/group/views.py:671 #, python-format msgid "Failed to add, %s is not registerd." msgstr "Hinzufügen fehlgeschlagen, %s ist nicht registriert." -#: seahub/group/views.py:695 +#: seahub/group/views.py:685 #, python-format msgid "Successfully added. An email has been sent." msgid_plural "Successfully added. %(count)s emails have been sent." msgstr[0] "Erfolgreich hinzugefügt. Eine Email wurde verschickt." msgstr[1] "Erfolgreich hinzugefügt. %(count)s E-Mails wurde verschickt." -#: seahub/group/views.py:703 +#: seahub/group/views.py:693 msgid "Successfully added." msgstr "Erfolgreich hinzugefügt." -#: seahub/group/views.py:752 +#: seahub/group/views.py:742 #, python-format msgid "Failed to add, %s is not a valid email." msgstr "Hinzufügen fehlgeschlagen, %s ist keine gültige Email." -#: seahub/group/views.py:762 +#: seahub/group/views.py:752 #, python-format msgid "Failed to add, %s is not registrated." msgstr "Hinzufügen fehlgeschlagen, %s ist nicht registriert." -#: seahub/group/views.py:794 seahub/group/views.py:811 -#: seahub/group/views.py:838 +#: seahub/group/views.py:784 seahub/group/views.py:801 +#: seahub/group/views.py:828 msgid "Operation succeeded." msgstr "Aktion erfolgreich." -#: seahub/group/views.py:840 +#: seahub/group/views.py:830 #, python-format msgid "Failed：%s" msgstr "Fehlgeschlagen: %s" -#: seahub/group/views.py:865 +#: seahub/group/views.py:855 msgid "Failed to unshare: the group doesn't exist." msgstr "Freigeben konnte nicht rückgängig gemacht werden: Die Gruppe existiert nicht." -#: seahub/group/views.py:870 +#: seahub/group/views.py:860 msgid "" "Operation failed: only administrators and the owner of the library can " "unshare it." msgstr "Operation fehlgeschlagen: Nur Administratoren und der Besitzer können das Freigeben einer Bibliothek rückgängig machen" -#: seahub/group/views.py:873 +#: seahub/group/views.py:863 msgid "Failed to unshare: internal error." msgstr "Freigeben konnte nicht rückgängig gemacht werden: Interner Fehler" -#: seahub/group/views.py:902 +#: seahub/group/views.py:892 msgid "Error: wrong group id" msgstr "Fehler: falsche Gruppen-ID" -#: seahub/group/views.py:907 +#: seahub/group/views.py:897 msgid "Error: the group does not exist." msgstr "Fehler: Die Gruppe existiert nicht." -#: seahub/group/views.py:939 +#: seahub/group/views.py:929 #, python-format msgid "Successfully posted to %(groups)s." msgstr "%(groups)s erfolgreich bearbeitet." -#: seahub/group/views.py:942 +#: seahub/group/views.py:932 #, python-format msgid "Error: you are not in group %s." msgstr "Fehler: Sie sind nicht in Gruppe %s." -#: seahub/group/views.py:954 +#: seahub/group/views.py:944 msgid "Error: the library does not exist." msgstr "Fehler: Die Bibliothek existiert nicht." -#: seahub/group/views.py:957 +#: seahub/group/views.py:947 msgid "Error: no path." msgstr "Fehler: Pfad nicht vorhanden." -#: seahub/group/views.py:995 +#: seahub/group/views.py:985 msgid "Failed to create: the group does not exist." msgstr "Erstellen fehlgeschlagen: Die Gruppe existiert nicht." -#: seahub/group/views.py:999 +#: seahub/group/views.py:989 msgid "Failed to create: you are not in the group." msgstr "Erstellen fehlgeschlagen: Sie sind nicht in der Gruppe." -#: seahub/group/views.py:1025 seahub/group/views.py:1056 -#: seahub/group/views.py:1436 seahub/views/wiki.py:127 +#: seahub/group/views.py:1015 seahub/group/views.py:1046 +#: seahub/group/views.py:1460 seahub/views/wiki.py:146 msgid "Failed to create" msgstr "Erstellen fehlgeschlagen" -#: seahub/group/views.py:1039 seahub/group/views.py:1069 -#: seahub/group/views.py:1445 +#: seahub/group/views.py:1029 seahub/group/views.py:1059 +#: seahub/group/views.py:1469 msgid "Failed to create: internal error." msgstr "Erstellen fehlgeschlagen: Interner Fehler." -#: seahub/group/views.py:1093 +#: seahub/group/views.py:1083 msgid "You are already in the group." msgstr "Sie sind bereits in der Gruppe." -#: seahub/group/views.py:1108 +#: seahub/group/views.py:1098 msgid "Sent successfully, the group admin will handle it." msgstr "Erfolgreicht versandt, der Gruppenadministrator wird die Nachricht behandeln." -#: seahub/group/views.py:1269 seahub/views/__init__.py:575 -#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596 -#: seahub/views/file.py:686 +#: seahub/group/views.py:1174 +msgid "Discussion is required." +msgstr "" + +#: seahub/group/views.py:1277 seahub/views/__init__.py:659 +#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618 +#: seahub/views/file.py:710 msgid "File does not exist" msgstr "Die Datei existiert nicht" -#: seahub/group/views.py:1305 +#: seahub/group/views.py:1313 msgid "Successfully enable \"Wiki\"." msgstr "\"Wiki\" wurde erfolgreich aktiviert\"" -#: seahub/group/views.py:1310 +#: seahub/group/views.py:1318 msgid "Successfully disable \"Wiki\"." msgstr "\"Wiki\" wurde erfolgreich deaktiviert\"" -#: seahub/group/views.py:1346 seahub/group/views.py:1483 -#: seahub/views/wiki.py:54 seahub/views/wiki.py:161 +#: seahub/group/views.py:1357 seahub/group/views.py:1531 +#: seahub/views/wiki.py:60 seahub/views/wiki.py:202 msgid "Failed to create wiki page. Please retry later." msgstr "Wikiseite konnte nicht erstellt werden, bitte versuchen Sie es später nochmals." -#: seahub/group/views.py:1388 seahub/views/__init__.py:569 -#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448 -#: seahub/views/wiki.py:90 +#: seahub/group/views.py:1412 seahub/views/__init__.py:653 +#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532 +#: seahub/views/wiki.py:109 msgid "Internal Server Error" msgstr "Interner Serverfehler" -#: seahub/group/views.py:1390 seahub/views/wiki.py:92 +#: seahub/group/views.py:1414 seahub/views/wiki.py:111 msgid "Wiki does not exists." msgstr "Das Wiki existiert nicht." -#: seahub/group/views.py:1452 seahub/views/wiki.py:134 +#: seahub/group/views.py:1476 seahub/group/views.py:1501 +#: seahub/views/wiki.py:153 seahub/views/wiki.py:176 msgid "Failed to create home page. Please retry later" msgstr "Anlegen der Seite fehlgeschlagen, bitte versuchen Sie es später nochmals." -#: seahub/group/views.py:1473 seahub/group/views.py:1499 -#: seahub/group/views.py:1517 seahub/views/wiki.py:151 -#: seahub/views/wiki.py:174 seahub/views/wiki.py:189 +#: seahub/group/views.py:1492 seahub/views/wiki.py:167 +msgid "Failed to set wiki library." +msgstr "" + +#: seahub/group/views.py:1521 seahub/group/views.py:1547 +#: seahub/group/views.py:1565 seahub/views/wiki.py:192 +#: seahub/views/wiki.py:215 seahub/views/wiki.py:230 msgid "Wiki is not found." msgstr "Wiki nicht gefunden." -#: seahub/group/views.py:1480 seahub/views/wiki.py:158 +#: seahub/group/views.py:1528 seahub/views/wiki.py:199 #, python-format msgid "Page \"%s\" already exists." msgstr "Seite \"%s\" existiert schon." -#: seahub/group/templates/group/add_member_email.html:2 +#: seahub/group/views.py:1570 #, python-format -msgid "" -"%(email)s invite you to join group %(group.group_name)s. Please go to the " -"following page and sign up:" -msgstr "%(email)s hat sie eingeladen der Gruppe %(group.group_name)s beizutreten. Bitte besuchen Sie die folgende Seite und melden Sie sich an." +msgid "Successfully deleted \"%s\"." +msgstr "\"%s\" erfolgreich gelöscht" -#: seahub/group/templates/group/add_member_email.html:5 -#: seahub/group/templates/group/group_join_email.html:6 -#: seahub/templates/shared_link_email.html:7 -#: seahub/templates/shared_upload_link_email.html:7 -#: seahub/templates/registration/password_reset_email.html:10 -#: seahub/templates/sysadmin/user_add_email.html:14 -#: seahub/templates/sysadmin/user_reset_email.html:6 -msgid "Thanks for using our site!" -msgstr "Danke, dass Sie unsere Seite verwenden! " - -#: seahub/group/templates/group/add_member_email.html:7 -#: seahub/group/templates/group/group_join_email.html:8 -#: seahub/templates/shared_link_email.html:9 -#: seahub/templates/shared_upload_link_email.html:9 -#: seahub/templates/registration/password_reset_email.html:12 -#: seahub/templates/sysadmin/user_add_email.html:16 -#: seahub/templates/sysadmin/user_reset_email.html:8 +#: seahub/group/views.py:1572 #, python-format -msgid "The %(site_name)s team" -msgstr "Das %(site_name)s Team" +msgid "Failed to delete \"%s\". Please retry later." +msgstr "" + +#: seahub/group/templates/group/add_member_email.html:8 +msgid "Hi, " +msgstr "" + +#: seahub/group/templates/group/add_member_email.html:11 +#, python-format +msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: " +msgstr "" #: seahub/group/templates/group/discussion_list.html:18 -#: seahub/group/templates/group/group_discuss.html:72 -#: seahub/group/templates/group/group_discuss.html:148 -#: seahub/group/templates/group/new_msg_reply.html:46 +#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:161 +#: seahub/group/templates/group/new_msg_reply.html:48 msgid "Hide replies" msgstr "Beiträge verbergen" #: seahub/group/templates/group/discussion_list.html:31 -#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:100 #: seahub/group/templates/group/group_reply_list.html:11 -#: seahub/group/templates/group/new_msg_reply.html:56 +#: seahub/group/templates/group/new_msg_reply.html:58 msgid "Reply" msgstr "Antworten" #: seahub/group/templates/group/discussion_list.html:40 -#: seahub/group/templates/group/group_discuss.html:96 -#: seahub/group/templates/group/group_discuss.html:153 -#: seahub/group/templates/group/new_msg_reply.html:63 +#: seahub/group/templates/group/group_discuss.html:110 +#: seahub/group/templates/group/group_discuss.html:166 +#: seahub/group/templates/group/new_msg_reply.html:65 msgid "Add a reply..." msgstr "Antworten..." #: seahub/group/templates/group/discussion_list.html:41 -#: seahub/group/templates/group/group_discuss.html:97 -#: seahub/group/templates/group/group_discuss.html:154 -#: seahub/group/templates/group/new_msg_reply.html:64 +#: seahub/group/templates/group/group_discuss.html:111 +#: seahub/group/templates/group/group_discuss.html:167 +#: seahub/group/templates/group/new_msg_reply.html:66 msgid "It can not be blank and should be no more than 2048 characters." msgstr "Darf nicht leer sein und sollte nicht mehr als 2048 Zeichen haben." #: seahub/group/templates/group/discussion_list.html:43 -#: seahub/group/templates/group/group_discuss.html:17 -#: seahub/group/templates/group/group_discuss.html:99 -#: seahub/group/templates/group/group_discuss.html:156 +#: seahub/group/templates/group/group_discuss.html:18 +#: seahub/group/templates/group/group_discuss.html:30 +#: seahub/group/templates/group/group_discuss.html:113 +#: seahub/group/templates/group/group_discuss.html:169 #: seahub/group/templates/group/group_info.html:131 -#: seahub/group/templates/group/new_msg_reply.html:66 -#: seahub/message/templates/message/all_msg_list.html:51 -#: seahub/message/templates/message/user_msg_list.html:21 -#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/group/templates/group/group_wiki.html:62 +#: seahub/group/templates/group/new_msg_reply.html:68 +#: seahub/message/templates/message/all_msg_list.html:52 +#: seahub/message/templates/message/user_msg_list.html:22 +#: seahub/message/templates/message/user_msg_list.html:34 +#: seahub/profile/templates/profile/set_profile.html:124 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99 -#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153 -#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198 -#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266 -#: seahub/templates/shared_file_view.html:51 +#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144 +#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189 +#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205 +#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51 #: seahub/templates/view_shared_upload_link.html:86 -#: seahub/templates/snippets/file_share_popup.html:42 -#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:63 +#: seahub/templates/snippets/file_share_popup.html:96 #: seahub/templates/sysadmin/repo_transfer_form.html:9 +#: seahub/templates/wiki/personal_wiki.html:57 msgid "Cancel" msgstr "Abbrechen" -#: seahub/group/templates/group/group_base.html:13 -msgid "This group is public." -msgstr "Diese Gruppe ist öffentlich." - #: seahub/group/templates/group/group_base.html:16 -#: seahub/group/templates/group/group_base.html:50 -#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38 -#: seahub/templates/snippets/modules_toggle_tab.html:2 +#: seahub/group/templates/group/group_base.html:48 +#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39 msgid "Enable Modules" msgstr "Module aktivieren" -#: seahub/group/templates/group/group_base.html:19 -msgid "Quit" -msgstr "Beenden" +#: seahub/group/templates/group/group_base.html:18 +msgid "This group is public." +msgstr "Diese Gruppe ist öffentlich." -#: seahub/group/templates/group/group_base.html:23 +#: seahub/group/templates/group/group_base.html:21 #: seahub/group/templates/group/group_info.html:11 #: seahub/group/templates/group/group_info_for_pub.html:8 #: seahub/group/templates/group/groups_right_panel.html:16 #: seahub/share/templates/share/repos.html:10 -#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12 -#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4 -#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12 -#: seahub/templates/pubrepo.html:8 +#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29 +#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11 +#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9 +#: seahub/templates/sysadmin/base.html:9 msgid "Libraries" msgstr "Bibliotheken" -#: seahub/group/templates/group/group_base.html:29 -#: seahub/group/templates/group/group_base.html:56 +#: seahub/group/templates/group/group_base.html:27 +#: seahub/group/templates/group/group_base.html:55 #: seahub/group/templates/group/groups_right_panel.html:19 msgid "Wiki" msgstr "Wiki" -#: seahub/group/templates/group/group_base.html:34 -#: seahub/templates/home_base.html:30 +#: seahub/group/templates/group/group_base.html:32 +#: seahub/templates/home_base.html:31 msgid "Files" msgstr "Dateien" -#: seahub/group/templates/group/group_base.html:38 -#: seahub/group/templates/group/group_manage.html:9 -#: seahub/group/templates/group/group_members.html:7 +#: seahub/group/templates/group/group_base.html:36 +#: seahub/group/templates/group/group_manage.html:10 +#: seahub/group/templates/group/group_members.html:8 +#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16 msgid "Members" msgstr "Mitglieder" -#: seahub/group/templates/group/group_base.html:42 +#: seahub/group/templates/group/group_base.html:40 +#: seahub/templates/sysadmin/sys_useradmin.html:16 msgid "Admin" msgstr "Administrator" -#: seahub/group/templates/group/group_base.html:73 -msgid "Quit Group" -msgstr "Gruppe verlassen" - -#: seahub/group/templates/group/group_base.html:74 -msgid "Are you sure you want to quit this group?" -msgstr "Sind Sie sicher, dass Sie diese Gruppe verlassen möchten?" - #: seahub/group/templates/group/group_discuss.html:12 msgid "Add a discussion..." msgstr "Beginne eine Diskussion..." -#: seahub/group/templates/group/group_discuss.html:21 +#: seahub/group/templates/group/group_discuss.html:19 +#: seahub/message/templates/message/all_msg_list.html:46 +#: seahub/message/templates/message/user_msg_list.html:23 +msgid "Add files" +msgstr "Dateien hinzufügen" + +#: seahub/group/templates/group/group_discuss.html:25 +#: seahub/message/templates/message/user_msg_list.html:29 +msgid "Choose a file or files:" +msgstr "Bitte eine oder mehrere Dateien auswählen" + +#: seahub/group/templates/group/group_discuss.html:33 msgid "After login, you can post discussions and add replies." msgstr "Nach dem Anmelden können Sie an Diskussionen teilhaben und Nachrichten versenden." -#: seahub/group/templates/group/group_discuss.html:112 -#: seahub/message/templates/message/user_msg_list.html:65 -#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52 +#: seahub/group/templates/group/group_discuss.html:126 +#: seahub/message/templates/message/user_msg_list.html:80 +#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54 #: seahub/templates/repo_view_snapshot.html:51 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:29 -#: seahub/templates/sysadmin/sys_publink_admin.html:30 -#: seahub/templates/sysadmin/sys_repo_admin.html:23 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:30 +#: seahub/templates/sysadmin/sys_publink_admin.html:31 +#: seahub/templates/sysadmin/sys_repo_admin.html:25 +#: seahub/templates/sysadmin/sys_trafficadmin.html:41 #: seahub/templates/sysadmin/useradmin_paginator.html:4 msgid "Previous" msgstr "Vorherige" -#: seahub/group/templates/group/group_discuss.html:122 -#: seahub/message/templates/message/user_msg_list.html:75 -#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55 +#: seahub/group/templates/group/group_discuss.html:136 +#: seahub/message/templates/message/user_msg_list.html:90 +#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57 #: seahub/templates/repo_view_snapshot.html:54 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:32 -#: seahub/templates/sysadmin/sys_publink_admin.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:26 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:33 +#: seahub/templates/sysadmin/sys_publink_admin.html:34 +#: seahub/templates/sysadmin/sys_repo_admin.html:28 +#: seahub/templates/sysadmin/sys_trafficadmin.html:44 #: seahub/templates/sysadmin/useradmin_paginator.html:7 msgid "Next" msgstr "Nächste" -#: seahub/group/templates/group/group_discuss.html:128 -#: seahub/message/templates/message/user_msg_list.html:81 +#: seahub/group/templates/group/group_discuss.html:142 +#: seahub/message/templates/message/user_msg_list.html:96 msgid "↑Top" msgstr "↑Nach oben" -#: seahub/group/templates/group/group_discuss.html:248 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 msgid "Really want to delete this discussion?" msgstr "Sind Sie sicher, dass Sie diese Diskussion löschen möchten?" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55 +#: seahub/templates/devices.html:45 #: seahub/templates/snippets/repo_del_popup.html:4 msgid "Yes" msgstr "Ja" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56 +#: seahub/templates/devices.html:46 #: seahub/templates/snippets/repo_del_popup.html:5 msgid "No" msgstr "Nein" -#: seahub/group/templates/group/group_discuss.html:263 +#: seahub/group/templates/group/group_discuss.html:276 +#: seahub/message/templates/message/user_msg_list.html:198 msgid "Successfully deleted" msgstr "Erfolgreicht gelöscht" -#: seahub/group/templates/group/group_discuss.html:265 +#: seahub/group/templates/group/group_discuss.html:278 +#: seahub/message/templates/message/user_msg_list.html:200 msgid "Failed to delete: " msgstr "Löschen fehlgeschlagen:" -#: seahub/group/templates/group/group_discuss.html:269 -#: seahub/templates/repo.html:771 +#: seahub/group/templates/group/group_discuss.html:282 +#: seahub/message/templates/message/user_msg_list.html:204 +#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761 msgid "Failed." msgstr "Fehlgeschlagen." @@ -1488,6 +1588,7 @@ msgid "Recent Changes" msgstr "Letzte Änderungen" #: seahub/group/templates/group/group_info.html:14 +#: seahub/templates/pubrepo.html:10 #: seahub/templates/snippets/my_owned_repos.html:13 #: seahub/templates/snippets/repo_create_form.html:3 msgid "New Library" @@ -1496,77 +1597,58 @@ msgstr "Neue Bibliothek" #: seahub/group/templates/group/group_info.html:22 #: seahub/group/templates/group/group_info.html:76 #: seahub/group/templates/group/group_info_for_pub.html:14 -#: seahub/group/templates/group/group_wiki.html:22 +#: seahub/group/templates/group/group_wiki.html:48 #: seahub/share/templates/share/list_priv_shared_folders.html:18 #: seahub/share/templates/share/repos.html:18 #: seahub/share/templates/share/user_share_list.html:34 -#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23 -#: seahub/templates/repo_settings.html:17 +#: seahub/templates/my_group_repos.html:9 +#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17 +#: seahub/templates/repo_history.html:23 +#: seahub/templates/repo_settings.html:19 +#: seahub/templates/snippets/my_group_repos.html:9 #: seahub/templates/snippets/my_owned_repos.html:21 -#: seahub/templates/snippets/my_owned_repos.html:115 -#: seahub/templates/snippets/my_owned_repos.html:169 -#: seahub/templates/snippets/my_owned_repos.html:218 +#: seahub/templates/snippets/my_owned_repos.html:122 +#: seahub/templates/snippets/my_shared_repos.html:7 #: seahub/templates/snippets/repo_create_form.html:6 #: seahub/templates/sysadmin/repoadmin_table.html:7 -#: seahub/templates/sysadmin/sys_list_system.html:22 -#: seahub/templates/sysadmin/userinfo.html:72 -#: seahub/templates/sysadmin/userinfo.html:99 -#: seahub/templates/wiki/personal_wiki.html:21 +#: seahub/templates/sysadmin/sys_list_system.html:25 +#: seahub/templates/sysadmin/userinfo.html:66 +#: seahub/templates/sysadmin/userinfo.html:93 +#: seahub/templates/wiki/personal_wiki.html:43 msgid "Description" msgstr "Beschreibung" #: seahub/group/templates/group/group_info.html:23 #: seahub/group/templates/group/group_info_for_pub.html:15 #: seahub/share/templates/share/user_share_list.html:35 -#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15 +#: seahub/templates/my_group_repos.html:10 +#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18 +#: seahub/templates/starred.html:15 +#: seahub/templates/snippets/my_group_repos.html:10 #: seahub/templates/snippets/my_owned_repos.html:22 #: seahub/templates/snippets/my_owned_repos.html:69 -#: seahub/templates/snippets/my_owned_repos.html:116 -#: seahub/templates/snippets/my_owned_repos.html:170 -#: seahub/templates/snippets/my_owned_repos.html:219 -#: seahub/templates/snippets/repo_dir_data.html:40 +#: seahub/templates/snippets/my_owned_repos.html:123 +#: seahub/templates/snippets/my_shared_repos.html:8 +#: seahub/templates/snippets/repo_dir_data.html:42 msgid "Last Update" msgstr "Letzte Aktualisierung" #: seahub/group/templates/group/group_info.html:24 #: seahub/group/templates/group/group_info_for_pub.html:16 -#: seahub/templates/snippets/my_owned_repos.html:117 -#: seahub/templates/snippets/my_owned_repos.html:171 +#: seahub/templates/my_group_repos.html:11 +#: seahub/templates/my_shared_repos.html:10 +#: seahub/templates/snippets/my_group_repos.html:11 +#: seahub/templates/snippets/my_shared_repos.html:9 msgid "Shared By" msgstr "Freigegeben von" -#: seahub/group/templates/group/group_info.html:31 -#: seahub/group/templates/group/group_info.html:34 -#: seahub/group/templates/group/group_info.html:36 -#: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/templates/share/list_priv_shared_folders.html:23 -#: seahub/share/templates/share/repos.html:24 -#: seahub/share/templates/share/repos.html:26 -#: seahub/share/templates/share/user_share_list.html:42 -#: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/snippets/my_owned_repos.html:29 -#: seahub/templates/snippets/my_owned_repos.html:31 -#: seahub/templates/snippets/my_owned_repos.html:75 -#: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:190 -#: seahub/templates/snippets/my_owned_repos.html:223 -#: seahub/templates/sysadmin/userinfo.html:78 -msgid "directory icon" -msgstr "Ordnersymbol" - #: seahub/group/templates/group/group_info.html:52 #: seahub/share/templates/share/user_share_list.html:56 -#: seahub/templates/pubrepo.html:38 +#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41 #: seahub/templates/snippets/my_owned_repos.html:43 #: seahub/templates/snippets/my_owned_repos.html:89 -#: seahub/templates/snippets/my_owned_repos.html:144 -#: seahub/templates/snippets/my_owned_repos.html:229 +#: seahub/templates/snippets/my_owned_repos.html:133 +#: seahub/templates/snippets/my_shared_repos.html:36 msgid "Download and Sync" msgstr "Zum Synchronisieren herunterladen" @@ -1582,7 +1664,7 @@ msgstr "Zum Synchronisieren herunterladen" #: seahub/share/templates/share/repos.html:54 #: seahub/share/templates/share/repos.html:56 #: seahub/share/templates/share/user_share_list.html:61 -#: seahub/templates/pubrepo.html:41 +#: seahub/templates/pubrepo.html:44 msgid "Unshare" msgstr "Freigabe aufheben" @@ -1619,15 +1701,16 @@ msgid "Modified at" msgstr "Bearbeitet am" #: seahub/group/templates/group/group_info.html:78 +#: seahub/templates/file_revisions.html:26 #: seahub/templates/repo_history.html:22 msgid "Modifier" msgstr "Bearbeiter" #: seahub/group/templates/group/group_info.html:98 #: seahub/group/templates/group/group_info.html:100 -#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164 -#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170 -#: seahub/templates/repo_history.html:44 +#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155 +#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161 +#: seahub/templates/repo_history.html:45 #: seahub/templates/repo_view_snapshot.html:38 #: seahub/templates/snippets/current_commit.html:4 #: seahub/templates/snippets/events_body.html:18 @@ -1636,23 +1719,23 @@ msgid "Details" msgstr "Details" #: seahub/group/templates/group/group_info.html:107 -#: seahub/group/templates/group/new_msg_reply.html:74 -#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35 +#: seahub/group/templates/group/new_msg_reply.html:76 +#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36 #: seahub/templates/repo_view_snapshot.html:29 -#: seahub/templates/sysadmin/sys_list_orphan.html:20 -#: seahub/templates/sysadmin/sys_list_system.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:49 -#: seahub/templates/sysadmin/userinfo.html:88 -#: seahub/templates/sysadmin/userinfo.html:112 +#: seahub/templates/sysadmin/sys_list_orphan.html:23 +#: seahub/templates/sysadmin/sys_list_system.html:36 +#: seahub/templates/sysadmin/sys_repo_admin.html:51 +#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/userinfo.html:106 msgid "None" msgstr "Keine" #: seahub/group/templates/group/group_info.html:112 -#: seahub/templates/file_revisions.html:45 -#: seahub/templates/repo_history.html:38 +#: seahub/templates/file_revisions.html:49 +#: seahub/templates/repo_history.html:39 #: seahub/templates/repo_history_view.html:21 #: seahub/templates/repo_view_snapshot.html:32 -#: seahub/templates/snippets/current_commit.html:15 +#: seahub/templates/snippets/current_commit.html:11 msgid "Unknown" msgstr "Unbekannt" @@ -1671,15 +1754,43 @@ msgstr "Passwort: " msgid "The password will be kept in the server for only 1 hour." msgstr "Das Passwort wird nur für eine Stunde auf dem Server behalten." -#: seahub/group/templates/group/group_info.html:147 +#: seahub/group/templates/group/group_info.html:146 msgid "Unshare Library" msgstr "Freigabe aufheben" -#: seahub/group/templates/group/group_info.html:148 +#: seahub/group/templates/group/group_info.html:147 #, python-format msgid "Are you sure you want to unshare %s ?" msgstr "Sind Sie sicher, dass Sie die Freigabe von %s aufheben wollen?" +#: seahub/group/templates/group/group_info_for_pub.html:24 +#: seahub/group/templates/group/group_info_for_pub.html:26 +#: seahub/share/templates/share/list_priv_shared_folders.html:23 +#: seahub/share/templates/share/repos.html:24 +#: seahub/share/templates/share/repos.html:26 +#: seahub/share/templates/share/user_share_list.html:42 +#: seahub/share/templates/share/user_share_list.html:44 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 +#: seahub/templates/my_shared_repos.html:23 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_owned_repos.html:29 +#: seahub/templates/snippets/my_owned_repos.html:31 +#: seahub/templates/snippets/my_owned_repos.html:75 +#: seahub/templates/snippets/my_owned_repos.html:77 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 +#: seahub/templates/snippets/my_shared_repos.html:22 +#: seahub/templates/sysadmin/userinfo.html:72 +msgid "directory icon" +msgstr "Ordnersymbol" + #: seahub/group/templates/group/group_info_for_pub.html:46 msgid "No public library is in this group" msgstr "Keine öffentliche Bibliothek für diese Gruppe verfügbar." @@ -1696,14 +1807,25 @@ msgid "" "message: " msgstr "%(user)s wollen der Gruppe \"%(group_name)s\" beitreten. Hier ist die Bestätigungsnachricht: " -#: seahub/group/templates/group/group_manage.html:10 +#: seahub/group/templates/group/group_join_email.html:6 +#: seahub/templates/email_base.html:9 +msgid "Thanks for using our site!" +msgstr "Danke, dass Sie unsere Seite verwenden! " + +#: seahub/group/templates/group/group_join_email.html:8 +#: seahub/templates/email_base.html:13 +#, python-format +msgid "The %(site_name)s team" +msgstr "Das %(site_name)s Team" + +#: seahub/group/templates/group/group_manage.html:11 msgid "Admins" msgstr "Administratoren" -#: seahub/group/templates/group/group_manage.html:11 -#: seahub/profile/templates/profile/set_profile.html:22 -#: seahub/templates/repo.html:28 -#: seahub/templates/snippets/space_and_traffic.html:27 +#: seahub/group/templates/group/group_manage.html:12 +#: seahub/profile/templates/profile/set_profile.html:5 +#: seahub/profile/templates/profile/set_profile.html:23 +#: seahub/templates/base.html:68 seahub/templates/repo.html:29 msgid "Settings" msgstr "Einstellungen" @@ -1711,7 +1833,7 @@ msgstr "Einstellungen" msgid "Add Members" msgstr "Mitglieder hinzufügen" -#: seahub/group/templates/group/group_manage.html:42 +#: seahub/group/templates/group/group_manage.html:16 msgid "Add Admins" msgstr "Administratoren hinzufügen" @@ -1720,7 +1842,7 @@ msgid "Avatar" msgstr "Avatar:" #: seahub/group/templates/group/group_manage.html:73 -#: seahub/profile/templates/profile/set_profile.html:29 +#: seahub/profile/templates/profile/set_profile.html:30 msgid "Change" msgstr "Ändern" @@ -1739,7 +1861,7 @@ msgid "Make Public" msgstr "Veröffentlichen" #: seahub/group/templates/group/group_manage.html:87 -#: seahub/templates/sysadmin/repoadmin_table.html:19 +#: seahub/templates/sysadmin/repoadmin_table.html:25 msgid "Transfer" msgstr "Übertragen" @@ -1763,29 +1885,41 @@ msgstr "Tipp: Die E-Mail-Adresse sollte bereits registriert sein." msgid "Rename Group To" msgstr "Gruppe umbenennen zu" -#: seahub/group/templates/group/group_manage.html:121 +#: seahub/group/templates/group/group_manage.html:140 msgid "Dismiss Group" msgstr "Gruppe löschen" -#: seahub/group/templates/group/group_manage.html:122 +#: seahub/group/templates/group/group_manage.html:141 msgid "Really want to dismiss this group?" msgstr "Sind Sie sicher dass Sie die Gruppe löschen möchten?" -#: seahub/group/templates/group/group_manage.html:125 +#: seahub/group/templates/group/group_manage.html:144 msgid "Delete Member" msgstr "Mitglied löschen" -#: seahub/group/templates/group/group_manage.html:126 +#: seahub/group/templates/group/group_manage.html:145 #, python-format msgid "Really want to delete %s ?" msgstr "Sind Sie sicher, dass Sie %s löschen möchten?" -#: seahub/group/templates/group/group_members.html:17 +#: seahub/group/templates/group/group_members.html:10 +msgid "Quit" +msgstr "Beenden" + +#: seahub/group/templates/group/group_members.html:22 #: seahub/profile/templates/profile/user_profile.html:28 -#: seahub/templates/pubuser.html:19 +#: seahub/templates/pubuser.html:27 msgid "Add to Contacts" msgstr "Zu Kontakten hinzufügen" +#: seahub/group/templates/group/group_members.html:35 +msgid "Quit Group" +msgstr "Gruppe verlassen" + +#: seahub/group/templates/group/group_members.html:36 +msgid "Are you sure you want to quit this group?" +msgstr "Sind Sie sicher, dass Sie diese Gruppe verlassen möchten?" + #: seahub/group/templates/group/group_pubinfo.html:9 msgid "Join Group" msgstr "Gruppe beitreten" @@ -1812,12 +1946,29 @@ msgstr "Mitglieder: " msgid "Verification Message" msgstr "Bestätigungsnachricht" -#: seahub/group/templates/group/group_wiki.html:12 +#: seahub/group/templates/group/group_wiki.html:13 +#: seahub/group/templates/group/group_wiki.html:20 +#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/templates/wiki/personal_wiki.html:20 +msgid "Wiki Index" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:14 +#: seahub/templates/wiki/personal_wiki.html:16 +msgid "No index now." +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:16 +#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17 +msgid "Create" +msgstr "Erstellen" + +#: seahub/group/templates/group/group_wiki.html:35 msgid "This group currently has no wiki" msgstr "Diese Gruppe hat derzeit kein Wiki." -#: seahub/group/templates/group/group_wiki.html:13 -#: seahub/templates/wiki/personal_wiki.html:14 +#: seahub/group/templates/group/group_wiki.html:36 +#: seahub/templates/wiki/personal_wiki.html:33 msgid "" "Seafile Wiki enables you to organize your knowledge in a simple way. The " "contents of wiki is stored in a normal library with pre-defined file/folder " @@ -1825,82 +1976,105 @@ msgid "" "back to the server." msgstr "Ein Seafile Wiki ermöglicht auf einfache Weise die Organisation von Wissen. Der Inhalt eines Wikis wird als Bibliothek mit vordefinierter Ordnerstruktur gespeichert. Somit können Sie Ihr Wiki lokal auf Ihren Client-Computer bearbeiten und es wird automatisch auf den Seafile-Server synchronisiert." -#: seahub/group/templates/group/group_wiki.html:15 -#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/group/templates/group/group_wiki.html:38 +#: seahub/templates/wiki/personal_wiki.html:34 msgid "Create Wiki Now" msgstr "Wiki jetzt erstellen" -#: seahub/group/templates/group/group_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:18 +#: seahub/group/templates/group/group_wiki.html:40 +#: seahub/templates/wiki/personal_wiki.html:36 +msgid "Choose a library as wiki" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:45 +#: seahub/templates/wiki/personal_wiki.html:40 msgid "Create Wiki" msgstr "Wiki erstellen" -#: seahub/group/templates/group/group_wiki.html:23 +#: seahub/group/templates/group/group_wiki.html:49 msgid "Wiki Pages" msgstr "Wiki Seiten" -#: seahub/group/templates/group/group_wiki.html:31 +#: seahub/group/templates/group/group_wiki.html:55 +#: seahub/templates/wiki/personal_wiki.html:50 +msgid "Choose a library as wiki:" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:60 +#: seahub/profile/templates/profile/set_profile.html:122 +#: seahub/templates/wiki/personal_wiki.html:55 +msgid "Please click and choose a library." +msgstr "Bitte eine Bibliothek auswählen." + +#: seahub/group/templates/group/group_wiki.html:68 #: seahub/group/templates/group/group_wiki_pages.html:11 -#: seahub/templates/wiki/personal_wiki.html:30 +#: seahub/templates/wiki/personal_wiki.html:63 #: seahub/templates/wiki/personal_wiki_pages.html:13 msgid "Home" msgstr "Start" -#: seahub/group/templates/group/group_wiki.html:32 +#: seahub/group/templates/group/group_wiki.html:69 #: seahub/group/templates/group/group_wiki_pages.html:12 -#: seahub/templates/wiki/personal_wiki.html:31 +#: seahub/templates/wiki/personal_wiki.html:64 #: seahub/templates/wiki/personal_wiki_pages.html:14 msgid "Pages" msgstr "Seiten" -#: seahub/group/templates/group/group_wiki.html:34 +#: seahub/group/templates/group/group_wiki.html:71 #: seahub/group/templates/group/group_wiki_pages.html:14 -#: seahub/templates/wiki/personal_wiki.html:32 +#: seahub/templates/wiki/personal_wiki.html:65 #: seahub/templates/wiki/personal_wiki_pages.html:15 msgid "Wiki History" msgstr "Wiki Änderungsverlauf" -#: seahub/group/templates/group/group_wiki.html:39 -#: seahub/group/templates/group/group_wiki.html:53 +#: seahub/group/templates/group/group_wiki.html:76 +#: seahub/group/templates/group/group_wiki.html:90 #: seahub/group/templates/group/group_wiki_pages.html:18 #: seahub/group/templates/group/group_wiki_pages.html:29 -#: seahub/templates/wiki/personal_wiki.html:35 -#: seahub/templates/wiki/personal_wiki.html:48 +#: seahub/templates/wiki/personal_wiki.html:68 +#: seahub/templates/wiki/personal_wiki.html:81 #: seahub/templates/wiki/personal_wiki_pages.html:17 #: seahub/templates/wiki/personal_wiki_pages.html:27 msgid "New Page" msgstr "Neue Seite" -#: seahub/group/templates/group/group_wiki.html:40 -#: seahub/templates/wiki/personal_wiki.html:36 +#: seahub/group/templates/group/group_wiki.html:77 +#: seahub/group/templates/group/group_wiki.html:136 +#: seahub/templates/wiki/personal_wiki.html:69 +#: seahub/templates/wiki/personal_wiki.html:127 msgid "Delete Page" msgstr "Löschen" -#: seahub/group/templates/group/group_wiki.html:41 -#: seahub/templates/wiki/personal_wiki.html:37 +#: seahub/group/templates/group/group_wiki.html:78 +#: seahub/templates/wiki/personal_wiki.html:70 msgid "Edit Page" msgstr "Bearbeiten" -#: seahub/group/templates/group/group_wiki.html:42 -#: seahub/templates/wiki/personal_wiki.html:38 +#: seahub/group/templates/group/group_wiki.html:79 +#: seahub/templates/wiki/personal_wiki.html:71 msgid "Page History" msgstr "Änderungsverlauf" -#: seahub/group/templates/group/group_wiki.html:49 -#: seahub/templates/wiki/personal_wiki.html:44 +#: seahub/group/templates/group/group_wiki.html:86 +#: seahub/templates/wiki/personal_wiki.html:77 #, python-format msgid "Last modified by %(modifier)s, %(modify_time)s" msgstr "Zuletzt bearbeitet von %(modifier)s um %(modify_time)s" -#: seahub/group/templates/group/group_wiki.html:112 -#: seahub/templates/repo_settings.html:60 -#: seahub/templates/wiki/personal_wiki.html:107 +#: seahub/group/templates/group/group_wiki.html:137 +#: seahub/templates/wiki/personal_wiki.html:128 +msgid "Are you sure you want to delete this page?" +msgstr "" + +#: seahub/group/templates/group/group_wiki.html:158 +#: seahub/templates/repo_settings.html:78 +#: seahub/templates/wiki/personal_wiki.html:149 msgid "Name is required." msgstr "Name wird benötigt" -#: seahub/group/templates/group/group_wiki.html:116 -#: seahub/templates/repo_settings.html:64 -#: seahub/templates/wiki/personal_wiki.html:111 +#: seahub/group/templates/group/group_wiki.html:162 +#: seahub/templates/repo_settings.html:82 +#: seahub/templates/wiki/personal_wiki.html:153 msgid "Description is required." msgstr "Beschreibung wird benötigt" @@ -1947,10 +2121,12 @@ msgstr "Mitglieder hinzufügen" #: seahub/group/templates/group/grpmember_add_form.html:6 #: seahub/templates/snippets/repo_share_form.html:6 +#: seahub/templates/sysadmin/sys_useradmin.html:42 msgid "Enter" msgstr "Benutzer" #: seahub/group/templates/group/grpmember_add_form.html:10 +#: seahub/templates/sysadmin/sys_useradmin.html:45 msgid "emails, separated by ','" msgstr "E-Mail-Adressen, getrennt durch ','" @@ -1966,7 +2142,8 @@ msgstr "Tipp: Die E-Mail-Adressen sollten bereits registriert sein." msgid "Add administrators" msgstr "Administratoren hinzufügen" -#: seahub/group/templates/group/grpmember_add_js.html:41 +#: seahub/group/templates/group/grpmember_add_js.html:33 +#: seahub/templates/sysadmin/sys_useradmin.html:167 msgid "Please enter emails, or select some." msgstr "Bitte geben Sie E-Mail-Adressen an oder wählen Sie welche" @@ -2245,135 +2422,119 @@ msgid "" " the library, you'll have to enter password again." msgstr "Seafile Server speichern die Passworte für verschlüsselte Bibliotheken nicht. Um eine verschlüsselte Bibliothek online zu betrachten, müssen Sie das entsprechende Passwort eingeben. Das Passwort wird nur im verschlüsselten Speicher des Servers gesichert. Nach einer Stunde wird es gelöscht. Danach müssen Sie das Passwort erneut eingeben, um die Bibliothek zu betrachten." -#: seahub/message/views.py:134 -#: seahub/message/templates/message/all_msg_list.html:164 +#: seahub/message/views.py:156 +#: seahub/message/templates/message/all_msg_list.html:166 msgid "message is required" msgstr "Nachricht wird benötigt" -#: seahub/message/views.py:137 -#: seahub/message/templates/message/all_msg_list.html:168 +#: seahub/message/views.py:159 +#: seahub/message/templates/message/all_msg_list.html:170 msgid "contact is required" msgstr "Kontakt wird benötigt" -#: seahub/message/views.py:159 +#: seahub/message/views.py:184 msgid "You can not send message to yourself." msgstr "Sie können sich nicht selbst eine Nachricht schicken." -#: seahub/message/views.py:163 +#: seahub/message/views.py:188 #, python-format msgid "Failed to send message to %s, user not found." msgstr "Senden der Nachricht an %s fehlgeschlagen, da der Benutzer nicht gefunden wurde." -#: seahub/message/templates/message/all_msg_list.html:4 -#: seahub/message/templates/message/all_msg_list.html:15 -#: seahub/message/templates/message/user_msg_list.html:4 -#: seahub/share/templates/share/user_share_list.html:24 -#: seahub/templates/home_base.html:22 -msgid "Messages" -msgstr "Nachrichten" - -#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/all_msg_list.html:17 msgid "New Message" msgstr "Neue Nachricht" -#: seahub/message/templates/message/all_msg_list.html:22 +#: seahub/message/templates/message/all_msg_list.html:23 #: seahub/notifications/templates/notifications/user_notification_list.html:20 msgid "Message" msgstr "Nachricht" -#: seahub/message/templates/message/all_msg_list.html:23 +#: seahub/message/templates/message/all_msg_list.html:24 #: seahub/notifications/templates/notifications/user_notification_list.html:21 #: seahub/templates/file_revisions.html:25 #: seahub/templates/repo_history.html:21 msgid "Time" msgstr "Zeit" -#: seahub/message/templates/message/all_msg_list.html:42 +#: seahub/message/templates/message/all_msg_list.html:43 msgid "message..." msgstr "Nachricht..." -#: seahub/message/templates/message/all_msg_list.html:45 -msgid "Add files" -msgstr "Dateien hinzufügen" - -#: seahub/message/templates/message/all_msg_list.html:95 +#: seahub/message/templates/message/all_msg_list.html:97 msgid "send to: click to select contacts" msgstr "Kontakte zum Versenden auswählen" -#: seahub/message/templates/message/all_msg_list.html:101 +#: seahub/message/templates/message/all_msg_list.html:103 msgid "please add contacts at first" msgstr "Bitte wählen Sie zuerst eine Kontakt." -#: seahub/message/templates/message/all_msg_list.html:105 +#: seahub/message/templates/message/all_msg_list.html:107 msgid "Failed to get your contacts for sending a message." msgstr "Auf Kontakte konnte nicht zugegriffen werden." -#: seahub/message/templates/message/all_msg_list.html:136 +#: seahub/message/templates/message/all_msg_list.html:138 +#: seahub/templates/snippets/msg_form_js.html:25 msgid "You don't have any library at present" msgstr "Sie haben noch keine Bibliothek erstellt." -#: seahub/message/templates/message/user_msg_list.html:9 -#, python-format -msgid "Messages with %(name)s" -msgstr "Nachrichten mit %(name)s" - #: seahub/message/templates/message/user_msg_list.html:15 msgid "Send a message..." msgstr "Nachricht senden..." -#: seahub/notifications/models.py:446 +#: seahub/notifications/models.py:450 #, python-format msgid "" "A file named %(file_name)s is uploaded to your " "folder %(folder)s" msgstr "Eine Datei mit dem Namen %(file_name)s wurde in den Ordner %(folder)s hochgeladen" -#: seahub/notifications/models.py:469 +#: seahub/notifications/models.py:473 #, python-format msgid "" "%(user)s has shared a library named %(repo_name)s to " "you." msgstr "%(user)s hat eine Bibliothek mit dem Namen %(repo_name)s mit Ihnen geteilt." -#: seahub/notifications/models.py:487 +#: seahub/notifications/models.py:491 #, python-format msgid "" "%(user)s has shared a file named %(file_name)s to " "you." msgstr "%(user)s hat die Datei %(file_name)s für Sie freigegeben." -#: seahub/notifications/models.py:503 +#: seahub/notifications/models.py:507 #, python-format -msgid "You have recieved a new message from %(user)s." -msgstr "Sie haben eine neue Nachricht von %(user)s erhalten." +msgid "You have received a new message from %(user)s." +msgstr "" -#: seahub/notifications/models.py:518 seahub/notifications/models.py:549 -#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778 +#: seahub/notifications/models.py:522 seahub/notifications/models.py:553 +#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832 msgid "Internal error" msgstr "Interner Fehler" -#: seahub/notifications/models.py:529 +#: seahub/notifications/models.py:533 #, python-format msgid "%(group_name)s has new discussion" msgstr "%(group_name)s hat neue Diskussionen" -#: seahub/notifications/models.py:533 +#: seahub/notifications/models.py:537 #, python-format msgid "" "%(user)s posted a new discussion in %(group_name)s" msgstr "%(user)s hat eine neue Diskussion in %(group_name)s gestartet" -#: seahub/notifications/models.py:555 +#: seahub/notifications/models.py:559 #, python-format msgid "One group discussion has new reply" msgstr "Ein neuer Beitrag in einer Gruppen-Diskussion\n " -#: seahub/notifications/models.py:559 +#: seahub/notifications/models.py:563 #, python-format msgid "%(user)s replied your group discussion" msgstr "%(user)s hat auf Ihre Gruppen-Diskussion geantwortet" -#: seahub/notifications/models.py:582 +#: seahub/notifications/models.py:586 #, python-format msgid "" "User %(username)s has asked to join group %(username)s hat die Gruppenmitg msgid "Successfully cleared all notices." msgstr "Erfolgreich alle Benachrichtigungen gelöscht." -#: seahub/notifications/templates/notifications/notification_list.html:9 -#: seahub/notifications/templates/notifications/notification_list.html:13 -msgid "Add new notification" -msgstr "Neue Benachrichtigung hinzufügen" +#: seahub/notifications/templates/notifications/notice_email.html:8 +#, python-format +msgid "Hi %(name)s," +msgstr "" -#: seahub/notifications/templates/notifications/notification_list.html:21 +#: seahub/notifications/templates/notifications/notice_email.html:11 +#, python-format +msgid "" +"\n" +"You've got 1 new notice on %(site_name)s.\n" +msgid_plural "" +"\n" +"You've got %(num)s new notices on %(site_name)s.\n" +msgstr[0] "" +msgstr[1] "" + +#: seahub/notifications/templates/notifications/notice_email.html:19 +msgid "Go check out at the following page:" +msgstr "" + +#: seahub/notifications/templates/notifications/notification_list.html:8 msgid "All Notifications" msgstr "Alle Benachrichtigungen" -#: seahub/notifications/templates/notifications/notification_list.html:25 +#: seahub/notifications/templates/notifications/notification_list.html:9 +#: seahub/notifications/templates/notifications/notification_list.html:12 +msgid "Add new notification" +msgstr "Neue Benachrichtigung hinzufügen" + +#: seahub/notifications/templates/notifications/notification_list.html:20 msgid "Notification Detail" msgstr "Benachrichtigungsdetails" -#: seahub/notifications/templates/notifications/notification_list.html:32 +#: seahub/notifications/templates/notifications/notification_list.html:27 msgid "(current notification)" msgstr "(aktuelle Benachrichtigung)" -#: seahub/notifications/templates/notifications/notification_list.html:36 +#: seahub/notifications/templates/notifications/notification_list.html:31 msgid "Set to current" msgstr "Als aktuell markieren" -#: seahub/notifications/templates/notifications/notification_list.html:44 -#: seahub/templates/sysadmin/sys_group_admin.html:55 +#: seahub/notifications/templates/notifications/notification_list.html:39 +#: seahub/templates/sysadmin/sys_group_admin.html:56 #: seahub/templates/sysadmin/sys_org_admin.html:55 -#: seahub/templates/sysadmin/sys_publink_admin.html:56 +#: seahub/templates/sysadmin/sys_publink_admin.html:57 msgid "Empty" msgstr "Leer" -#: seahub/notifications/templates/notifications/notification_list.html:56 +#: seahub/notifications/templates/notifications/notification_list.html:51 msgid "Delete Notification" msgstr "Benachrichtigung löschen" @@ -2436,27 +2617,27 @@ msgid "Please choose how to view encrypted libraries online:" msgstr "Bitte wählen Sie wie verschlüsselte Bibliotheken online angezeigt werden sollen:" #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Send passwords to the server." msgstr "Passwort an den Server übertragen." #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Files will be decrypted in the server before being sent to you." msgstr "Dateien werden auf dem Server entschlüsselt, bevor sie heruntergeladen werden." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Save passwords in your browser." msgstr "Passwort im Browser speichern." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Files will be decrypted in your browser when you download them." msgstr "Dateien werden beim Herunterladen direkt in Ihrem Browser entschlüsselt." #: seahub/options/templates/options/set_user_options.html:13 -#: seahub/profile/templates/profile/set_profile.html:74 +#: seahub/profile/templates/profile/set_profile.html:85 msgid "" "Tip: the latter way is more secure, but it is not supported well by all " "browsers. We advise you to use the latest version of Chrome or Firefox." @@ -2488,81 +2669,88 @@ msgid "Successfully set \"%s\" as your default library." msgstr "\"%s\" wurde als Ihre Standard Bibliothek festgelegt. " #: seahub/profile/templates/profile/profile_base.html:4 -#: seahub/profile/templates/profile/set_profile.html:5 -#: seahub/profile/templates/profile/set_profile.html:25 +#: seahub/profile/templates/profile/set_profile.html:26 msgid "Profile Setting" msgstr "Profileinstellungen" #: seahub/profile/templates/profile/set_profile.html:10 -#: seahub/templates/sysadmin/userinfo.html:17 +#: seahub/templates/sysadmin/userinfo.html:8 msgid "Profile" msgstr "Profil" -#: seahub/profile/templates/profile/set_profile.html:12 +#: seahub/profile/templates/profile/set_profile.html:11 +msgid "Language" +msgstr "Sprache" + +#: seahub/profile/templates/profile/set_profile.html:13 msgid "Encrypted Libraries" msgstr "Verschlüsselte Bibliotheken" -#: seahub/profile/templates/profile/set_profile.html:14 +#: seahub/profile/templates/profile/set_profile.html:15 msgid "Sub-library" msgstr "Verschachtelte Bibliotheken" -#: seahub/profile/templates/profile/set_profile.html:15 +#: seahub/profile/templates/profile/set_profile.html:16 msgid "Default Library" msgstr "Standard Bibliothek" -#: seahub/profile/templates/profile/set_profile.html:16 -#: seahub/profile/templates/profile/set_profile.html:100 -#: seahub/profile/templates/profile/set_profile.html:127 +#: seahub/profile/templates/profile/set_profile.html:17 +#: seahub/profile/templates/profile/set_profile.html:111 +#: seahub/profile/templates/profile/set_profile.html:138 msgid "Delete Account" msgstr "Benutzerkonto löschen" -#: seahub/profile/templates/profile/set_profile.html:27 +#: seahub/profile/templates/profile/set_profile.html:28 msgid "Avatar:" msgstr "Avatar:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 msgid "Password:" msgstr "Passwort:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 #: seahub/templates/snippets/repo_dirents.html:79 msgid "Update" msgstr "Aktualisieren" -#: seahub/profile/templates/profile/set_profile.html:36 +#: seahub/profile/templates/profile/set_profile.html:37 msgctxt "true name" msgid "Name:" msgstr "Name: " -#: seahub/profile/templates/profile/set_profile.html:41 +#: seahub/profile/templates/profile/set_profile.html:42 msgid "About me:" msgstr "Über mich:" -#: seahub/profile/templates/profile/set_profile.html:48 +#: seahub/profile/templates/profile/set_profile.html:49 msgid "Department:" msgstr "Abteilung:" -#: seahub/profile/templates/profile/set_profile.html:53 +#: seahub/profile/templates/profile/set_profile.html:54 msgid "Telephone:" msgstr "Telefon:" #: seahub/profile/templates/profile/set_profile.html:66 +msgid "Language Setting" +msgstr "Spracheinstellung" + +#: seahub/profile/templates/profile/set_profile.html:77 msgid "Encrypted Libraries Setting" msgstr "Einstellungen für verschlüsselte Bibliotheken" -#: seahub/profile/templates/profile/set_profile.html:68 +#: seahub/profile/templates/profile/set_profile.html:79 msgid "How to view encrypted libraries online:" msgstr "Wie sollen verschlüsselte Bibliotheken online angezeigt werden:" -#: seahub/profile/templates/profile/set_profile.html:81 +#: seahub/profile/templates/profile/set_profile.html:92 msgid "Sub-library Setting" msgstr "Einstellungen für verschachtelte Bibliotheken" -#: seahub/profile/templates/profile/set_profile.html:83 +#: seahub/profile/templates/profile/set_profile.html:94 msgid "Enable sub-library" msgstr "Verschachtelte Bibliotheken aktivieren" -#: seahub/profile/templates/profile/set_profile.html:84 +#: seahub/profile/templates/profile/set_profile.html:95 msgid "" "This feature enables you to selectively sync a folder inside a library. A " "sub-library can be created from any folder. After being created, it will be " @@ -2571,45 +2759,41 @@ msgid "" "library." msgstr "Durch Aktiveren der verschachtelten Bibliotheken können Sie aus jedem Ordner eine Bibliothek innerhalb einer Bibliothek erstellen. Nachdem eine verschachtelte Bibliothek erstellt wurde, erscheint diese innerhalb Ihres Desktop-Clients und Sie können diese wie eine normale Bibliothek herunterladen. Eine verschachtelte Bibliothek wird automatisch mit der übergelagerten Bibliothek abgeglichen." -#: seahub/profile/templates/profile/set_profile.html:85 +#: seahub/profile/templates/profile/set_profile.html:96 msgid "" "Sub-library is also used when sharing a folder to a group or another user. " "Without this option on, a hidden sub-library will be created automatically " "in such case. With this option on, those hidden sub-libraries will also be " "listed, which enables you to manage them." -msgstr "Verschachtelte Bibliotheken werden verwendet, wenn ein Ordner einer Gruppe oder einem Nutzer freigegeben wird. Wenn Sie die verschachtelten Bibliotheken nicht aktivieren werden in solchen fällen unsichtbare Bibliotheken erstellt.\nDurch Aktivieren der verschachtelten Bibliotheken können diese aufgelistet und verwaltet werden." +msgstr "Verschachtelte Bibliotheken werden verwendet, wenn ein Ordner einer Gruppe oder einem Nutzer freigegeben wird. Wenn Sie die verschachtelten Bibliotheken nicht aktivieren werden in solchen Fällen unsichtbare Bibliotheken erstellt.\nDurch Aktivieren der verschachtelten Bibliotheken können diese aufgelistet und verwaltet werden." -#: seahub/profile/templates/profile/set_profile.html:91 +#: seahub/profile/templates/profile/set_profile.html:102 msgid "Default Library Setting" msgstr "Einstellungen für Ihre Standard Bibliothek" -#: seahub/profile/templates/profile/set_profile.html:93 +#: seahub/profile/templates/profile/set_profile.html:104 msgid "Your default library:" msgstr "Ihre Standard Bibliothek:" -#: seahub/profile/templates/profile/set_profile.html:95 +#: seahub/profile/templates/profile/set_profile.html:106 msgid "" "Default library is the default place to store your personal documents and " "pictures." msgstr "In Ihrer Standard Bibliothek werden standardmäßig Ihre persönlichen Dokumente und Bilder gespeichert." -#: seahub/profile/templates/profile/set_profile.html:96 +#: seahub/profile/templates/profile/set_profile.html:107 msgid "Choose Default Library" msgstr "Standard Bibliothek festlegen" -#: seahub/profile/templates/profile/set_profile.html:101 +#: seahub/profile/templates/profile/set_profile.html:112 msgid "This operation will not be reverted. Please think twice!" msgstr "Dieser Vorgang kann nicht rückgängig gemacht werden. Bitte seien Sie sich sicher!" -#: seahub/profile/templates/profile/set_profile.html:106 +#: seahub/profile/templates/profile/set_profile.html:117 msgid "Choose default library:" msgstr "Standard Bibliothek auswählen:" -#: seahub/profile/templates/profile/set_profile.html:111 -msgid "Please click and choose a library." -msgstr "Bitte eine Bibliothek auswählen." - -#: seahub/profile/templates/profile/set_profile.html:128 +#: seahub/profile/templates/profile/set_profile.html:139 msgid "Really want to delete your account?" msgstr "Wollen Sie wirklichen Ihr Benutzerkonto löschen?" @@ -2622,25 +2806,25 @@ msgid "Info" msgstr "Info" #: seahub/profile/templates/profile/user_profile.html:41 -#: seahub/templates/sysadmin/userinfo.html:21 +#: seahub/templates/sysadmin/userinfo.html:15 msgctxt "true name" msgid "Name" msgstr "Name" #: seahub/profile/templates/profile/user_profile.html:44 -#: seahub/templates/sysadmin/userinfo.html:24 +#: seahub/templates/sysadmin/userinfo.html:18 msgid "Self-introduction" msgstr "Einführung" #: seahub/profile/templates/profile/user_profile.html:48 -#: seahub/templates/registration/registration_form.html:24 -#: seahub/templates/sysadmin/userinfo.html:29 +#: seahub/templates/registration/registration_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:23 msgid "Department" msgstr "Abteilung" #: seahub/profile/templates/profile/user_profile.html:51 -#: seahub/templates/registration/registration_form.html:26 -#: seahub/templates/sysadmin/userinfo.html:32 +#: seahub/templates/registration/registration_form.html:27 +#: seahub/templates/sysadmin/userinfo.html:26 msgid "Telephone" msgstr "Telefon" @@ -2648,169 +2832,171 @@ msgstr "Telefon" msgid "Email is not longer than 512 characters" msgstr "E-Mail darf nicht länger als 512 Zeichen sein" -#: seahub/share/views.py:59 +#: seahub/share/views.py:57 msgid "Failed to share to all members, please try again later." msgstr "Freigeben an alle Mitglieder ist fehlgeschlagen, bitte versuchen Sie es später wieder." -#: seahub/share/views.py:61 +#: seahub/share/views.py:59 #, python-format msgid "" "Shared to all members successfully, go check it at Shares." msgstr "Erfolgreich für alle Mitglieder freigegeben. Sie können den Status unter Freigaben prüfen." -#: seahub/share/views.py:73 +#: seahub/share/views.py:71 #, python-format msgid "\"%(repo)s\" is already in group %(group)s. View" msgstr "\"%(repo)s\" ist schon in Gruppe %(group)s. Anzeigen" -#: seahub/share/views.py:83 +#: seahub/share/views.py:81 #, python-format msgid "Failed to share %(repo)s to %(group)s, please try again later." msgstr "Freigeben von %(repo)s an %(group)s fehlgeschlagen, bitte versuchen Sie es später wieder." -#: seahub/share/views.py:87 +#: seahub/share/views.py:85 #, python-format msgid "" "Shared to %(group)s successfully，go check it at Shares." msgstr "Erfolgreich für die Gruppe %(group)s freigegeben. Sie können den Status unter Freigaben prüfen." -#: seahub/share/views.py:97 +#: seahub/share/views.py:95 msgid "You can not share libray to yourself." msgstr "Sie können die Bibliothek nicht an sich selbst freigeben." -#: seahub/share/views.py:106 +#: seahub/share/views.py:104 #, python-format msgid "Failed to share to %s, please try again later." msgstr "Freigeben von %s fehlgeschlagen, bitte versuchen Sie es später wieder." -#: seahub/share/views.py:113 +#: seahub/share/views.py:111 #, python-format msgid "" "Shared to %(email)s successfully，go check it at Shares." msgstr "Erfolgreich für %(email)s freigegeben. Sie können den Status unter Freigaben prüfen." -#: seahub/share/views.py:117 +#: seahub/share/views.py:115 #, python-format msgid "Failed to share to %s, as the email is not registered." msgstr "Freigeben für %s fehlgeschlagen. Die E-Mail-Adresse ist nicht registriert." -#: seahub/share/views.py:176 +#: seahub/share/views.py:174 msgid "Only the owner of the library has permission to share it." msgstr "Nur der Besitzer der Bibliothek hat die Berechtigung sie freizugeben." -#: seahub/share/views.py:208 +#: seahub/share/views.py:204 #, python-format msgid "" "Failed to share \"%s\", no enough quota. Upgrade account." msgstr "\"%s\" kann aufgrund mangelnden Speicherplatz' nicht freigegeben werden. Upgrade Ihres Kontos." -#: seahub/share/views.py:233 seahub/share/views.py:240 +#: seahub/share/views.py:229 seahub/share/views.py:236 msgid "Argument is not valid" msgstr "Argument ist nicht gültig." -#: seahub/share/views.py:244 seahub/share/views.py:254 +#: seahub/share/views.py:240 seahub/share/views.py:250 msgid "Failed to remove share" msgstr "Entfernen der Freigabe fehlgeschlagen" -#: seahub/share/views.py:250 +#: seahub/share/views.py:246 msgid "group id is not valid" msgstr "Gruppen-ID ist ungültig" -#: seahub/share/views.py:263 +#: seahub/share/views.py:259 msgid "Successfully removed share" msgstr "Freigabe erfolgreich entfernt" -#: seahub/share/views.py:355 seahub/share/views.py:486 +#: seahub/share/views.py:352 seahub/share/views.py:483 msgid "all members" msgstr "Alle Mitglieder" -#: seahub/share/views.py:665 seahub/share/views.py:1011 -#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543 -#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873 -#: seahub/views/ajax.py:890 seahub/views/file.py:770 +#: seahub/share/views.py:663 seahub/share/views.py:985 +#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623 +#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036 +#: seahub/views/ajax.py:1053 seahub/views/file.py:821 msgid "Invalid arguments" msgstr "Ungültige Argumente" -#: seahub/share/views.py:674 seahub/share/views.py:1016 +#: seahub/share/views.py:668 seahub/share/views.py:990 msgid "You cannot share the library in this way." msgstr "So können Sie die Bibliothek nicht freigeben." -#: seahub/share/views.py:699 seahub/share/views.py:1039 -msgid "Failed to get the link, please retry later." -msgstr "Abrufen des Links fehlgeschlagen, bitte versuchen Sie es später nochmals." - -#: seahub/share/views.py:721 seahub/share/views.py:754 +#: seahub/share/views.py:700 seahub/share/views.py:733 msgid "Removed successfully" msgstr "Erfolgreich entfernt" -#: seahub/share/views.py:738 seahub/share/views.py:771 +#: seahub/share/views.py:717 seahub/share/views.py:750 msgid "The link doesn't exist" msgstr "Der Link existiert nicht." -#: seahub/share/views.py:785 +#: seahub/share/views.py:764 msgid "" "Sending shared link failed. Email service is not properly configured, please" " contact administrator." msgstr "Senden des freigegebenen Links fehlgeschlagen. Der E-Mail-Dienst ist nicht korrekt konfiguriert. Bitte wenden Sie sich an den Administrator." -#: seahub/share/views.py:810 -msgid "Your friend shared a file to you on Seafile" -msgstr "Jemand hat eine Datei für Sie auf Seafile freigegeben." +#: seahub/share/views.py:787 +#, python-format +msgid "A file is shared to you on %s" +msgstr "Es wurde eine Datei freigegeben unter %s" -#: seahub/share/views.py:815 seahub/share/views.py:1089 +#: seahub/share/views.py:791 seahub/share/views.py:1060 msgid "Internal server error. Send failed." msgstr "Interner Serverfehler: Senden fehlgeschalgen." -#: seahub/share/views.py:818 seahub/share/views.py:1092 +#: seahub/share/views.py:794 seahub/share/views.py:1063 msgid "Successfully sent." msgstr "Erfolgreich versendet." -#: seahub/share/views.py:838 +#: seahub/share/views.py:814 msgid "Please choose a directory." msgstr "Bitte wählen Sie ein Verzeichnis aus." -#: seahub/share/views.py:855 seahub/share/views.py:949 +#: seahub/share/views.py:831 seahub/share/views.py:923 msgid "Successfully saved." msgstr "Erfolgreich gespeichert." -#: seahub/share/views.py:874 +#: seahub/share/views.py:850 #, python-format msgid "Failed to share to \"%s\", user not found." msgstr "Freigeben für %s fehlgeschlagen, da der Benutzer nicht gefunden wurde." -#: seahub/share/views.py:888 +#: seahub/share/views.py:864 #, python-format msgid "Successfully shared %s." msgstr "%s erfolgreich freigegeben." -#: seahub/share/views.py:914 +#: seahub/share/views.py:888 #, python-format msgid "Successfully unshared \"%s\"." msgstr "Freigabe von %s erfolgreich aufgehoben." -#: seahub/share/views.py:916 +#: seahub/share/views.py:890 #, python-format -msgid "You don't have permission to unshared %s." -msgstr "Sie haben keine Berechtigung, die Freigabe von %s aufzuheben." +msgid "You don't have permission to unshare %s." +msgstr "" -#: seahub/share/views.py:952 +#: seahub/share/views.py:926 #, python-format msgid "You don't have permission to save %s." msgstr "Sie haben keine Berechtigung, %s zu speichern." -#: seahub/share/views.py:1059 +#: seahub/share/views.py:1013 +msgid "Failed to get the link, please retry later." +msgstr "Abrufen des Links fehlgeschlagen, bitte versuchen Sie es später nochmals." + +#: seahub/share/views.py:1033 msgid "" "Sending shared upload link failed. Email service is not properly configured," " please contact administrator." msgstr "Senden des freigegebenen Upload-Links fehlgeschlagen. Der E-Mail-Dienst ist nicht korrekt konfiguriert. Bitte wenden Sie sich an den Administrator." -#: seahub/share/views.py:1084 -msgid "Your friend shared a upload link to you on Seafile" -msgstr "Jemand hat einen Upload-Link für Sie auf Seafile freigegeben" +#: seahub/share/views.py:1056 +#, python-format +msgid "An upload link is shared to you on %s" +msgstr "" #: seahub/share/templates/share/links.html:5 msgid "Links - Share" @@ -2831,14 +3017,15 @@ msgstr "Besuche" #: seahub/share/templates/share/links.html:37 #: seahub/share/templates/share/links.html:68 -#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632 +#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621 +#: seahub/templates/repo.html.py:699 #: seahub/templates/repo_view_snapshot.html:42 msgid "View" msgstr "Ansicht" #: seahub/share/templates/share/links.html:38 #: seahub/share/templates/share/links.html:69 -#: seahub/templates/sysadmin/sys_publink_admin.html:22 +#: seahub/templates/sysadmin/sys_publink_admin.html:24 msgid "Remove" msgstr "Entfernen" @@ -2867,7 +3054,7 @@ msgid "Folders - Share" msgstr "Ordner - Freigaben" #: seahub/share/templates/share/list_priv_shared_folders.html:10 -#: seahub/templates/home_base.html:29 +#: seahub/templates/home_base.html:30 msgid "Folders" msgstr "Ordner" @@ -2892,13 +3079,13 @@ msgid "" msgstr "Sie können einen einzelnen Ordner mit einen anderen Benutzer teilen wenn Sie nicht die ganze Bibliothek freigeben wollen." #: seahub/share/templates/share/list_priv_shared_folders.html:97 -#: seahub/share/templates/share/repos.html:101 +#: seahub/share/templates/share/repos.html:107 #: seahub/templates/sysadmin/useradmin_js.html:62 msgid "Edit succeeded" msgstr "Erfolgreich bearbeitet" #: seahub/share/templates/share/list_priv_shared_folders.html:104 -#: seahub/share/templates/share/repos.html:108 +#: seahub/share/templates/share/repos.html:114 #: seahub/templates/sysadmin/useradmin_js.html:71 msgid "Edit failed." msgstr "Bearbeiten fehlgeschlagen." @@ -2965,7 +3152,7 @@ msgstr "Freigaben" #: seahub/share/templates/share/user_share_list.html:8 #: seahub/templates/org_admin_base.html:8 -#: seahub/templates/repo_settings.html:13 +#: seahub/templates/repo_settings.html:15 msgid "Basic Info" msgstr "Info" @@ -2978,7 +3165,8 @@ msgid "Add to contacts" msgstr "Zu Kontakten hinzufügen" #: seahub/share/templates/share/user_share_list.html:59 -#: seahub/templates/snippets/my_owned_repos.html:147 +#: seahub/templates/my_shared_repos.html:40 +#: seahub/templates/snippets/my_shared_repos.html:39 msgid "Leave Share" msgstr "Freigegebene Bibliothek verlassen" @@ -2999,56 +3187,24 @@ msgstr "Aktivitäten" msgid "Exit System Admin" msgstr "Systemadministration schließen" -#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14 -#: seahub/templates/pubuser.html:8 -msgid "Users" -msgstr "Benutzer" - -#: seahub/templates/admin_base.html:19 -msgid "Notifications" -msgstr "Benachrichtigungen" - -#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31 -msgid "Links" -msgstr "Links" - -#: seahub/templates/base.html:38 -msgid "System Admin" -msgstr "Systemadministration" - -#: seahub/templates/base.html:49 +#: seahub/templates/base.html:48 msgid "unread notices" msgstr "ungelesene Nachrichten" -#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3 -#: seahub/templates/registration/login.html:6 -#: seahub/templates/registration/password_reset_complete.html:8 -msgid "Log In" -msgstr "Anmelden" - -#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36 -#: seahub/templates/registration/registration_form.html:9 -msgid "Signup" -msgstr "Registrieren" - -#: seahub/templates/base.html:63 +#: seahub/templates/base.html:69 msgid "Log out" msgstr "Abmelden" -#: seahub/templates/base.html:123 -msgid "Server Version: " -msgstr "Server Version: " +#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6 +msgid "System Admin" +msgstr "Systemadministration" -#: seahub/templates/base.html:124 -msgid "Seafile" -msgstr "Seafile" - -#: seahub/templates/base.html:125 -msgid "Contact Us" -msgstr "Kontaktiere uns" +#: seahub/templates/base.html:163 +#: seahub/templates/sysadmin/sys_group_admin.html:8 +msgid "All Groups" +msgstr "Alle Gruppen" #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9 -#: seahub/templates/home_base.html:23 msgid "Clients" msgstr "Clients" @@ -3056,7 +3212,7 @@ msgstr "Clients" msgid "Client Name" msgstr "Client" -#: seahub/templates/client_mgmt.html:15 +#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15 msgid "IP" msgstr "IP" @@ -3097,28 +3253,80 @@ msgid "" "it online. And the password will be kept on the server for only 1 hour." msgstr "Diese Bibliothek ist verschlüsselt. Bitte geben Sie das Passwort ein, wenn Sie die Bibliothek online betrachten wollen. Das Passwort wird auf dem Server nur für eine Stunde behalten." -#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229 +#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227 +#: seahub/templates/share_access_validation.html:8 msgid "Password: " msgstr "Passwort: " -#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234 +#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232 #, python-format msgid "" "You can change how to view encrypted libraries online here." msgstr "Hier können den Modus ändern wie verschlüsselte Bibliotheken online angezeigt werden sollen." -#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337 +#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334 +#: seahub/templates/share_access_validation.html:25 msgid "Please enter the password." msgstr "Bitte das Passwort eingeben" -#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52 -#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25 +#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9 +#: seahub/templates/home_base.html:23 +msgid "Devices" +msgstr "" + +#: seahub/templates/devices.html:13 +msgid "Platform" +msgstr "" + +#: seahub/templates/devices.html:14 +msgid "Device Name" +msgstr "" + +#: seahub/templates/devices.html:16 +msgid "Last Access" +msgstr "" + +#: seahub/templates/devices.html:17 +msgid "# Libraries" +msgstr "" + +#: seahub/templates/devices.html:18 +msgid "Operation" +msgstr "" + +#: seahub/templates/devices.html:37 +msgid "Unlink" +msgstr "" + +#: seahub/templates/devices.html:43 +#, python-format +msgid "Really want to unlink %s?" +msgstr "" + +#: seahub/templates/devices.html:44 +msgid "It will immediately stop syncing." +msgstr "" + +#: seahub/templates/devices.html:50 +msgid "You do not have connected devices" +msgstr "" + +#: seahub/templates/devices.html:51 +msgid "Your clients (Desktop/Android/iOS) will be listed here." +msgstr "" + +#: seahub/templates/devices.html:110 +msgid "Successfully unlinked." +msgstr "" + +#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57 +#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26 #: seahub/templates/shared_file_view.html:35 -#: seahub/templates/view_file_base.html:74 +#: seahub/templates/view_file_base.html:75 #: seahub/templates/view_history_file.html:34 -#: seahub/templates/view_shared_dir.html:46 -#: seahub/templates/view_shared_dir.html:60 +#: seahub/templates/view_shared_dir.html:41 +#: seahub/templates/view_shared_dir.html:55 #: seahub/templates/snippets/repo_dirents.html:24 #: seahub/templates/snippets/repo_dirents.html:77 msgid "Download" @@ -3128,8 +3336,7 @@ msgstr "Herunterladen" #: seahub/templates/repo_history_view.html:38 #: seahub/templates/repo_recycle_view.html:16 #: seahub/templates/shared_file_view.html:17 -#: seahub/templates/view_shared_dir.html:16 -#: seahub/templates/snippets/repo_dir_data.html:4 +#: seahub/templates/view_shared_dir.html:13 msgid "Current path: " msgstr "Aktueller Pfad: " @@ -3444,9 +3651,9 @@ msgid "Password is required." msgstr "Passwort wird benötigt" #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5 -#: seahub/templates/repo_settings.html:21 -#: seahub/templates/view_file_base.html:66 -#: seahub/templates/snippets/current_commit.html:19 +#: seahub/templates/repo_settings.html:23 +#: seahub/templates/view_file_base.html:67 +#: seahub/templates/snippets/current_commit.html:15 #: seahub/templates/snippets/repo_dirents.html:93 msgid "History" msgstr "Verlauf" @@ -3465,16 +3672,11 @@ msgstr "Tipp: Nach jeder Änderung wird eine neue Version erzeugt. Sie können e msgid "Current Path:" msgstr "Aktueller Pfad:" -#: seahub/templates/file_revisions.html:26 -#: seahub/templates/repo_view_snapshot.html:16 -msgid "Last Modifier" -msgstr "Letzter Bearbeiter/Letzte Bearbeiterin" - #: seahub/templates/file_revisions.html:27 #: seahub/templates/repo_history_view.html:53 #: seahub/templates/repo_recycle_view.html:55 -#: seahub/templates/view_shared_dir.html:33 -#: seahub/templates/snippets/repo_dir_data.html:39 +#: seahub/templates/view_shared_dir.html:28 +#: seahub/templates/snippets/repo_dir_data.html:41 msgid "Size" msgstr "Größe" @@ -3482,38 +3684,55 @@ msgstr "Größe" msgid "(current version)" msgstr "(aktuelle Version)" -#: seahub/templates/file_revisions.html:50 +#: seahub/templates/file_revisions.html:39 +#, python-format +msgid "(Renamed or moved from %(old_path)s)" +msgstr "" + +#: seahub/templates/file_revisions.html:55 #: seahub/templates/repo_recycle_view.html:66 #: seahub/templates/repo_recycle_view.html:83 #: seahub/templates/repo_view_snapshot.html:43 msgid "Restore" msgstr "Wiederherstellen" -#: seahub/templates/file_revisions.html:55 +#: seahub/templates/file_revisions.html:60 msgid "Diff" msgstr "Diff" -#: seahub/templates/footer.html:3 +#: seahub/templates/footer.html:5 #: seahub/templates/snippets/search_form.html:44 msgid "Documents" msgstr "Dokumente" -#: seahub/templates/footer.html:5 +#: seahub/templates/footer.html:7 msgid "Introduction" msgstr "Einführung" -#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18 +#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17 msgid "Help" msgstr "Hilfe" -#: seahub/templates/footer.html:10 +#: seahub/templates/footer.html:12 msgid "Client" msgstr "Client" -#: seahub/templates/footer.html:12 +#: seahub/templates/footer.html:14 msgid "Seafile for Windows, Mac and Linux" msgstr "Seafile für Windows, Mac und Linux" +#: seahub/templates/footer.html:19 +msgid "Server Version: " +msgstr "Server Version: " + +#: seahub/templates/footer.html:20 +msgid "Seafile" +msgstr "Seafile" + +#: seahub/templates/footer.html:21 +msgid "Contact Us" +msgstr "Kontaktiere uns" + #: seahub/templates/history_file_view.html:16 #: seahub/templates/repo_view_snapshot.html:7 #: seahub/templates/view_snapshot_file.html:7 @@ -3542,12 +3761,13 @@ msgstr "Papierkorb" #: seahub/templates/history_file_view.html:31 #: seahub/templates/repo_history.html:10 #: seahub/templates/repo_recycle_view.html:9 +#: seahub/templates/repo_settings.html:8 #: seahub/templates/view_trash_file.html:7 msgid "Back to Library" msgstr "Zurück zur Bibliothek" #: seahub/templates/history_file_view.html:38 -#: seahub/templates/view_file_base.html:21 +#: seahub/templates/view_file_base.html:22 #: seahub/templates/view_history_file.html:27 #: seahub/templates/view_snapshot_file.html:13 #: seahub/templates/view_trash_file.html:11 @@ -3562,36 +3782,57 @@ msgstr "Persönlich" msgid "Starred" msgstr "Favoriten" -#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44 +#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46 #: seahub/templates/wiki/personal_wiki.html:6 #: seahub/templates/wiki/personal_wiki_pages.html:6 msgid "Personal Wiki" msgstr "Mein Wiki" -#: seahub/templates/home_base.html:26 +#: seahub/templates/home_base.html:27 msgid "Share Admin" msgstr "Freigaben" -#: seahub/templates/myhome.html:41 +#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21 +msgid "Links" +msgstr "Links" + +#: seahub/templates/my_group_repos.html:6 +#: seahub/templates/snippets/bottom_bar.html:3 +#: seahub/templates/snippets/my_group_repos.html:6 +#: seahub/templates/snippets/my_owned_repos.html:11 +msgid "Group" +msgstr "Gruppe" + +#: seahub/templates/my_group_repos.html:47 +#: seahub/templates/snippets/my_group_repos.html:47 +msgid "No library is shared to your groups" +msgstr "Es ist keine Bibliothek in Ihren Gruppen freigegeben" + +#: seahub/templates/my_shared_repos.html:49 +#: seahub/templates/snippets/my_shared_repos.html:48 +msgid "No library is shared to you" +msgstr "Es ist keine Bibliothek für Sie freigegeben" + +#: seahub/templates/myhome.html:40 msgid "Welcome to Seafile!" msgstr "Willkommen auf Seafile!" -#: seahub/templates/myhome.html:42 +#: seahub/templates/myhome.html:41 msgid "" "Seafile organizes files into libraries. Each library can be synced and " "shared separately. We have created a personal library for you. You can " "create more libraries later." msgstr "Seafile verwaltet Dateien in Bibliotheken. Jede Bibliothek kann synchronisiert und separat geteilt werden. Wir haben eine persönliche Bibliothek für Sie erstellt. Sie können mehrere Bibliotheken später erstellen." -#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215 +#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213 msgid "Close" msgstr "Schließen" -#: seahub/templates/myhome_base.html:7 +#: seahub/templates/myhome_base.html:6 msgid "My Home" msgstr "Start" -#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5 +#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5 #: seahub/templates/pub_base.html.py:10 msgid "Organization" msgstr "Organisation" @@ -3602,11 +3843,11 @@ msgid "" "current account." msgstr "\"Organisation\" wird in einer nächsten Version entfernt werden. Daten werden in Ihr Benutzerkonto überführt." -#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33 +#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34 #: seahub/templates/snippets/my_owned_repos.html:45 #: seahub/templates/snippets/my_owned_repos.html:92 -#: seahub/templates/snippets/my_owned_repos.html:231 -#: seahub/templates/snippets/repo_dir_data.html:25 +#: seahub/templates/snippets/my_owned_repos.html:135 +#: seahub/templates/snippets/repo_dir_data.html:24 #: seahub/templates/snippets/repo_dirents.html:26 #: seahub/templates/snippets/repo_dirents.html:83 msgid "Share" @@ -3628,420 +3869,452 @@ msgstr "Niemand hat bisher eine Gruppe erstellt" msgid "You can click \"Add Group\" button under \"Group\" label to create a group. " msgstr "Sie können eine Gruppe erstellen, indem Sie auf \"Gruppe hinzufügen\" im Gruppenmenü klicken." -#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98 +#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92 msgid "Share From" msgstr "Freigegeben von" -#: seahub/templates/pubrepo.html:50 +#: seahub/templates/pubrepo.html:53 msgid "No public library" msgstr "Keine öffentliche Bibliothek" -#: seahub/templates/pubrepo.html:51 +#: seahub/templates/pubrepo.html:54 msgid "" "You can create a public library by clicking \"New Library\" button, others " "can view and download this library." msgstr "Sie können eine öffentliche Bibliothek erstellen, indem Sie auf den \"Neue Bibliothek\" Button klicken. Andere können die Biblothek sehen und herunterladen." -#: seahub/templates/repo.html:31 -msgid "Trash" -msgstr "Papierkorb" +#: seahub/templates/pubuser.html:10 +msgid "Search members..." +msgstr "" -#: seahub/templates/repo.html:38 +#: seahub/templates/repo.html:23 msgid "Size: " msgstr "Größe:" -#: seahub/templates/repo.html:59 +#: seahub/templates/repo.html:32 +msgid "Trash" +msgstr "Papierkorb" + +#: seahub/templates/repo.html:50 #: seahub/templates/snippets/repo_dirents.html:37 #: seahub/templates/snippets/repo_dirents.html:91 msgid "Move" msgstr "Verschieben" -#: seahub/templates/repo.html:60 +#: seahub/templates/repo.html:51 #: seahub/templates/snippets/repo_dirents.html:38 #: seahub/templates/snippets/repo_dirents.html:92 msgid "Copy" msgstr "Kopieren" -#: seahub/templates/repo.html:64 +#: seahub/templates/repo.html:55 msgid "Upload Files" msgstr "Dateien hochladen" -#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114 +#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105 #: seahub/templates/view_shared_upload_link.html:24 msgid "The owner of this library has run out of space." msgstr "Der Besitzer dieser Bibliothek besitzt keinen freien Speicherplatz mehr." -#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121 +#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112 msgid "Please select a file at first." msgstr "Bitte zuerst eine Datei auswählen" -#: seahub/templates/repo.html:79 +#: seahub/templates/repo.html:70 #: seahub/templates/view_shared_upload_link.html:32 msgid "Add Files" msgstr "Dateien hinzufügen" -#: seahub/templates/repo.html:84 +#: seahub/templates/repo.html:75 #: seahub/templates/view_shared_upload_link.html:37 msgid "Start All" msgstr "Starte alle" -#: seahub/templates/repo.html:88 +#: seahub/templates/repo.html:79 #: seahub/templates/view_shared_upload_link.html:41 msgid "Cancel All" msgstr "Alle abbrechen" -#: seahub/templates/repo.html:92 +#: seahub/templates/repo.html:83 #: seahub/templates/view_shared_upload_link.html:45 msgid "" "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+" msgstr "Drag & Drop ist bei Chrome, Safari 5.0+, Firefox 4.0+ und IE 10.0+ unterstützt." -#: seahub/templates/repo.html:94 +#: seahub/templates/repo.html:85 #: seahub/templates/view_shared_upload_link.html:46 #, python-format msgid "File size should be smaller than %(max_file_size)s" msgstr "Die Dateigröße darf %(max_file_size)s nicht übersteigen" -#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139 +#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130 +#: seahub/templates/repo.html:1744 #: seahub/templates/view_shared_upload_link.html:54 msgid "Saving..." msgstr "Speichern..." -#: seahub/templates/repo.html:112 +#: seahub/templates/repo.html:103 #, python-format msgid "Update %(file_name)s" msgstr "%(file_name)s aktualisieren " -#: seahub/templates/repo.html:127 +#: seahub/templates/repo.html:118 msgid "Choose a file" msgstr "Datei auswähleen" -#: seahub/templates/repo.html:131 +#: seahub/templates/repo.html:122 #, python-format msgid "Smaller than %(max_file_size)s" msgstr "Kleiner als %(max_file_size)s" -#: seahub/templates/repo.html:148 -#: seahub/templates/snippets/repo_dir_data.html:16 +#: seahub/templates/repo.html:139 +#: seahub/templates/snippets/repo_dir_data.html:15 msgid "New Directory" msgstr "Neuer Ordner" -#: seahub/templates/repo.html:149 +#: seahub/templates/repo.html:140 msgid "Directory Name" msgstr "Ordnername" -#: seahub/templates/repo.html:157 -#: seahub/templates/snippets/repo_dir_data.html:19 +#: seahub/templates/repo.html:148 +#: seahub/templates/snippets/repo_dir_data.html:18 msgid "New File" msgstr "Neue Datei" -#: seahub/templates/repo.html:159 +#: seahub/templates/repo.html:150 msgid "Featured File Type" msgstr "Verfügbare Dateiformate" -#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166 +#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157 msgid "Click to choose" msgstr "Klicken zum auswählen" -#: seahub/templates/repo.html:160 +#: seahub/templates/repo.html:151 msgid "online Rich Text format." msgstr "Online Rich Text Format (Experimentell)" -#: seahub/templates/repo.html:166 +#: seahub/templates/repo.html:157 msgid "simple markup format." msgstr "einfaches Markup Format" -#: seahub/templates/repo.html:173 seahub/templates/starred.html:13 +#: seahub/templates/repo.html:164 seahub/templates/starred.html:13 msgid "File Name" msgstr "Dateiname" -#: seahub/templates/repo.html:182 +#: seahub/templates/repo.html:173 msgid "Current Library" msgstr "Aktuelle Bibliothek" -#: seahub/templates/repo.html:186 +#: seahub/templates/repo.html:177 msgid "Other Libraries" msgstr "Andere Bibliotheken" -#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49 +#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49 msgid "Please click and choose a directory." msgstr "Bitte eine Bibliothek auswählen." -#: seahub/templates/repo.html:202 +#: seahub/templates/repo.html:200 #, python-format msgid "Rename %(name)s as:" msgstr "%(name)s umbenennen zu:" -#: seahub/templates/repo.html:212 +#: seahub/templates/repo.html:210 #, python-format msgid "Sync %(dir_name)s" msgstr "Synchronisiere %(dir_name)s" -#: seahub/templates/repo.html:213 +#: seahub/templates/repo.html:211 msgid "" "A sub-library will be created from this directory. It will be listed in your" " desktop client, and you can download it just like downloading a normal " "library." msgstr "Eine Verschachtelte Bibliothek wird von diesem Order aus erstellt. Diese erscheint innerhalb Ihres Desktop-Clients und Sie können diese wie eine normale Bibliothek herunterladen." -#: seahub/templates/repo.html:214 -msgid "Create" -msgstr "Erstellen" - -#: seahub/templates/repo.html:228 +#: seahub/templates/repo.html:226 msgid "" "This library is encrypted. Please input the password if you want to browse " "it online. And the password will be kept in the browser for only 1 hour." msgstr "Diese Bibliothek ist verschlüsselt. Bitte geben Sie das Passwort ein, wenn Sie die Bibliothek online betrachten wollen. Das Passwort wird in Ihrem Browser nur für eine Stunde gespeichert." -#: seahub/templates/repo.html:257 +#: seahub/templates/repo.html:254 #: seahub/templates/view_shared_upload_link.html:77 msgid "File is too big" msgstr "Datei ist zu groß" -#: seahub/templates/repo.html:258 +#: seahub/templates/repo.html:255 #: seahub/templates/view_shared_upload_link.html:78 msgid "File is too small" msgstr "Datei ist zu klein" -#: seahub/templates/repo.html:259 +#: seahub/templates/repo.html:256 #: seahub/templates/view_shared_upload_link.html:79 msgid "Filetype not allowed" msgstr "Dateityp is nicht erlaubt" -#: seahub/templates/repo.html:260 +#: seahub/templates/repo.html:257 #: seahub/templates/view_shared_upload_link.html:80 msgid "Max number of files exceeded" msgstr "Maximale Anzahl Dateien wurde überschritten" -#: seahub/templates/repo.html:261 +#: seahub/templates/repo.html:258 #: seahub/templates/view_shared_upload_link.html:81 msgid "Uploaded bytes exceed file size" msgstr "Hochgeladene Bytes überschreitet tatsächliche Dateigröße " -#: seahub/templates/repo.html:262 +#: seahub/templates/repo.html:259 #: seahub/templates/view_shared_upload_link.html:82 msgid "Empty file upload result" msgstr "Leere Datei hochgeladen" -#: seahub/templates/repo.html:264 -#: seahub/templates/view_shared_upload_link.html:84 +#: seahub/templates/repo.html:261 +#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956 msgid "Error" msgstr "Fehler" -#: seahub/templates/repo.html:265 +#: seahub/templates/repo.html:262 #: seahub/templates/view_shared_upload_link.html:85 msgid "Start" msgstr "Start" -#: seahub/templates/repo.html:393 +#: seahub/templates/repo.html:377 msgid "Delete Items" msgstr "Einträge löschen" -#: seahub/templates/repo.html:393 +#: seahub/templates/repo.html:377 msgid "Are you sure you want to delete these selected items?" msgstr "Sind Sie sicher, dass Sie die ausgewählten Dateien löschen wollen?" -#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580 +#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564 msgid "Processing..." msgstr "Verarbeiten..." -#: seahub/templates/repo.html:427 +#: seahub/templates/repo.html:411 #, python-format msgid "Successfully deleted %(name)s and %(amount)s other items." msgstr "%(name)s und %(amount)s andere Objekte wurden erfolgreich gelöcht." -#: seahub/templates/repo.html:429 +#: seahub/templates/repo.html:413 #, python-format msgid "Successfully deleted %(name)s." msgstr "%(name)s erfolgreich gelöscht" -#: seahub/templates/repo.html:438 +#: seahub/templates/repo.html:422 #, python-format msgid "Internal error. Failed to delete %(name)s and %(amount)s other items." msgstr "Interner Fehler: Datei %(name)s und %(amount)s andere konnte nicht gelöscht werden." -#: seahub/templates/repo.html:440 +#: seahub/templates/repo.html:424 #, python-format msgid "Internal error. Failed to delete %(name)s." msgstr "Interner Fehler: Datei %(name)s konnte nicht gelöscht werden." -#: seahub/templates/repo.html:540 +#: seahub/templates/repo.html:524 msgid "Move selected directories/files to:" msgstr "Ausgewählte Ordner/Dateien verschieben nach:" -#: seahub/templates/repo.html:543 +#: seahub/templates/repo.html:527 msgid "Copy selected directories/files to:" msgstr "Ausgewählte Dateien/Ordner kopieren nach:" -#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580 -#: seahub/views/ajax.py:637 seahub/views/ajax.py:798 +#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684 +#: seahub/views/ajax.py:659 seahub/views/ajax.py:851 msgid "Invalid destination path" msgstr "Ungültiges Ziel" -#: seahub/templates/repo.html:619 +#: seahub/templates/repo.html:608 #, python-format msgid "Successfully moved %(name)s and %(amount)s other items." msgstr "%(name)s und %(amount)s andere wurden erfolgreich verschoben." -#: seahub/templates/repo.html:621 +#: seahub/templates/repo.html:610 #, python-format msgid "Successfully moved %(name)s." msgstr "%(name)s wurde erfolgreich verschoben." -#: seahub/templates/repo.html:626 +#: seahub/templates/repo.html:615 #, python-format msgid "Successfully copied %(name)s and %(amount)s other items." msgstr "%(name)s und %(amount)s andere wurden erfolgreich kopiert." -#: seahub/templates/repo.html:628 +#: seahub/templates/repo.html:617 #, python-format msgid "Successfully copied %(name)s." msgstr "%(name)s wurde erfolgreich kopiert." -#: seahub/templates/repo.html:640 +#: seahub/templates/repo.html:629 #, python-format msgid "Internal error. Failed to move %(name)s and %(amount)s other items." msgstr "Interner Fehler. %(name)s und %(amount)s andere konnten nicht verschoben werden." -#: seahub/templates/repo.html:642 +#: seahub/templates/repo.html:631 #, python-format msgid "Internal error. Failed to move %(name)s." msgstr "Interner Fehler. %(name)s konnte nicht verschoben werden." -#: seahub/templates/repo.html:646 +#: seahub/templates/repo.html:635 #, python-format msgid "Internal error. Failed to copy %(name)s and %(amount)s other items." msgstr "Interner Fehler. %(name)s und %(amount)s andere konnten nicht kopiert werden." -#: seahub/templates/repo.html:648 +#: seahub/templates/repo.html:637 #, python-format msgid "Internal error. Failed to copy %(name)s." msgstr "Interner Fehler. %(name)s konnte nicht verschoben werden." -#: seahub/templates/repo.html:707 +#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725 +msgid "Moving..." +msgstr "" + +#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727 +msgid "Copying..." +msgstr "" + +#: seahub/templates/repo.html:687 +#, python-format +msgid "Successfully moved %(s_num)s items." +msgstr "" + +#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694 +#, python-format +msgid "Failed to move %(f_num)s items." +msgstr "" + +#: seahub/templates/repo.html:692 +#, python-format +msgid "Successfully copied %(s_num)s items." +msgstr "" + +#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023 +msgid "Failed" +msgstr "" + +#: seahub/templates/repo.html:777 msgid "Encrypting the file..." msgstr "Datei wird verschlüsselt..." -#: seahub/templates/repo.html:729 +#: seahub/templates/repo.html:799 msgid "Error when encrypting." msgstr "Fehler beim Verschlüsseln." -#: seahub/templates/repo.html:736 +#: seahub/templates/repo.html:806 #, python-format msgid "Encrypting, %(num)s% complete." msgstr "Verschlüsseln %(num)s% vollständig." -#: seahub/templates/repo.html:753 +#: seahub/templates/repo.html:823 msgid "Uploading ..." msgstr "Hochladen..." -#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025 +#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122 msgid "Done!" msgstr "Fertig!" -#: seahub/templates/repo.html:1035 +#: seahub/templates/repo.html:1132 msgid "Downloading..." msgstr "Herunterladen..." -#: seahub/templates/repo.html:1068 +#: seahub/templates/repo.html:1165 #, python-format msgid "Downloading, %(num)s% complete." msgstr "Herunterladen, %(num)s% vollständig." -#: seahub/templates/repo.html:1089 +#: seahub/templates/repo.html:1186 msgid "Decrypting..." msgstr "Entschlüsseln..." -#: seahub/templates/repo.html:1106 +#: seahub/templates/repo.html:1203 #, python-format msgid "Decrypting, %(num)s% complete." msgstr "Entschlüsseln, %(num)s% vollständig." -#: seahub/templates/repo.html:1209 +#: seahub/templates/repo.html:1306 #, python-format msgid "Successfully deleted %(name)s" msgstr "%(name)s erfolgreich gelöscht" -#: seahub/templates/repo.html:1231 +#: seahub/templates/repo.html:1328 msgid "Rename File" msgstr "Datei umbenennen" -#: seahub/templates/repo.html:1233 +#: seahub/templates/repo.html:1330 msgid "Rename Directory" msgstr "Ordner umbenennen" -#: seahub/templates/repo.html:1251 +#: seahub/templates/repo.html:1348 msgid "Copy File" msgstr "Datei kopieren" -#: seahub/templates/repo.html:1253 +#: seahub/templates/repo.html:1350 msgid "Move File" msgstr "Datei verschieben " -#: seahub/templates/repo.html:1255 +#: seahub/templates/repo.html:1352 msgid "Copy Directory" msgstr "Ordner kopieren" -#: seahub/templates/repo.html:1257 +#: seahub/templates/repo.html:1354 msgid "Move Directory" msgstr "Ordner verschieben" -#: seahub/templates/repo.html:1262 +#: seahub/templates/repo.html:1359 #, python-format msgid "Copy %(name)s to:" msgstr "Kopiere %(name)s nach:" -#: seahub/templates/repo.html:1265 +#: seahub/templates/repo.html:1362 #, python-format msgid "Move %(name)s to:" msgstr "Verschiebe %(name)s nach:" -#: seahub/templates/repo.html:1288 +#: seahub/templates/repo.html:1385 msgid "Directory download is not supported in this library." msgstr "Herunterladen von Ordnern wird von dieser Bibliothek nicht unterstützt." -#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550 +#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654 #: seahub/templates/snippets/repo_dirents.html:54 msgid "unstarred" msgstr "nicht mehr favorisiert" -#: seahub/templates/repo.html:1398 +#: seahub/templates/repo.html:1503 #: seahub/templates/snippets/repo_dirents.html:52 msgid "starred" msgstr "favorisiert" -#: seahub/templates/repo.html:1446 +#: seahub/templates/repo.html:1551 msgid "Sub-library is created." msgstr "Verschachtelte Bibliothek wurde erstellt." -#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518 +#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622 msgid "It is required." msgstr "Erforderlich." -#: seahub/templates/repo.html:1483 +#: seahub/templates/repo.html:1588 msgid "Only an extension there, please input a name." msgstr "Nur eine Erweiterung angegeben, bitte einen Namen angeben." -#: seahub/templates/repo.html:1493 +#: seahub/templates/repo.html:1598 msgid "Creating..." msgstr "Erstellen..." -#: seahub/templates/repo.html:1522 +#: seahub/templates/repo.html:1626 msgid "You have not renamed it." msgstr "Nicht umbenannt. " -#: seahub/templates/repo.html:1559 +#: seahub/templates/repo.html:1663 #, python-format msgid "Successfully renamed %(old_name)s to %(new_name)s" msgstr "Erfolgreich %(old_name)s in %(new_name)s umbenannt." -#: seahub/templates/repo.html:1677 +#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791 +msgid "Canceled." +msgstr "" + +#: seahub/templates/repo.html:1878 msgid "Please select at least one contact." msgstr "Bitte geben Sie mindestens einen Kontakt an." -#: seahub/templates/repo.html:1788 -#: seahub/templates/snippets/myhome_extra_script.html:47 +#: seahub/templates/repo.html:1989 +#: seahub/templates/snippets/myhome_extra_script.html:86 msgid "Please enter emails or groups, or select some." msgstr "Bitte geben Sie E-Mail-Adressen oder Gruppen an oder wählen Sie welche" @@ -4063,11 +4336,12 @@ msgstr "Tipp: Nach der Änderung wird ein Schnappschuss erstellt, welcher den Zu msgid "View Snapshot" msgstr "Schnappschuss ansehen" -#: seahub/templates/repo_history.html:60 +#: seahub/templates/repo_history.html:62 #: seahub/templates/repo_view_snapshot.html:59 -#: seahub/templates/sysadmin/sys_group_admin.html:37 -#: seahub/templates/sysadmin/sys_publink_admin.html:38 -#: seahub/templates/sysadmin/sys_repo_admin.html:31 +#: seahub/templates/sysadmin/sys_group_admin.html:38 +#: seahub/templates/sysadmin/sys_publink_admin.html:39 +#: seahub/templates/sysadmin/sys_repo_admin.html:33 +#: seahub/templates/sysadmin/sys_trafficadmin.html:49 #: seahub/templates/sysadmin/useradmin_paginator.html:12 msgid "Per page: " msgstr "Pro Seite: " @@ -4108,34 +4382,78 @@ msgstr "Alles" msgid "Delete Time" msgstr "Zeit löschen" -#: seahub/templates/repo_settings.html:11 +#: seahub/templates/repo_settings.html:13 msgid "Library Settings" msgstr "Bibliothekseinstellungen" -#: seahub/templates/repo_settings.html:22 +#: seahub/templates/repo_settings.html:24 msgid "Keep full history" msgstr "Kompletten Verlauf speichern" -#: seahub/templates/repo_settings.html:23 +#: seahub/templates/repo_settings.html:25 msgid "Don't keep history" msgstr "Verlauf nicht speichern" -#: seahub/templates/repo_settings.html:24 +#: seahub/templates/repo_settings.html:26 msgid "Only keep a period of history:" msgstr "Verlauf nur für einen bestimmten Zeitraum speichern:" -#: seahub/templates/repo_settings.html:24 +#: seahub/templates/repo_settings.html:27 msgid "days" msgstr "Tage" -#: seahub/templates/repo_settings.html:31 +#: seahub/templates/repo_settings.html:34 msgid "Transfer Ownership" msgstr "Besitz übertragen" -#: seahub/templates/repo_settings.html:33 +#: seahub/templates/repo_settings.html:36 msgid "Transfer this library to another user:" msgstr "Diese Bibliothek zu einem anderen Benutzer übertragen:" +#: seahub/templates/repo_settings.html:43 +msgid "Change Password" +msgstr "" + +#: seahub/templates/repo_settings.html:45 +msgid "Change the password of this library:" +msgstr "" + +#: seahub/templates/repo_settings.html:46 +msgid "Old Password" +msgstr "" + +#: seahub/templates/repo_settings.html:48 +msgid "New Password(at least 6 characters)" +msgstr "" + +#: seahub/templates/repo_settings.html:50 +msgid "New Password Again" +msgstr "" + +#: seahub/templates/repo_settings.html:173 +msgid "Please enter the old password" +msgstr "" + +#: seahub/templates/repo_settings.html:177 +msgid "Please enter the new password" +msgstr "" + +#: seahub/templates/repo_settings.html:181 +msgid "New password is too short" +msgstr "" + +#: seahub/templates/repo_settings.html:185 +msgid "New password is too long (maximum is 35 characters)" +msgstr "" + +#: seahub/templates/repo_settings.html:189 +msgid "Please enter the new password again" +msgstr "" + +#: seahub/templates/repo_settings.html:193 +msgid "New passwords don't match" +msgstr "" + #: seahub/templates/repo_view_snapshot.html:8 msgid "Back to modification history" msgstr "Zurück zur Bearbeitungsverlauf" @@ -4144,6 +4462,10 @@ msgstr "Zurück zur Bearbeitungsverlauf" msgid "Create Time" msgstr "Erstellungszeit" +#: seahub/templates/repo_view_snapshot.html:16 +msgid "Last Modifier" +msgstr "Letzter Bearbeiter/Letzte Bearbeiterin" + #: seahub/templates/repo_view_snapshot.html:17 #: seahub/templates/view_file_markdown.html:7 #: seahub/templates/view_file_text.html:18 @@ -4186,8 +4508,14 @@ msgstr "Ihr Seafile Client ist nicht mehr aktuell. Bitte aktualisieren Sie auf d msgid "Click to download." msgstr "Klicken zum Herunterladen." +#: seahub/templates/share_access_validation.html:6 +msgid "" +"Please input the password if you want to browse the shared file/directory. " +"And the password will be kept on the server for only 1 hour." +msgstr "" + #: seahub/templates/shared_file_view.html:26 -#: seahub/templates/view_shared_dir.html:9 +#: seahub/templates/view_shared_dir.html:8 msgid "Shared by: " msgstr "Freigegeben von:" @@ -4199,25 +4527,26 @@ msgstr "Speichern unter..." msgid "Save To:" msgstr "Speichern unter:" -#: seahub/templates/shared_link_email.html:2 +#: seahub/templates/shared_link_email.html:9 +#: seahub/templates/shared_upload_link_email.html:8 +#: seahub/templates/registration/password_reset_email.html:9 +#: seahub/templates/sysadmin/user_activation_email.html:9 +#: seahub/templates/sysadmin/user_add_email.html:9 +#: seahub/templates/sysadmin/user_reset_email.html:9 +msgid "Hi," +msgstr "" + +#: seahub/templates/shared_link_email.html:12 #, python-format -msgid "" -"You're receiving this e-mail because %(email)s is sharing a file to you on " -"%(site_name)s." -msgstr "Sie erhalten diese E-Mail, weil %(email)s auf %(site_name)s eine Datei mit Ihnen teilt." +msgid "%(email)s shared a file to you on %(site_name)s:" +msgstr "" -#: seahub/templates/shared_link_email.html:4 -msgid "Please go to the following page and view the file:" -msgstr "Bitte gehen Sie zur folgenden Seite um die Datei anzusehen:" - -#: seahub/templates/shared_upload_link_email.html:2 +#: seahub/templates/shared_upload_link_email.html:11 #, python-format -msgid "" -"You're receiving this e-mail because %(email)s has shared an upload link to " -"you on %(site_name)s." -msgstr "Sie erhalten diese E-Mail, weil %(email)s auf %(site_name)s einen Upload-Link mit Ihnen geteilt hat." +msgid "%(email)s shared an upload link to you on %(site_name)s." +msgstr "" -#: seahub/templates/shared_upload_link_email.html:4 +#: seahub/templates/shared_upload_link_email.html:15 msgid "You can go to the following page and upload your files:" msgstr "Bitte besuchen Sie die folgende Seite um Dateien hochzuladen:" @@ -4229,8 +4558,8 @@ msgstr "Favoriten" msgid "icon" msgstr "Symbol" -#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36 -#: seahub/templates/view_file_base.html:142 +#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37 +#: seahub/templates/view_file_base.html:144 msgid "Unstar" msgstr "Nicht mehr favorisieren" @@ -4285,49 +4614,49 @@ msgstr "zu" msgid "Sorry, this user is not registered yet." msgstr "Dieser Benutzer ist nicht registriert." -#: seahub/templates/view_file_base.html:38 -#: seahub/templates/view_file_base.html:138 +#: seahub/templates/view_file_base.html:39 +#: seahub/templates/view_file_base.html:140 msgid "Star" msgstr "Favorisieren" -#: seahub/templates/view_file_base.html:55 +#: seahub/templates/view_file_base.html:56 #: seahub/templates/view_file_markdown.html:7 #: seahub/templates/view_file_text.html:18 msgid "updated this file" msgstr "Datei wurde aktualisiert" -#: seahub/templates/view_file_base.html:59 +#: seahub/templates/view_file_base.html:60 #, python-format msgid "one contributor" msgid_plural " %(counter)s contributors " msgstr[0] "Ein Bearbeiter" msgstr[1] " %(counter)s Bearbeiter" -#: seahub/templates/view_file_base.html:136 +#: seahub/templates/view_file_base.html:138 msgid "Unstarred successfully" msgstr "erfolgreicht nicht mehr favorisiert" -#: seahub/templates/view_file_base.html:140 +#: seahub/templates/view_file_base.html:142 msgid "Starred successfully" msgstr "erfolgreich favorisiert" #: seahub/templates/view_file_image.html:15 -#: seahub/templates/snippets/file_content_html.html:31 +#: seahub/templates/snippets/file_content_html.html:30 msgid "you can also press ← " msgstr "Sie können auch ← drücken " #: seahub/templates/view_file_image.html:15 -#: seahub/templates/snippets/file_content_html.html:31 +#: seahub/templates/snippets/file_content_html.html:30 msgid "prev" msgstr "vorherige" #: seahub/templates/view_file_image.html:21 -#: seahub/templates/snippets/file_content_html.html:37 +#: seahub/templates/snippets/file_content_html.html:36 msgid "you can also press → " msgstr "Sie können auch → drücken " #: seahub/templates/view_file_image.html:21 -#: seahub/templates/snippets/file_content_html.html:37 +#: seahub/templates/snippets/file_content_html.html:36 msgid "next" msgstr "nächste" @@ -4346,7 +4675,7 @@ msgid "auto detect" msgstr "Automatisch feststellen" #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "" " / / " #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "Full Screen" msgstr "Vollbild" #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 +#: seahub/templates/snippets/file_content_js.html:89 msgid "loading..." msgstr "Laden…" #: seahub/templates/view_file_pdf.html:77 -#: seahub/templates/snippets/file_content_js.html:110 +#: seahub/templates/snippets/file_content_js.html:136 msgid "" "You can use IE 10 or other browsers, for example, firefox, to view it " "online." msgstr "Sie können IE 10 oder zum Beispiel Firefox benutzen, um es online zu betrachten." #: seahub/templates/view_file_svg.html:7 -#: seahub/templates/snippets/file_content_js.html:41 +#: seahub/templates/snippets/file_content_js.html:63 msgid "To view it online, you can use firefox, chrome or IE 9." msgstr "Um es online zu betrachten, können Sie Firefox, Chrome oder IE 9 benutzen." #: seahub/templates/view_file_unknown.html:6 -#: seahub/templates/snippets/file_content_js.html:124 +#: seahub/templates/snippets/file_content_js.html:150 msgid "This type of file cannot be viewed online." msgstr "Dieser Dateityp kann nicht online betrachtet werden." -#: seahub/templates/view_shared_dir.html:26 +#: seahub/templates/view_shared_dir.html:22 msgid "ZIP" msgstr "ZIP" @@ -4393,41 +4722,55 @@ msgstr "Dateien hochladen zu %(dir_name)s" msgid "shared by:" msgstr "freigegeben von:" -#: seahub/templates/registration/login.html:11 +#: seahub/templates/registration/login.html:4 +#: seahub/templates/registration/login.html:32 +#: seahub/templates/registration/login.html:60 +#: seahub/templates/registration/password_reset_complete.html:8 +#: seahub/templates/sysadmin/user_activation_email.html:15 +#: seahub/templates/sysadmin/user_add_email.html:25 +msgid "Log In" +msgstr "Anmelden" + +#: seahub/templates/registration/login.html:37 msgid "(forgot password)" msgstr "(Passwort vergessen)" -#: seahub/templates/registration/login.html:14 +#: seahub/templates/registration/login.html:40 msgid "CAPTCHA" msgstr "CAPTCHA" -#: seahub/templates/registration/login.html:16 +#: seahub/templates/registration/login.html:42 msgid "Not clear? Refresh it." msgstr "Nicht lesbar? Jetzt Aktualisieren." -#: seahub/templates/registration/login.html:23 +#: seahub/templates/registration/login.html:49 msgid "Incorrect email or password" msgstr "E-Mail-Adresse oder Passwort sind falsch" -#: seahub/templates/registration/login.html:31 +#: seahub/templates/registration/login.html:57 #, python-format msgid "Remember me for %(remember_days)s days " msgstr "Meinen Login für %(remember_days)s Tage speichern" -#: seahub/templates/registration/login.html:61 +#: seahub/templates/registration/login.html:62 +#: seahub/templates/registration/registration_form.html:6 +msgid "Signup" +msgstr "Registrieren" + +#: seahub/templates/registration/login.html:87 msgid "Failed to refresh the CAPTCHA, please try again later." msgstr "CAPTCHA Aktualisierung fehlgeschlagen, bitte versuchen Sie es später noch einmal." -#: seahub/templates/registration/login.html:68 -#: seahub/templates/registration/registration_form.html:47 +#: seahub/templates/registration/login.html:94 +#: seahub/templates/registration/registration_form.html:49 #: seahub/templates/sysadmin/repoadmin_js.html:21 -#: seahub/templates/sysadmin/sys_useradmin.html:56 +#: seahub/templates/sysadmin/sys_useradmin.html:94 msgid "Email cannot be blank" msgstr "E-Mail-Adress darf nicht leer sein" -#: seahub/templates/registration/login.html:72 -#: seahub/templates/registration/registration_form.html:51 -#: seahub/templates/sysadmin/sys_useradmin.html:60 +#: seahub/templates/registration/login.html:98 +#: seahub/templates/registration/registration_form.html:53 +#: seahub/templates/sysadmin/sys_useradmin.html:98 msgid "Password cannot be blank" msgstr "Passwort darf nicht leer sein" @@ -4481,13 +4824,13 @@ msgstr "Passwort wurde erfolgreich zurückgesetzt." #: seahub/templates/registration/password_reset_confirm.html:4 #: seahub/templates/registration/password_reset_form.html:4 #: seahub/templates/registration/password_reset_form.html:7 -#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468 +#: seahub/templates/sysadmin/useradmin_js.html:7 msgid "Password Reset" msgstr "Passwort zurücksetzen" #: seahub/templates/registration/password_reset_confirm.html:11 -msgid "Input new password" -msgstr "Neues Passwort eingeben" +msgid "Reset Password" +msgstr "" #: seahub/templates/registration/password_reset_confirm.html:26 msgid "Failed to reset password: this link is no longer available." @@ -4498,23 +4841,19 @@ msgid "Password Reset Successfully" msgstr "Passwort wurde erfolgreich zurückgesetzt" #: seahub/templates/registration/password_reset_done.html:8 -msgid "We've send a password reset email to your email." -msgstr "Wir haben Ihnen eine E-Mail geschickt, mit der Sie Ihr Passwort zurücksetzen können." +msgid "We've sent a password reset email to your mailbox." +msgstr "" -#: seahub/templates/registration/password_reset_email.html:2 +#: seahub/templates/registration/password_reset_email.html:12 #, python-format msgid "" -"You're receiving this e-mail because you requested a password reset for your" -" user account at %(site_name)s. " -msgstr "Sie erhalten diese E-Mail, weil Sie eine Anfrage zur Passwortrücksetzung für Ihren Benutzerkonto auf %(site_name)s angefordert haben. " +"To reset the password of your account %(account)s on %(site_name)s, please " +"click the following link: " +msgstr "" -#: seahub/templates/registration/password_reset_email.html:4 -msgid "Please go to the following page and choose a new password:" -msgstr "Bitte besuchen Sie die folgende Seite und wählen Sie ein neues Passwort:" - -#: seahub/templates/registration/password_reset_email.html:8 -msgid "Your username, in case you've forgotten:" -msgstr "Ihr Benutzername, falls Sie ihn vergessen haben: " +#: seahub/templates/registration/password_reset_email.html:17 +msgid "If you did not request it, just skip it." +msgstr "" #: seahub/templates/registration/password_reset_form.html:9 msgid "Your email used in login: " @@ -4544,23 +4883,31 @@ msgstr "Die Registrierung ist abgeschlossen, bitte warten Sie, bis ein Administr msgid "Register" msgstr "Registrieren" -#: seahub/templates/registration/registration_form.html:7 +#: seahub/templates/registration/registration_form.html:9 msgid "Welcome back, you are already signed in." msgstr "Willkommen zurück, Sie sind bereits eingeloggt." -#: seahub/templates/registration/registration_form.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:28 +#: seahub/templates/registration/registration_form.html:21 +#: seahub/templates/sysadmin/sys_useradmin.html:33 msgid "Confirm Password" msgstr "Passwort bestätigen" -#: seahub/templates/registration/registration_form.html:55 -#: seahub/templates/snippets/repo_create_js.html:58 -#: seahub/templates/sysadmin/sys_useradmin.html:64 +#: seahub/templates/registration/registration_form.html:34 +msgid "Sign Up" +msgstr "" + +#: seahub/templates/registration/registration_form.html:57 +#: seahub/templates/snippets/repo_create_js.html:53 +#: seahub/templates/snippets/shared_link_js.html:235 +#: seahub/templates/snippets/shared_link_js.html:404 +#: seahub/templates/sysadmin/sys_useradmin.html:102 msgid "Please enter the password again" msgstr "Bitte geben Sie das Passwort erneut ein" -#: seahub/templates/registration/registration_form.html:59 -#: seahub/templates/snippets/repo_create_js.html:62 +#: seahub/templates/registration/registration_form.html:61 +#: seahub/templates/snippets/repo_create_js.html:57 +#: seahub/templates/snippets/shared_link_js.html:239 +#: seahub/templates/snippets/shared_link_js.html:408 msgid "Passwords don't match" msgstr "Passwörter stimmen nicht überein" @@ -4580,12 +4927,6 @@ msgstr " ist zu groß. Die maximale Größe beträgt 1MB." msgid "Discuss" msgstr "Diskutieren" -#: seahub/templates/snippets/bottom_bar.html:3 -#: seahub/templates/snippets/my_owned_repos.html:11 -#: seahub/templates/snippets/my_owned_repos.html:166 -msgid "Group" -msgstr "Gruppe" - #: seahub/templates/snippets/bottom_bar.html:66 msgid "Please select at least 1 group." msgstr "Bitte geben Sie mindestens eine Gruppe an." @@ -4594,10 +4935,6 @@ msgstr "Bitte geben Sie mindestens eine Gruppe an." msgid "Please input a discussion." msgstr "Bitte geben Sie einen Beitrag ein." -#: seahub/templates/snippets/current_commit.html:12 -msgid "Generated by system" -msgstr "Vom System generiert" - #: seahub/templates/snippets/file_share_popup.html:3 #, python-format msgid "Share %(name)s" @@ -4616,42 +4953,66 @@ msgstr "Upload-Link" msgid "Private Share" msgstr "Private Freigabe" -#: seahub/templates/snippets/file_share_popup.html:30 -#: seahub/templates/snippets/file_share_popup.html:50 +#: seahub/templates/snippets/file_share_popup.html:34 +#: seahub/templates/snippets/file_share_popup.html:75 +msgid "Use Password" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:36 +#: seahub/templates/snippets/file_share_popup.html:77 +msgid "(at least 6 characters)" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:38 +#: seahub/templates/snippets/file_share_popup.html:79 +#: seahub/templates/snippets/repo_create_form.html:22 +msgid "Password again" +msgstr "Passwort erneut eingeben" + +#: seahub/templates/snippets/file_share_popup.html:43 +msgid "Set Expiration" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:45 +msgid "Days" +msgstr "" + +#: seahub/templates/snippets/file_share_popup.html:51 +#: seahub/templates/snippets/file_share_popup.html:84 msgid "Generate" msgstr "Erzeugen" -#: seahub/templates/snippets/file_share_popup.html:32 +#: seahub/templates/snippets/file_share_popup.html:53 msgid "Link: " msgstr "Link: " -#: seahub/templates/snippets/file_share_popup.html:33 -#: seahub/templates/snippets/file_share_popup.html:53 +#: seahub/templates/snippets/file_share_popup.html:54 +#: seahub/templates/snippets/file_share_popup.html:87 msgid "Send" msgstr "Senden" -#: seahub/templates/snippets/file_share_popup.html:37 -#: seahub/templates/snippets/file_share_popup.html:57 +#: seahub/templates/snippets/file_share_popup.html:58 +#: seahub/templates/snippets/file_share_popup.html:91 msgid "Send to:" msgstr "Senden an:" -#: seahub/templates/snippets/file_share_popup.html:38 -#: seahub/templates/snippets/file_share_popup.html:58 +#: seahub/templates/snippets/file_share_popup.html:59 +#: seahub/templates/snippets/file_share_popup.html:92 msgid "Emails, Seperated by ','" msgstr "E-Mail-Adressen, getrennt durch ','" -#: seahub/templates/snippets/file_share_popup.html:43 -#: seahub/templates/snippets/file_share_popup.html:63 +#: seahub/templates/snippets/file_share_popup.html:64 +#: seahub/templates/snippets/file_share_popup.html:97 msgid "Sending..." msgstr "Senden..." -#: seahub/templates/snippets/file_share_popup.html:49 +#: seahub/templates/snippets/file_share_popup.html:70 msgid "" "You can share the generated link to others and then they can upload files to" " this directory via the link." msgstr "Wenn Sie diesen generierten Link mit anderen Teilen können diese Personen in den Ordner Dateien hochladen." -#: seahub/templates/snippets/file_share_popup.html:52 +#: seahub/templates/snippets/file_share_popup.html:86 msgid "Upload Link: " msgstr "Upload-Link:" @@ -4704,7 +5065,7 @@ msgid "Sub-libraries" msgstr "Verschachtelte Bibliotheken" #: seahub/templates/snippets/my_owned_repos.html:10 -#: seahub/templates/sysadmin/userinfo.html:62 +#: seahub/templates/sysadmin/userinfo.html:56 msgid "Shared" msgstr "Freigaben" @@ -4735,29 +5096,23 @@ msgid "" " library." msgstr "Sie können eine verschachtelte Bibliothek aus einem Ordner innerhalb einer Bibliothek erstellen. Eine verschachtelte Bibliothek kann unabhängig synchronisiert und freigegeben werden. Die verschachtelte Bibliothek wird automatisch mit der übergelagerten Bibliothek abgeglichen." -#: seahub/templates/snippets/my_owned_repos.html:156 -msgid "No library is shared to you" -msgstr "Es ist keine Bibliothek für Sie freigegeben" - -#: seahub/templates/snippets/my_owned_repos.html:207 -msgid "No library is shared to your groups" -msgstr "Es ist keine Bibliothek in Ihren Gruppen freigegeben" - #: seahub/templates/snippets/office_convert_html.html:4 +#: seahub/templates/snippets/spreadsheet_convert_html.html:4 msgid "The file is being processed, please wait..." msgstr "Diese Datei wird gerade verarbeitet, bitte warten..." -#: seahub/templates/snippets/office_convert_js.html:39 +#: seahub/templates/snippets/office_convert_js.html:40 msgid "hide outline" msgstr "Kontur verbergen" -#: seahub/templates/snippets/office_convert_js.html:40 +#: seahub/templates/snippets/office_convert_js.html:41 msgid "show outline" msgstr "Kontur anzeigen" -#: seahub/templates/snippets/office_convert_js.html:163 -#: seahub/templates/snippets/office_convert_js.html:170 -#: seahub/templates/snippets/office_convert_js.html:195 +#: seahub/templates/snippets/office_convert_js.html:168 +#: seahub/templates/snippets/office_convert_js.html:175 +#: seahub/templates/snippets/office_convert_js.html:200 +#: seahub/templates/snippets/spreadsheet_convert_js.html:30 msgid "Document convertion failed." msgstr "Dokumentenkonvertierung fehlgeschlagen." @@ -4774,27 +5129,29 @@ msgstr "Verschlüsseln" msgid "(at least %(repo_password_min_length)s characters)" msgstr "(mindestens %(repo_password_min_length)s Zeichen)" -#: seahub/templates/snippets/repo_create_form.html:22 -msgid "Password again" -msgstr "Passwort erneut eingeben" - -#: seahub/templates/snippets/repo_create_js.html:34 +#: seahub/templates/snippets/repo_create_js.html:29 msgid "Name is required" msgstr "Name wird benötigt" -#: seahub/templates/snippets/repo_create_js.html:38 +#: seahub/templates/snippets/repo_create_js.html:33 msgid "Description is required" msgstr "Beschreibung wird benötigt" -#: seahub/templates/snippets/repo_create_js.html:46 +#: seahub/templates/snippets/repo_create_js.html:41 +#: seahub/templates/snippets/shared_link_js.html:223 +#: seahub/templates/snippets/shared_link_js.html:392 msgid "Please enter password" msgstr "Bitte geben Sie ein Passwort ein" -#: seahub/templates/snippets/repo_create_js.html:50 +#: seahub/templates/snippets/repo_create_js.html:45 +#: seahub/templates/snippets/shared_link_js.html:227 +#: seahub/templates/snippets/shared_link_js.html:396 msgid "Password is too short" msgstr "Passwort ist zu kurz" -#: seahub/templates/snippets/repo_create_js.html:54 +#: seahub/templates/snippets/repo_create_js.html:49 +#: seahub/templates/snippets/shared_link_js.html:231 +#: seahub/templates/snippets/shared_link_js.html:400 msgid "Password is too long (maximum is 35 characters)" msgstr "Passwort ist zu lang (Maximal 35 Zeichen)" @@ -4807,7 +5164,7 @@ msgstr "Erfolgreich gelöscht." msgid "Really want to delete %(lib_name)s ?" msgstr "Möchten Sie %(lib_name)s wirklich löschen?" -#: seahub/templates/snippets/repo_dir_data.html:15 +#: seahub/templates/snippets/repo_dir_data.html:14 msgid "Upload" msgstr "Hochladen" @@ -4934,15 +5291,23 @@ msgid "" "Please select at least one file type or input at least one file extension" msgstr "Bitte mindestens einen Dateityp/Dateierweiterung eingeben" -#: seahub/templates/snippets/shared_link_js.html:79 +#: seahub/templates/snippets/shared_link_js.html:120 msgid "Select contacts" msgstr "Kontakte auswählen" -#: seahub/templates/snippets/shared_link_js.html:121 -#: seahub/templates/snippets/shared_link_js.html:243 +#: seahub/templates/snippets/shared_link_js.html:164 +#: seahub/templates/snippets/shared_link_js.html:338 msgid "Please input at least an email." msgstr "Bitte geben Sie mindestens eine E-Mail-Adresse an." +#: seahub/templates/snippets/shared_link_js.html:250 +msgid "Please enter days" +msgstr "" + +#: seahub/templates/snippets/shared_link_js.html:256 +msgid "Please enter valid days" +msgstr "" + #: seahub/templates/snippets/space_and_traffic.html:4 #: seahub/templates/snippets/space_and_traffic.html:12 msgid "Used:" @@ -4955,7 +5320,7 @@ msgstr "Eigenes" #: seahub/templates/snippets/space_and_traffic.html:6 #: seahub/templates/snippets/space_and_traffic.html:8 -#: seahub/templates/sysadmin/userinfo.html:41 +#: seahub/templates/sysadmin/userinfo.html:35 msgid "Sharing" msgstr "Link freigeben" @@ -4967,6 +5332,22 @@ msgstr "Datenvolumen in diesem Monat:" msgid "Payment" msgstr "Bezahlung" +#: seahub/templates/sysadmin/base.html:12 +msgid "Users" +msgstr "Benutzer" + +#: seahub/templates/sysadmin/base.html:18 +msgid "Notifications" +msgstr "Benachrichtigungen" + +#: seahub/templates/sysadmin/base.html:25 +msgid "Traffic" +msgstr "" + +#: seahub/templates/sysadmin/base.html:30 +msgid "Logs" +msgstr "" + #: seahub/templates/sysadmin/repo_transfer_form.html:3 msgid "Transfer Library" msgstr "Bibliothek übertragen" @@ -4977,74 +5358,74 @@ msgid "Transfer %(lib_name)s to:" msgstr "%(lib_name)s übertragen an:" #: seahub/templates/sysadmin/repoadmin_table.html:6 -#: seahub/templates/sysadmin/sys_publink_admin.html:11 -#: seahub/templates/sysadmin/sys_repo_search.html:10 +#: seahub/templates/sysadmin/sys_publink_admin.html:13 +#: seahub/templates/sysadmin/sys_repo_search.html:12 msgid "Owner" msgstr "Besitzer" -#: seahub/templates/sysadmin/sys_group_admin.html:8 -msgid "All Groups" -msgstr "Alle Gruppen" - -#: seahub/templates/sysadmin/sys_group_admin.html:13 +#: seahub/templates/sysadmin/sys_group_admin.html:14 #: seahub/templates/sysadmin/sys_org_admin.html:13 msgid "Creator" msgstr "Ersteller" -#: seahub/templates/sysadmin/sys_group_admin.html:14 +#: seahub/templates/sysadmin/sys_group_admin.html:15 #: seahub/templates/sysadmin/sys_org_admin.html:14 -#: seahub/templates/sysadmin/sys_publink_admin.html:12 +#: seahub/templates/sysadmin/sys_publink_admin.html:14 msgid "Create At" msgstr "Erstellt am" -#: seahub/templates/sysadmin/sys_group_admin.html:62 +#: seahub/templates/sysadmin/sys_group_admin.html:63 msgid "Delete Group" msgstr "Gruppe löschen" #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8 -#: seahub/templates/sysadmin/sys_useradmin.html:8 +#: seahub/templates/sysadmin/sys_useradmin.html:7 +msgid "Search users..." +msgstr "" + +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15 msgid "Database" msgstr "Datenbank" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9 -#: seahub/templates/sysadmin/sys_useradmin.html:10 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16 +#: seahub/templates/sysadmin/sys_useradmin.html:18 msgid "LDAP" msgstr "LDAP" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11 -#: seahub/templates/sysadmin/sys_list_orphan.html:12 -#: seahub/templates/sysadmin/sys_list_system.html:12 -#: seahub/templates/sysadmin/sys_repo_admin.html:12 -#: seahub/templates/sysadmin/sys_useradmin.html:13 -msgid "Search" -msgstr "Suchen" - -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19 -#: seahub/templates/sysadmin/useradmin_table.html:7 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23 +#: seahub/templates/sysadmin/useradmin_table.html:8 +#: seahub/templates/sysadmin/useradmin_table.html:73 msgid "Create At / Last Login" msgstr "Erstellt am / Letzer Login" -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20 -#: seahub/templates/sysadmin/useradmin_table.html:6 -#: seahub/templates/sysadmin/userinfo.html:37 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24 +#: seahub/templates/sysadmin/useradmin_table.html:7 +#: seahub/templates/sysadmin/useradmin_table.html:72 +#: seahub/templates/sysadmin/userinfo.html:31 msgid "Space Used" msgstr "Benutzter Speicherplatz" -#: seahub/templates/sysadmin/sys_list_orphan.html:8 -#: seahub/templates/sysadmin/sys_list_system.html:8 -#: seahub/templates/sysadmin/sys_repo_admin.html:8 +#: seahub/templates/sysadmin/sys_list_orphan.html:7 +#: seahub/templates/sysadmin/sys_list_system.html:7 +#: seahub/templates/sysadmin/sys_repo_admin.html:7 +msgid "Search libraries by name..." +msgstr "" + +#: seahub/templates/sysadmin/sys_list_orphan.html:14 +#: seahub/templates/sysadmin/sys_list_system.html:14 +#: seahub/templates/sysadmin/sys_repo_admin.html:14 msgid "All" msgstr "Alle" -#: seahub/templates/sysadmin/sys_list_orphan.html:9 -#: seahub/templates/sysadmin/sys_list_system.html:9 -#: seahub/templates/sysadmin/sys_repo_admin.html:9 +#: seahub/templates/sysadmin/sys_list_orphan.html:15 +#: seahub/templates/sysadmin/sys_list_system.html:15 +#: seahub/templates/sysadmin/sys_repo_admin.html:15 msgid "Orphan" msgstr "Verwaiste" -#: seahub/templates/sysadmin/sys_list_orphan.html:10 -#: seahub/templates/sysadmin/sys_list_system.html:10 -#: seahub/templates/sysadmin/sys_repo_admin.html:10 +#: seahub/templates/sysadmin/sys_list_orphan.html:16 +#: seahub/templates/sysadmin/sys_list_system.html:16 +#: seahub/templates/sysadmin/sys_repo_admin.html:16 msgid "System" msgstr "System" @@ -5060,96 +5441,117 @@ msgstr "URL-Präfix" msgid "Delete Organization" msgstr "Organisation löschen" -#: seahub/templates/sysadmin/sys_publink_admin.html:6 +#: seahub/templates/sysadmin/sys_publink_admin.html:7 msgid "All Public Links" msgstr "Alle öffentlichen Links" -#: seahub/templates/sysadmin/sys_publink_admin.html:13 +#: seahub/templates/sysadmin/sys_publink_admin.html:15 msgid "Count" msgstr "Anzahl" -#: seahub/templates/sysadmin/sys_repo_search.html:5 +#: seahub/templates/sysadmin/sys_repo_search.html:7 msgid "Search Library" msgstr "Bibliothek durchsuchen" -#: seahub/templates/sysadmin/sys_repo_search.html:8 +#: seahub/templates/sysadmin/sys_repo_search.html:10 msgid "Tip: you can search by keyword in name or owner or both." msgstr "Tipp: Sie können Name und/oder Besitzer durchsuchen" -#: seahub/templates/sysadmin/sys_repo_search.html:14 -#: seahub/templates/sysadmin/user_search.html:12 +#: seahub/templates/sysadmin/sys_repo_search.html:16 +#: seahub/templates/sysadmin/user_search.html:14 msgid "Result" msgstr "Ergebnis" -#: seahub/templates/sysadmin/sys_repo_search.html:18 -#: seahub/templates/sysadmin/user_search.html:16 +#: seahub/templates/sysadmin/sys_repo_search.html:20 +#: seahub/templates/sysadmin/user_search.html:18 msgid "No result" msgstr "Kein Ergebnis" -#: seahub/templates/sysadmin/sys_useradmin.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:23 -msgid "Add new user" -msgstr "Neuen Benutzer hinzufügen" +#: seahub/templates/sysadmin/sys_trafficadmin.html:19 +msgid "User Traffic" +msgstr "" -#: seahub/templates/sysadmin/sys_useradmin.html:38 -#: seahub/templates/sysadmin/user_search.html:20 +#: seahub/templates/sysadmin/sys_trafficadmin.html:22 +msgid "Month:" +msgstr "" + +#: seahub/templates/sysadmin/sys_trafficadmin.html:28 +#: seahub/templates/sysadmin/sys_useradmin.html:15 +msgid "User" +msgstr "" + +#: seahub/templates/sysadmin/sys_trafficadmin.html:29 +msgid "Total Usage" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:22 +#: seahub/templates/sysadmin/sys_useradmin.html:28 +msgid "Add user" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:23 +msgid "Add admin" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:39 +msgid "Add admins" +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:46 +msgid "Tip: the emails should be the users already added." +msgstr "" + +#: seahub/templates/sysadmin/sys_useradmin.html:58 +#: seahub/templates/sysadmin/user_search.html:22 msgid "Activating..., please wait" msgstr "Aktiviere... bitte warten" -#: seahub/templates/sysadmin/sys_useradmin.html:68 +#: seahub/templates/sysadmin/sys_useradmin.html:106 msgid "Passwords do not match" msgstr "Passwörter stimmen nicht überein" -#: seahub/templates/sysadmin/user_add_email.html:3 +#: seahub/templates/sysadmin/user_activation_email.html:12 +#, python-format +msgid "Your account %(username)s on %(site_name)s has been activated." +msgstr "" + +#: seahub/templates/sysadmin/user_add_email.html:13 #, python-format msgid "" -"You're receiving this e-mail because %(user)s added you to organization " -"\"%(org.org_name)s\" on %(site_name)s." -msgstr "Sie erhalten diese E-Mail, weil %(user)s Sie zur Organisation \"%(org.org_name)s\" auf %(site_name)s hinzugefügt hat." +"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s." +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:5 +#: seahub/templates/sysadmin/user_add_email.html:15 #, python-format -msgid "" -"You're receiving this e-mail because %(user)s added you to %(site_name)s." -msgstr "Sie erhalten diese E-Mail, weil %(user)s Sie zu %(site_name)s hinzugefügt hat." +msgid "%(user)s invited you to join %(site_name)s." +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:7 -msgid "Following is your account information:" -msgstr "Nachfolgend finden Sie Ihre Benutzerkontoinformationen:" +#: seahub/templates/sysadmin/user_add_email.html:20 +msgid "Here is your account information:" +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:8 +#: seahub/templates/sysadmin/user_add_email.html:21 #, python-format msgid "Email: %(email)s" msgstr "E-Mail: %(email)s" -#: seahub/templates/sysadmin/user_add_email.html:9 +#: seahub/templates/sysadmin/user_add_email.html:22 #, python-format -msgid "Password: %(password)s" -msgstr "Passwort: %(password)s" +msgid "Password: %(password)s" +msgstr "" -#: seahub/templates/sysadmin/user_add_email.html:11 -msgid "Please go to the following page and log in:" -msgstr "Bitte besuchen Sie die folgende Seite um sich einzuloggen:" - -#: seahub/templates/sysadmin/user_reset_email.html:2 +#: seahub/templates/sysadmin/user_reset_email.html:12 #, python-format msgid "" -"You're receiving this e-mail because staff has reset your password at " -"%(site_name)s. " -msgstr "Sie erhalten diese E-Mail, weil ein Gruppenverwalter Ihr Passwort auf %(site_name)s geändert hat." +"Your password on %(site_name)s has been reset. Now it is %(password)s. " +"Please change it as soon as possible. " +msgstr "" -#: seahub/templates/sysadmin/user_reset_email.html:4 -#, python-format -msgid "" -"Your new password is %(password)s, please modify your password as soon as " -"possible." -msgstr "Ihr neues Passwort ist %(password)s. Bitte ändern Sie es so bald wie möglich." - -#: seahub/templates/sysadmin/user_search.html:5 +#: seahub/templates/sysadmin/user_search.html:7 msgid "Search User" msgstr "Benutzer suchen" -#: seahub/templates/sysadmin/user_search.html:8 +#: seahub/templates/sysadmin/user_search.html:10 msgid "Tip: Use * to match any number of characters." msgstr "Tipp: Benutzen Sie * um eine beliebige Anzahl von Zeichen zu suchen" @@ -5163,7 +5565,7 @@ msgid "Are you sure you want to reset the password of %s ?" msgstr "Sind Sie sicher, dass Sie das Passwort für %s zurücksetzen wollen?" #: seahub/templates/sysadmin/useradmin_js.html:11 -#: seahub/templates/sysadmin/useradmin_table.html:49 +#: seahub/templates/sysadmin/useradmin_table.html:117 msgid "Revoke Admin" msgstr "Adminrechte entziehen" @@ -5173,7 +5575,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?" msgstr "Sind Sie sicher, dass Sie %s die Administratorenrechte entziehen wollen?" #: seahub/templates/sysadmin/useradmin_js.html:15 -#: seahub/templates/sysadmin/useradmin_table.html:51 msgid "Set Admin" msgstr "Administration" @@ -5192,437 +5593,466 @@ msgid "" "configuration." msgstr "Bearbeitung erfolgreich, allerdings konnte keine E-Mail gesendet werden. Bitte prüfen Sie die Konfiguration Ihres E-Mail-Dienstes." -#: seahub/templates/sysadmin/useradmin_table.html:5 +#: seahub/templates/sysadmin/useradmin_table.html:6 +#: seahub/templates/sysadmin/useradmin_table.html:71 msgid "Status" msgstr "Status" -#: seahub/templates/sysadmin/useradmin_table.html:19 -#: seahub/templates/sysadmin/useradmin_table.html:26 +#: seahub/templates/sysadmin/useradmin_table.html:20 +#: seahub/templates/sysadmin/useradmin_table.html:27 +#: seahub/templates/sysadmin/useradmin_table.html:86 +#: seahub/templates/sysadmin/useradmin_table.html:93 msgid "Active" msgstr "Aktiv" -#: seahub/templates/sysadmin/useradmin_table.html:21 -#: seahub/templates/sysadmin/useradmin_table.html:27 +#: seahub/templates/sysadmin/useradmin_table.html:22 +#: seahub/templates/sysadmin/useradmin_table.html:28 +#: seahub/templates/sysadmin/useradmin_table.html:88 +#: seahub/templates/sysadmin/useradmin_table.html:94 msgid "Inactive" msgstr "Inaktiv" -#: seahub/templates/sysadmin/useradmin_table.html:47 +#: seahub/templates/sysadmin/useradmin_table.html:50 +#: seahub/templates/sysadmin/useradmin_table.html:116 msgid "ResetPwd" msgstr "Passwort zurücksetzen" -#: seahub/templates/sysadmin/userinfo.html:39 +#: seahub/templates/sysadmin/userinfo.html:7 +msgid "Back to user list" +msgstr "" + +#: seahub/templates/sysadmin/userinfo.html:33 msgid "Total" msgstr "Insgesamt" -#: seahub/templates/sysadmin/userinfo.html:40 +#: seahub/templates/sysadmin/userinfo.html:34 msgid "Used" msgstr "Benutzt" -#: seahub/templates/sysadmin/userinfo.html:45 +#: seahub/templates/sysadmin/userinfo.html:39 msgid "Set Quota" msgstr "Quota setzen" -#: seahub/templates/sysadmin/userinfo.html:48 +#: seahub/templates/sysadmin/userinfo.html:42 msgid "Set user storage limit" msgstr "Speicherplatz für Benutzer limitieren" -#: seahub/templates/sysadmin/userinfo.html:51 +#: seahub/templates/sysadmin/userinfo.html:45 msgid "Tip: 0 means default limit" msgstr "Tipp: 0 heißt es wird das Standardlimit verwendet" -#: seahub/templates/sysadmin/userinfo.html:61 +#: seahub/templates/sysadmin/userinfo.html:55 msgid "Owned" msgstr "Besitzer" -#: seahub/templates/wiki/personal_wiki.html:13 +#: seahub/templates/wiki/personal_wiki.html:32 msgid "You do not have personal wiki" msgstr "Sie haben kein persönliches Wiki." -#: seahub/templates/wiki/personal_wiki.html:20 +#: seahub/templates/wiki/personal_wiki.html:42 msgid "personal-wiki" msgstr "Mein Wiki" -#: seahub/templates/wiki/personal_wiki.html:22 +#: seahub/templates/wiki/personal_wiki.html:44 msgid "Personal Wiki Pages" msgstr "Mein Wiki" -#: seahub/utils/__init__.py:97 +#: seahub/utils/__init__.py:100 msgid "permission error" msgstr "Berechtigungsfehler" -#: seahub/views/__init__.py:401 +#: seahub/views/__init__.py:429 msgid "Unable to view recycle page" msgstr "Papierkorb kann nicht angezeigt werden." -#: seahub/views/__init__.py:427 seahub/views/ajax.py:216 -#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457 -#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600 -#: seahub/views/ajax.py:760 seahub/views/ajax.py:923 +#: seahub/views/__init__.py:455 seahub/views/ajax.py:231 +#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479 +#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622 +#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086 msgid "Library does not exist." msgstr "Die Bibliothek existiert nicht." -#: seahub/views/__init__.py:438 +#: seahub/views/__init__.py:466 msgid "You do not have permission to perform this action." msgstr "Sie haben nicht die benötigte Berechtigung." -#: seahub/views/__init__.py:445 seahub/views/__init__.py:502 +#: seahub/views/__init__.py:473 seahub/views/__init__.py:530 msgid "Failed to edit library information." msgstr "Kann Bibliotheksinformationen nicht ändern." -#: seahub/views/__init__.py:453 seahub/views/__init__.py:511 +#: seahub/views/__init__.py:481 seahub/views/__init__.py:539 msgid "Failed to save settings on server" msgstr "Speichern der Einstellungen auf dem Server fehlgeschlagen" -#: seahub/views/__init__.py:460 seahub/views/__init__.py:514 +#: seahub/views/__init__.py:488 seahub/views/__init__.py:542 msgid "Settings saved." msgstr "Einstellungen gespeichert." -#: seahub/views/__init__.py:550 +#: seahub/views/__init__.py:603 #, python-format msgid "Username %s is not valid." msgstr "Benutzername %s ist ungültig." -#: seahub/views/__init__.py:557 +#: seahub/views/__init__.py:610 #, python-format msgid "User %s is not found." msgstr "Benutzer %s nicht gefunden." -#: seahub/views/__init__.py:563 +#: seahub/views/__init__.py:616 #, python-format msgid "Library %(repo_name)s has been transfered to %(new_owner)s." msgstr "Bibliothek %(repo_name)s wurde zu %(new_owner)s transferiert." -#: seahub/views/__init__.py:571 +#: seahub/views/__init__.py:648 +#, python-format +msgid "Successfully updated the password of Library %(repo_name)s." +msgstr "" + +#: seahub/views/__init__.py:655 msgid "Filename contains invalid character" msgstr "Dateiname enthält unzulässiges Zeichen" -#: seahub/views/__init__.py:573 +#: seahub/views/__init__.py:657 msgid "Duplicated filename" msgstr "Doppelter Dateiname" -#: seahub/views/__init__.py:577 +#: seahub/views/__init__.py:661 msgid "File size surpasses the limit" msgstr "Dateigröße überschreitet das Limit" -#: seahub/views/__init__.py:579 +#: seahub/views/__init__.py:663 msgid "The space of owner is used up, upload failed" msgstr "Der Speicherplatz des Benutzers ist aufgebraucht. Upload schlug fehl" -#: seahub/views/__init__.py:581 +#: seahub/views/__init__.py:665 msgid "An error occurs during file transfer" msgstr "Es ist ein Fehler beim Dateitransfer aufgetreten" -#: seahub/views/__init__.py:593 seahub/views/__init__.py:615 +#: seahub/views/__init__.py:677 seahub/views/__init__.py:699 msgid "Invalid url" msgstr "Ungültige URL" -#: seahub/views/__init__.py:635 +#: seahub/views/__init__.py:719 msgid "Unable to view library modification" msgstr "Konnte Bibliotheksänderungen nicht anzeigen" -#: seahub/views/__init__.py:699 +#: seahub/views/__init__.py:785 msgid "Unable to view library snapshots" msgstr "Konnte Bibliotheksschappschüsse nicht anzeigen" -#: seahub/views/__init__.py:764 +#: seahub/views/__init__.py:850 msgid "You have no permission to restore library" msgstr "Sie haben keine Berechtigung die Bibliothek wiederherzustellen" -#: seahub/views/__init__.py:788 +#: seahub/views/__init__.py:874 msgid "Please specify history ID" msgstr "Bitte geben Sie eine Verlaufs-ID an" -#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483 -#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107 +#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568 +#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279 msgid "Library does not exist" msgstr "Die Bibliothek existiert nicht" -#: seahub/views/__init__.py:798 +#: seahub/views/__init__.py:884 msgid "History you specified does not exist" msgstr "Der von Ihnen gewählte Verlauf existiert nicht" -#: seahub/views/__init__.py:800 +#: seahub/views/__init__.py:886 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: seahub/views/__init__.py:882 +#: seahub/views/__init__.py:968 msgid "No conflict in the merge." msgstr "Kein Konflikt bei der Zusammenführung." -#: seahub/views/__init__.py:904 seahub/views/__init__.py:905 +#: seahub/views/__init__.py:989 seahub/views/__init__.py:990 msgid "My Library" msgstr "Meine Bibliothek" -#: seahub/views/__init__.py:1187 +#: seahub/views/__init__.py:1271 msgid "Failed to unshare the library, as it does not exist." msgstr "Da sie nicht existiert, kann die Bibliothek nicht freigegeben werden." -#: seahub/views/__init__.py:1192 +#: seahub/views/__init__.py:1276 #, python-format msgid "Unshare \"%s\" successfully." msgstr "\"%s\" ist nicht mehr freigegeben." -#: seahub/views/__init__.py:1194 +#: seahub/views/__init__.py:1278 #, python-format msgid "Failed to unshare \"%s\"." msgstr "Freigeben von %s ist fehlgeschlagen." -#: seahub/views/__init__.py:1228 +#: seahub/views/__init__.py:1312 msgid "Failed to delete file." msgstr "Fehler beim Löschen der Datei." -#: seahub/views/__init__.py:1235 +#: seahub/views/__init__.py:1319 #, python-format msgid "%s successfully deleted." msgstr "%s wurde erfolgreich gelöscht." -#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540 +#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562 #, python-format msgid "Internal error. Failed to delete %s." msgstr "Interner Fehler: Datei %s konnte nicht gelöscht werden." -#: seahub/views/__init__.py:1283 +#: seahub/views/__init__.py:1367 msgid "Unable to access file" msgstr "Kein Zugriff auf Datei" -#: seahub/views/__init__.py:1309 +#: seahub/views/__init__.py:1393 msgid "Failed to download library, unable to find server" msgstr "Bibliothek konnte nicht heruntergeladen werden, konnte Server nicht finden" -#: seahub/views/__init__.py:1320 +#: seahub/views/__init__.py:1404 msgid "Invalid server setting" msgstr "Ungültige Serverkonfiguration" -#: seahub/views/__init__.py:1564 +#: seahub/views/__init__.py:1644 #, python-format msgid "Successfully revert %(path)s to root directory." msgstr "%(path)s wurde erfolgreich zum Hauptverzeichnis zurückgesetzt." -#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594 +#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674 #, python-format msgid "Successfully revert %(path)s" msgstr "%(path)s wurde erfolgreich zurükgesetzt." -#: seahub/views/__init__.py:1590 +#: seahub/views/__init__.py:1670 #, python-format msgid "Successfully revert %(path)s to root directory." msgstr "%(path)s wurde erfolgreich zum Hauptverzeichnis zurückgesetzt." -#: seahub/views/__init__.py:1888 seahub/views/file.py:748 +#: seahub/views/__init__.py:1970 seahub/views/file.py:799 msgid "Internal Error" msgstr "Interner Fehler" -#: seahub/views/__init__.py:1891 +#: seahub/views/__init__.py:1973 #, python-format msgid "Unable to download directory \"%s\": size is too large." msgstr "Konnte \"%s\" nicht herunterladen, da der Ordner zu groß ist." -#: seahub/views/__init__.py:1905 +#: seahub/views/__init__.py:1987 #, python-format msgid "Unable to download \"%s\"" msgstr "Konnte \"%s\" nicht herunterladen" -#: seahub/views/__init__.py:2067 +#: seahub/views/__init__.py:2148 msgid "Successfully enable \"Personal Wiki\"." msgstr "\"Persönliches Wiki\" erfolgreich aktiviert." -#: seahub/views/__init__.py:2072 +#: seahub/views/__init__.py:2153 msgid "Successfully disable \"Personal Wiki\"." msgstr "\"Persönliches Wiki\" erfolgreich deaktiviert." -#: seahub/views/ajax.py:69 +#: seahub/views/ajax.py:72 msgid "You don't have permission to access the library." msgstr "Sie haben keine Berechtigung, auf die Bibliothek zuzugreifen." -#: seahub/views/ajax.py:77 +#: seahub/views/ajax.py:80 msgid "No path." msgstr "Kein Pfad." -#: seahub/views/ajax.py:150 +#: seahub/views/ajax.py:160 msgid "The group doesn't exist" msgstr "Diese Gruppe existiert nicht." -#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463 -#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767 -#: seahub/views/ajax.py:792 seahub/views/file.py:755 +#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485 +#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820 +#: seahub/views/ajax.py:845 seahub/views/file.py:806 msgid "Permission denied" msgstr "Zugriff verweigert" -#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521 -#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130 -#: seahub/views/ajax.py:1148 +#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543 +#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093 +#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320 msgid "Permission denied." msgstr "Zugriff verweigert." -#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943 +#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106 msgid "Library is encrypted." msgstr "Diese Bibliothek ist verschlüsselt." -#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949 +#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112 msgid "Error: no head commit id" msgstr "Fehler: keine Head Commit ID" -#: seahub/views/ajax.py:529 seahub/views/ajax.py:571 +#: seahub/views/ajax.py:551 seahub/views/ajax.py:593 msgid "Argument missing." msgstr "Argument fehlt." -#: seahub/views/ajax.py:625 +#: seahub/views/ajax.py:647 msgid "Destination path is too long." msgstr "Zielpfad ist zu lang." -#: seahub/views/ajax.py:654 seahub/views/ajax.py:706 +#: seahub/views/ajax.py:686 seahub/views/ajax.py:753 #, python-format msgid "Successfully moved %(name)s view" msgstr "%(name)s erfolgreich verschoben: anzeigen" -#: seahub/views/ajax.py:676 seahub/views/ajax.py:735 +#: seahub/views/ajax.py:715 seahub/views/ajax.py:790 #, python-format msgid "Successfully copied %(name)s view" msgstr "%(name)s erfolgreich kopiert: anzeigen" -#: seahub/views/ajax.py:694 seahub/views/ajax.py:813 +#: seahub/views/ajax.py:732 seahub/views/ajax.py:866 #, python-format msgid "Can not move directory %(src)s to its subdirectory %(des)s" msgstr "Verschieben des Verzeichnisses nicht möglich, %(src)s ist ein Unterverzeichnis von %(des)s." -#: seahub/views/ajax.py:724 seahub/views/ajax.py:843 +#: seahub/views/ajax.py:769 seahub/views/ajax.py:905 #, python-format msgid "Can not copy directory %(src)s to its subdirectory %(des)s" msgstr "Kopieren des Verzeichnisses nicht möglich, %(src)s ist ein Unterverzeichnis von %(des)s." -#: seahub/views/ajax.py:786 +#: seahub/views/ajax.py:839 #, python-format msgid "Destination path is too long for %s." msgstr "Zielpfad für %s ist zu lang." -#: seahub/views/ajax.py:1020 +#: seahub/views/ajax.py:1188 msgid "Failed to get file block list" msgstr "Die Blockliste konnte nicht abgerufen werden" -#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063 +#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231 msgid "Wrong repo id" msgstr "Falsche repo id" -#: seahub/views/file.py:111 +#: seahub/views/ajax.py:1274 +msgid "System library can not be deleted." +msgstr "Eine Systembibliothek kann nicht gelöscht werden. " + +#: seahub/views/file.py:117 msgid "HTTPError: failed to open file online" msgstr "HTTP-Fehler: Datei konnte nicht online geöffnet werden" -#: seahub/views/file.py:115 +#: seahub/views/file.py:121 msgid "URLError: failed to open file online" msgstr "URL-Fehler: Datei konnte nicht online geöffnet werden" -#: seahub/views/file.py:122 +#: seahub/views/file.py:128 msgid "The encoding you chose is not proper." msgstr "Der gewählte Zeichensatz ist ungültig." -#: seahub/views/file.py:139 seahub/views/file.py:142 +#: seahub/views/file.py:145 seahub/views/file.py:148 msgid "Unknown file encoding" msgstr "Unbekannte Datenkodierung" -#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491 -#: seahub/views/file.py:496 +#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509 +#: seahub/views/file.py:514 #, python-format msgid "File size surpasses %s, can not be opened online." msgstr "Für Dateien größer als %sM ist keine Onlinevorschau möglich." -#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544 -#: seahub/views/file.py:566 +#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567 +#: seahub/views/file.py:589 msgid "Unable to view file" msgstr "Kann die Datei nicht anzeigen" -#: seahub/views/file.py:339 +#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646 msgid "Invalid file format." msgstr "Ungültiges Dateiformat." -#: seahub/views/file.py:759 +#: seahub/views/file.py:810 msgid "The library does not exist." msgstr "Die Bibliothek existiert nicht." -#: seahub/views/file.py:763 +#: seahub/views/file.py:814 msgid "The library is encrypted." msgstr "Diese Bibliothek ist verschlüsselt." -#: seahub/views/file.py:831 +#: seahub/views/file.py:882 msgid "Unable to edit file" msgstr "Die Datei kann nicht bearbeitet werden" -#: seahub/views/file.py:843 +#: seahub/views/file.py:894 msgid "The file does not exist." msgstr "Datei existiert nicht." -#: seahub/views/file.py:871 +#: seahub/views/file.py:922 msgid "Edit online is not offered for this type of file." msgstr "Onlinebearbeitung ist für diesen Dateityp nicht verfügbar." -#: seahub/views/sysadmin.py:314 +#: seahub/views/sysadmin.py:313 msgid "Failed to set quota: internal error" msgstr "Quota konnte nicht gesetzt werden: Interner Fehler" -#: seahub/views/sysadmin.py:330 +#: seahub/views/sysadmin.py:329 #, python-format msgid "Successfully deleted %s" msgstr "%s erfolgreich gelöscht" -#: seahub/views/sysadmin.py:332 +#: seahub/views/sysadmin.py:331 msgid "Failed to delete: the user does not exist" msgstr "Löschen fehlgeschlagen: Die Gruppe existiert nicht." -#: seahub/views/sysadmin.py:347 +#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734 #, python-format msgid "Successfully set %s as admin" msgstr "%s hat die Administratorenrechte erfolgreich verliehen bekommen." -#: seahub/views/sysadmin.py:349 +#: seahub/views/sysadmin.py:348 msgid "Failed to set admin: the user does not exist" msgstr "Zurücksetzen des Passworts fehlgeschlagen: Benutzer existiert nicht." -#: seahub/views/sysadmin.py:364 +#: seahub/views/sysadmin.py:363 #, python-format msgid "Successfully revoke the admin permission of %s" msgstr "Administratorenrechte für %s erfolgreich entzogen." -#: seahub/views/sysadmin.py:366 +#: seahub/views/sysadmin.py:365 msgid "Failed to revoke admin: the user does not exist" msgstr "Administratorenrechte konnten nicht entzogen werden, da der Benutzer nicht existiert." -#: seahub/views/sysadmin.py:380 +#: seahub/views/sysadmin.py:379 #, python-format msgid "Successfully activated \"%s\"." msgstr "%s erfolgreich aktiviert." -#: seahub/views/sysadmin.py:382 +#: seahub/views/sysadmin.py:381 msgid "Failed to activate: user does not exist." msgstr "Aktivieren fehlgeschlagen: Der Benutzer existiert nicht." -#: seahub/views/sysadmin.py:397 +#: seahub/views/sysadmin.py:396 #, python-format msgid "Successfully deactivated \"%s\"." msgstr "%s erfolgreich deaktiviert." -#: seahub/views/sysadmin.py:399 +#: seahub/views/sysadmin.py:398 msgid "Failed to deactivate: user does not exist." msgstr "Deaktivieren fehlgeschlagen: Der Benutzer existiert nicht." -#: seahub/views/sysadmin.py:488 +#: seahub/views/sysadmin.py:412 +#, python-format +msgid "Your account on %s is activated" +msgstr "" + +#: seahub/views/sysadmin.py:456 +#, python-format +msgid "Password has been reset on %s" +msgstr "" + +#: seahub/views/sysadmin.py:476 #, python-format msgid "" "Successfully reset password to %(passwd)s, an email has been sent to " "%(user)s." msgstr "Passwort erfolgreich auf %(passwd)s gesetzt, eine E-Mail wurde an den Nutzer %(user)s versandt." -#: seahub/views/sysadmin.py:493 +#: seahub/views/sysadmin.py:481 #, python-format msgid "" "Successfully reset password to %(passwd)s, but failed to send email to " "%(user)s, please check your email configuration." msgstr "Passwort erfolgreich auf %(passwd)s gesetzt, aber es konnte keine E-Mail an den Nutzer %(user)s gesendet werden. Bitte prüfen Sie die Konfiguration Ihres E-Mail-Dienstes." -#: seahub/views/sysadmin.py:497 +#: seahub/views/sysadmin.py:485 #, python-format msgid "Successfully reset password to %(passwd)s for user %(user)s." msgstr "Passwort von %(user)s erfolgreich auf %(passwd)s zurückgesetzt." -#: seahub/views/sysadmin.py:500 +#: seahub/views/sysadmin.py:488 #, python-format msgid "" "Successfully reset password to %(passwd)s for user %(user)s. But email " @@ -5630,47 +6060,53 @@ msgid "" "configured." msgstr "Passwort von %(user)s erfolgreich auf %(passwd)s zurückgesetzt. Es konnte jedoch keine E-Mail Benachrichtigung gesendet werden, da der E-Mail-Service nicht korrekt konfiguriert ist." -#: seahub/views/sysadmin.py:503 +#: seahub/views/sysadmin.py:491 msgid "Failed to reset password: user does not exist" msgstr "Zurücksetzen des Passworts fehlgeschlagen: Benutzer existiert nicht" -#: seahub/views/sysadmin.py:524 -msgid "Seafile Registration Information" -msgstr "Seafile Registrierungsinformationen" +#: seahub/views/sysadmin.py:507 +#, python-format +msgid "You are invited to join %s" +msgstr "" -#: seahub/views/sysadmin.py:563 +#: seahub/views/sysadmin.py:546 #, python-format msgid "Successfully added user %s. An email notification has been sent." msgstr "Benutzer %s wurde erfolgreich hinzugefügt. Eine E-Mail Benachrichtigung wurde versandt." -#: seahub/views/sysadmin.py:566 +#: seahub/views/sysadmin.py:549 #, python-format msgid "" "Successfully added user %s. An error accurs when sending email notification," " please check your email configuration." msgstr "Benutzer %s wurde erfolgreich hinzugefügt. Es trat jedoch ein Fehler beim Senden der Benachrichtigungs-E-Mail auf. Bitte überprüfen Sie Ihre E-Mail-Dienst Konfiguration." -#: seahub/views/sysadmin.py:568 +#: seahub/views/sysadmin.py:551 #, python-format msgid "Successfully added user %s." msgstr "User %s erfolgreich hinzugefügt." -#: seahub/views/sysadmin.py:570 +#: seahub/views/sysadmin.py:553 #, python-format msgid "" "Successfully added user %s. But email notification can not be sent, because " "Email service is not properly configured." msgstr "Benutzer %s wurde erfolgreich hinzugefügt. Es konnte jedoch keine E-Mail-Benachrichtigung gesendet werden, da der E-Mail-Dienst nicht korrekt konfiguriert ist." -#: seahub/views/sysadmin.py:681 +#: seahub/views/sysadmin.py:664 msgid "Successfully transfered." msgstr "Übertragung erfolgreich" -#: seahub/views/sysadmin.py:683 +#: seahub/views/sysadmin.py:666 #, python-format msgid "Failed to transfer, user %s not found" msgstr "Übertragung fehlgeschlagen. Konnte Benutzer %s nicht finden" -#: seahub/views/sysadmin.py:685 +#: seahub/views/sysadmin.py:668 msgid "Failed to transfer, invalid arguments." msgstr "Übertragung fehlgeschlagen. Argumente ungültig" + +#: seahub/views/sysadmin.py:736 +#, python-format +msgid "Failed set %s as admin" +msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index b81826c4ab..250798c8bb 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -6,14 +6,17 @@ # cmadera , 2013-2014 # cmadera , 2013 # e1th0r , 2013 +# eddelac , 2013 # e1th0r , 2013 +# rcoss , 2014 +# rcoss , 2014 msgid "" msgstr "" "Project-Id-Version: seahub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-11 13:47+0800\n" -"PO-Revision-Date: 2014-01-17 10:53+0000\n" -"Last-Translator: cmadera \n" +"POT-Creation-Date: 2014-04-10 11:01+0800\n" +"PO-Revision-Date: 2014-04-17 16:30+0000\n" +"Last-Translator: rcoss \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/seahub/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,185 +24,218 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: seahub/forms.py:26 seahub/base/accounts.py:410 +#: seahub/forms.py:27 seahub/base/accounts.py:410 msgid "A user with this email already" -msgstr "Ya existe un usuario con este email" +msgstr "Ya existe un usuario con este correo" -#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171 +#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164 #: seahub/base/accounts.py:427 msgid "The two password fields didn't match." -msgstr "Las contraseñas no concuerdan" +msgstr "Las contraseñas no coinciden" -#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16 +#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16 msgid "Name can't be empty" -msgstr "Los nombres no pueden estar vacíos" +msgstr "El nombres no puede estar vacío" -#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17 +#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17 msgid "Name is too long (maximum is 255 characters)" msgstr "El nombre es demasiado extenso (máximo 255 caracteres)" -#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20 +#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20 msgid "Description can't be empty" msgstr "La descripción no puede estar vacía" -#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21 +#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21 msgid "Description is too long (maximum is 100 characters)" -msgstr "La descripión es demasiado extensa (máximo 100 carateres)" +msgstr "La descripión es demasiado extensa (máximo 100 caracteres)" -#: seahub/forms.py:63 +#: seahub/forms.py:64 #, python-format msgid "Name %s is not valid" msgstr "El nombre %s no es válido" -#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729 -#: seahub/share/views.py:762 seahub/views/__init__.py:1074 -#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484 -#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977 -#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049 -#: seahub/views/ajax.py:1053 +#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708 +#: seahub/share/views.py:741 seahub/views/__init__.py:1107 +#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356 +#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641 +#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980 +#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145 +#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217 +#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455 msgid "Argument missing" -msgstr "Falta argumento" +msgstr "Argumento faltante" -#: seahub/forms.py:91 +#: seahub/forms.py:92 msgid "Oldname is required" -msgstr "Se requiere el nombre anterior" - -#: seahub/forms.py:94 seahub/forms.py:115 -msgid "It's too long." -msgstr "Es demasiado grande" +msgstr "Se requiere el nombre" #: seahub/forms.py:95 seahub/forms.py:116 -msgid "It's required." -msgstr "Es obligatorio" +msgid "It's too long." +msgstr "Es demasiado largo." -#: seahub/forms.py:102 seahub/forms.py:123 +#: seahub/forms.py:96 seahub/forms.py:117 +msgid "It's required." +msgstr "Se requiere." + +#: seahub/forms.py:103 seahub/forms.py:124 #, python-format msgid "Name \"%s\" is not valid" -msgstr "Nombre \"%s\" no es válido" +msgstr "El nombre \"%s\" no es válido." -#: seahub/forms.py:134 +#: seahub/forms.py:135 msgid "Repo id is required" msgstr "El id del repositorio es requerido" -#: seahub/forms.py:135 +#: seahub/forms.py:136 msgid "Username is required" msgstr "El nombre del usuario es requerido" -#: seahub/forms.py:136 +#: seahub/forms.py:137 seahub/forms.py:181 msgid "Password can't be empty" msgstr "La contraseña no puede estar vacía" -#: seahub/forms.py:147 +#: seahub/forms.py:148 msgid "Bad url format" msgstr "Formato de URL no válido" -#: seahub/forms.py:152 seahub/templates/repo.html:361 +#: seahub/forms.py:153 seahub/templates/repo.html:358 msgid "Wrong password" -msgstr "Contraseña errónea" +msgstr "Contraseña incorrecta" -#: seahub/forms.py:154 seahub/views/__init__.py:1083 +#: seahub/forms.py:155 seahub/views/__init__.py:1113 +#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680 +#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784 msgid "Internal server error" -msgstr "" +msgstr "Error interno del servidor" -#: seahub/forms.py:156 +#: seahub/forms.py:157 msgid "Decrypt library error" -msgstr "Error en la biblioteca decrypt" +msgstr "Error en el desencriptado de la biblioteca" -#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29 +#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29 msgid "Email is required" -msgstr "Dirección de correo requerido" +msgstr "Dirección de correo requerida" -#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135 +#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129 msgid "Quota can't be empty" -msgstr "La quota no puede estar vacía" +msgstr "La cuota no puede estar vacía" -#: seahub/forms.py:165 +#: seahub/forms.py:166 msgid "Quota is too low (minimum value is 0)" msgstr "La cuota es muy pequeña (el valor mínimo es 0)" -#: seahub/forms.py:171 -msgid "Library name is required" -msgstr "Nombre de la biblioteca obligatorio" - #: seahub/forms.py:172 -msgid "Library description is required" -msgstr "Descripción de la biblioteca es obligatoria" +msgid "Library name is required" +msgstr "El nombre de la biblioteca es obligatorio." -#: seahub/forms.py:174 +#: seahub/forms.py:173 +msgid "Library description is required" +msgstr "La descripción de la biblioteca es obligatoria." + +#: seahub/forms.py:175 msgid "Please enter a number" -msgstr "Por favor, escriba un número" +msgstr "Por favor, ingresa un número" + +#: seahub/forms.py:188 +msgid "Please enter a correct password." +msgstr "Ingrese la contraseña correcta" #: seahub/settings.py:133 +msgid "català" +msgstr "Català" + +#: seahub/settings.py:134 msgid "Deutsch" msgstr "Deutsch" -#: seahub/settings.py:134 +#: seahub/settings.py:135 msgid "English" msgstr "English" -#: seahub/settings.py:135 +#: seahub/settings.py:136 msgid "Español" msgstr "Español" -#: seahub/settings.py:136 -msgid "Mexican Spanish" -msgstr "" - #: seahub/settings.py:137 -msgid "Français" -msgstr "Francés" +msgid "Argentinian Spanish" +msgstr "Español Argentina" #: seahub/settings.py:138 -msgid "Hebrew" -msgstr "" +msgid "Mexican Spanish" +msgstr "Español México" #: seahub/settings.py:139 -msgid "Magyar" -msgstr "Húngaro" +msgid "français" +msgstr "Français" #: seahub/settings.py:140 +msgid "עברית" +msgstr "עברית" + +#: seahub/settings.py:141 +msgid "Magyar" +msgstr "Magyar" + +#: seahub/settings.py:142 +msgid "Íslenska" +msgstr "Íslenska" + +#: seahub/settings.py:143 msgid "Italiano" msgstr "Italiano" -#: seahub/settings.py:141 -msgid "Latvian" -msgstr "" - -#: seahub/settings.py:142 -msgid "Dutch" -msgstr "" - -#: seahub/settings.py:143 -msgid "Portuguese, Brazil" -msgstr "" - #: seahub/settings.py:144 +msgid "한국어" +msgstr "한국어" + +#: seahub/settings.py:145 +msgid "Latvian" +msgstr "Latvian" + +#: seahub/settings.py:146 +msgid "Nederlands" +msgstr "Nederlands" + +#: seahub/settings.py:147 +msgid "Polski" +msgstr "Polski" + +#: seahub/settings.py:148 +msgid "Portuguese, Brazil" +msgstr "Português, Brasil" + +#: seahub/settings.py:149 msgid "Русский" msgstr "Русский" -#: seahub/settings.py:145 +#: seahub/settings.py:150 msgid "Slovak" -msgstr "" +msgstr "Slovak" -#: seahub/settings.py:146 -msgid "Ukrainian" -msgstr "" +#: seahub/settings.py:151 +msgid "Svenska" +msgstr "Svenska" -#: seahub/settings.py:147 +#: seahub/settings.py:152 +msgid "українська мова" +msgstr "українська мова" + +#: seahub/settings.py:153 msgid "简体中文" msgstr "简体中文" -#: seahub/settings.py:148 +#: seahub/settings.py:154 msgid "繁體中文" -msgstr "Chino tradicional" +msgstr "繁體中文" #: seahub/api2/templates/api2/base.html:8 seahub/templates/base.html:9 msgid "File Collaboration Team Organization" -msgstr "Equipo de colaboración " +msgstr "Organización de equipo de colaboraores" #: seahub/api2/templates/api2/discussion.html:6 -#: seahub/group/templates/group/group_base.html:25 +#: seahub/group/templates/group/group_base.html:23 #: seahub/group/templates/group/groups_right_panel.html:17 +#: seahub/templates/base.html:160 msgid "Discussion" msgstr "Discusión" @@ -211,16 +247,17 @@ msgstr "Discusión" #: seahub/api2/templates/api2/discussions_body.html:37 #: seahub/api2/templates/api2/new_msg_reply.html:27 #: seahub/api2/templates/api2/new_msg_reply.html:43 -#: seahub/group/templates/group/group_discuss.html:45 -#: seahub/group/templates/group/group_discuss.html:61 -#: seahub/group/templates/group/new_msg_reply.html:26 -#: seahub/group/templates/group/new_msg_reply.html:35 -#: seahub/message/templates/message/user_msg_list.html:47 +#: seahub/api2/templates/api2/user_msg_body.html:20 +#: seahub/group/templates/group/group_discuss.html:74 +#: seahub/group/templates/group/new_msg_reply.html:27 +#: seahub/group/templates/group/new_msg_reply.html:36 +#: seahub/message/templates/message/user_msg.html:17 +#: seahub/message/templates/message/user_msg_list.html:62 #: seahub/share/templates/share/links.html:28 #: seahub/share/templates/share/priv_shared_files.html:61 #: seahub/templates/repo_history_view.html:66 #: seahub/templates/repo_recycle_view.html:78 -#: seahub/templates/view_shared_dir.html:53 +#: seahub/templates/view_shared_dir.html:48 #: seahub/templates/snippets/group_recommend_form.html:28 #: seahub/templates/snippets/repo_dirents.html:57 msgid "File" @@ -230,99 +267,104 @@ msgstr "Archivo" #: seahub/api2/templates/api2/discussion_posted.html:29 #: seahub/api2/templates/api2/discussions_body.html:31 #: seahub/api2/templates/api2/new_msg_reply.html:37 -#: seahub/group/templates/group/group_discuss.html:55 -#: seahub/group/templates/group/new_msg_reply.html:29 +#: seahub/group/templates/group/group_discuss.html:68 +#: seahub/group/templates/group/new_msg_reply.html:30 #: seahub/share/templates/share/links.html:31 #: seahub/share/templates/share/links.html:63 #: seahub/share/templates/share/priv_shared_files.html:64 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 -#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39 +#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29 +#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34 #: seahub/templates/snippets/group_recommend_form.html:22 #: seahub/templates/snippets/repo_dirents.html:8 msgid "Directory icon" -msgstr "Directorio de iconos" +msgstr "Icono de la carpeta" #: seahub/api2/templates/api2/discussion_posted.html:46 #: seahub/api2/templates/api2/discussions_body.html:48 #: seahub/group/templates/group/discussion_list.html:17 -#: seahub/group/templates/group/group_discuss.html:71 -#: seahub/group/templates/group/group_discuss.html:147 -#: seahub/group/templates/group/new_msg_reply.html:45 +#: seahub/group/templates/group/group_discuss.html:85 +#: seahub/group/templates/group/group_discuss.html:160 +#: seahub/group/templates/group/new_msg_reply.html:47 #, python-format msgid "%(amount)s replies" msgstr "%(amount)s respuestas" #: seahub/api2/templates/api2/discussions.html:24 msgid "No discussions." -msgstr "Sin discusiones." +msgstr "No hay discusiones." #: seahub/api2/templates/api2/discussions.html:29 #: seahub/api2/templates/api2/events.html:13 +#: seahub/api2/templates/api2/user_msg_list.html:25 #: seahub/notifications/templates/notifications/user_notification_list.html:26 -#: seahub/templates/activities.html:13 seahub/templates/repo.html:957 -#: seahub/templates/snippets/list_commit_detail.html:3 -#: seahub/templates/snippets/repo_dir_data.html:46 +#: seahub/templates/activities.html:13 +#: seahub/templates/snippets/repo_dir_data.html:48 msgid "Loading..." -msgstr "Cargando" +msgstr "Cargando..." #: seahub/api2/templates/api2/discussions.html:75 #: seahub/api2/templates/api2/events_js.html:34 +#: seahub/api2/templates/api2/user_msg_list.html:72 #: seahub/contacts/templates/contacts/contact_list.html:107 #: seahub/contacts/templates/contacts/contact_list.html:153 -#: seahub/group/templates/group/group_discuss.html:231 +#: seahub/group/templates/group/group_discuss.html:244 #: seahub/group/templates/group/msg_js.html:155 -#: seahub/message/templates/message/all_msg_list.html:141 -#: seahub/message/templates/message/all_msg_list.html:208 -#: seahub/message/templates/message/user_msg_list.html:156 +#: seahub/message/templates/message/all_msg_list.html:143 +#: seahub/message/templates/message/all_msg_list.html:219 +#: seahub/message/templates/message/user_msg_list.html:168 #: seahub/notifications/templates/notifications/user_notification_list.html:66 -#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592 -#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406 -#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628 -#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806 -#: seahub/templates/repo_settings.html:100 -#: seahub/templates/repo_settings.html:136 -#: seahub/templates/view_file_base.html:151 +#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592 +#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714 +#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559 +#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800 +#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935 +#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118 +#: seahub/templates/repo_settings.html:154 +#: seahub/templates/repo_settings.html:219 +#: seahub/templates/view_file_base.html:153 #: seahub/templates/snippets/bottom_bar.html:109 #: seahub/templates/snippets/events_js.html:56 -#: seahub/templates/snippets/office_convert_js.html:172 -#: seahub/templates/snippets/office_convert_js.html:197 +#: seahub/templates/snippets/msg_form_js.html:30 +#: seahub/templates/snippets/office_convert_js.html:177 +#: seahub/templates/snippets/office_convert_js.html:202 #: seahub/templates/snippets/repo_decrypt_js.html:35 -#: seahub/templates/snippets/shared_link_js.html:154 -#: seahub/templates/snippets/shared_link_js.html:189 -#: seahub/templates/snippets/shared_link_js.html:213 -#: seahub/templates/snippets/shared_link_js.html:276 -#: seahub/templates/snippets/shared_link_js.html:306 -#: seahub/templates/snippets/shared_link_js.html:330 -#: seahub/templates/sysadmin/sys_useradmin.html:94 -#: seahub/templates/sysadmin/userinfo.html:158 +#: seahub/templates/snippets/shared_link_js.html:197 +#: seahub/templates/snippets/shared_link_js.html:283 +#: seahub/templates/snippets/shared_link_js.html:308 +#: seahub/templates/snippets/shared_link_js.html:371 +#: seahub/templates/snippets/shared_link_js.html:437 +#: seahub/templates/snippets/shared_link_js.html:462 +#: seahub/templates/snippets/spreadsheet_convert_js.html:32 +#: seahub/templates/sysadmin/sys_useradmin.html:132 +#: seahub/templates/sysadmin/userinfo.html:152 msgid "Failed. Please check the network." -msgstr "Hubo un fallo. Por favor, chequee la red" +msgstr "Fallo. Por favor, verifica la red." #: seahub/api2/templates/api2/event_details.html:8 #: seahub/api2/templates/api2/event_details.html:40 #, python-format msgid "Added %(file)s" -msgstr "%(file)s incluido" +msgstr "%(file)s agregado" #: seahub/api2/templates/api2/event_details.html:16 #: seahub/api2/templates/api2/event_details.html:48 #, python-format msgid "Deleted %(file)s" -msgstr "%(file)s borrados" +msgstr "Eliminados %(file)s" #: seahub/api2/templates/api2/event_details.html:24 #, python-format msgid "Renamed or Moved %(file)s" -msgstr "%(file)s Renombrados o Movidos" +msgstr "%(file)s Renombrados o movidos" #: seahub/api2/templates/api2/event_details.html:32 #, python-format msgid "Modified %(file)s" -msgstr "Modificado %(file)s" +msgstr "%(file)s modificados" #: seahub/api2/templates/api2/events.html:19 msgid "No activity now or the function is not supported." -msgstr "Sin actividad ahora o la función no es soportada." +msgstr "Sin actividad o función no soportada." #: seahub/api2/templates/api2/events_body.html:17 #: seahub/templates/snippets/events_body.html:29 @@ -333,15 +375,34 @@ msgstr "Biblioteca creada" #: seahub/templates/snippets/events_body.html:33 #, python-format msgid "Deleted library %(library_name)s" -msgstr "Biblioteca borrada %(library_name)s" +msgstr "Biblioteca %(library_name)s eliminada" #: seahub/api2/templates/api2/events_js.html:83 msgid "Please check the network." -msgstr "Por favor verifique la red" +msgstr "Por favor verifique la red." #: seahub/api2/templates/api2/new_msg_reply.html:6 msgid "New Replies" -msgstr "Nuevas respuestas" +msgstr "Nuevas Respuestas" + +#: seahub/api2/templates/api2/user_msg_list.html:6 +#: seahub/message/templates/message/all_msg_list.html:4 +#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/user_msg_list.html:4 +#: seahub/share/templates/share/user_share_list.html:24 +#: seahub/templates/home_base.html:22 +msgid "Messages" +msgstr "Mensajes" + +#: seahub/api2/templates/api2/user_msg_list.html:10 +#: seahub/message/templates/message/user_msg_list.html:9 +#, python-format +msgid "Messages with %(name)s" +msgstr "Mensajes con %(name)s" + +#: seahub/api2/templates/api2/user_msg_list.html:19 +msgid "No messages." +msgstr "No hay mensajes" #: seahub/auth/admin.py:29 msgid "Personal info" @@ -349,152 +410,155 @@ msgstr "Información personal" #: seahub/auth/admin.py:30 msgid "Permissions" -msgstr "Permisología" +msgstr "Permisos" #: seahub/auth/admin.py:31 msgid "Important dates" msgstr "Fechas importantes" #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5 -#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10 -#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15 -#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8 +#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14 +#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13 +#: seahub/templates/pubgrp.html:8 #: seahub/templates/snippets/repo_share_form.html:7 +#: seahub/templates/sysadmin/base.html:15 msgid "Groups" msgstr "Grupos" #: seahub/auth/admin.py:114 msgid "Password changed successfully." -msgstr "Contraseña cambiada satisfactoriamente." +msgstr "Contraseña cambiada con éxito." #: seahub/auth/admin.py:124 #, python-format msgid "Change password: %s" -msgstr "Contraseña cambiada: %s" +msgstr "Cambiar contraseña: %s" -#: seahub/auth/forms.py:19 seahub/base/accounts.py:396 +#: seahub/auth/forms.py:18 seahub/base/accounts.py:396 msgid "Username" msgstr "Nombre de usuario" -#: seahub/auth/forms.py:20 seahub/auth/forms.py:159 -#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10 -#: seahub/templates/registration/registration_form.html:18 +#: seahub/auth/forms.py:19 seahub/auth/forms.py:152 +#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36 +#: seahub/templates/registration/registration_form.html:19 +#: seahub/templates/snippets/file_share_popup.html:36 +#: seahub/templates/snippets/file_share_popup.html:77 #: seahub/templates/snippets/repo_create_form.html:20 -#: seahub/templates/sysadmin/sys_useradmin.html:26 +#: seahub/templates/sysadmin/sys_useradmin.html:31 msgid "Password" msgstr "Contraseña " -#: seahub/auth/forms.py:40 +#: seahub/auth/forms.py:39 msgid "" "Please enter a correct username and password. Note that both fields are " "case-sensitive." -msgstr "Por favor, suministre un nombre de usuario y contraseña correcta. Nota: ambos datos son sensibles al uso de mayúsculas y minúsculas." +msgstr "Por favor, ingresa un nombre de usuario y contraseña correctas. Notar que ambos datos son sensibles a mayúsculas y minúsculas." -#: seahub/auth/forms.py:42 +#: seahub/auth/forms.py:41 msgid "This account is inactive." -msgstr "Esta cuenta se encuentra inactiva." +msgstr "Esta cuenta está inactiva." -#: seahub/auth/forms.py:47 +#: seahub/auth/forms.py:46 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." -msgstr "Tu navegador no parece tener los cookies habilitados los cuales son requeridos para autenticarse en el sitio." +msgstr "Tu navegador no tiene habilitados las cookies. Las cookies son requeridas para autenticarse en el sitio." -#: seahub/auth/forms.py:63 +#: seahub/auth/forms.py:62 msgid "E-mail" -msgstr "Correo electrónico" +msgstr "E-mail" -#: seahub/auth/forms.py:70 +#: seahub/auth/forms.py:69 msgid "" "Failed to send email, email service is not properly configured, please " "contact administrator." -msgstr "No se pudo enviar el correo, este servicio no está configurado adecuadamente, por favor, contacte al administrador." +msgstr "No se pudo enviar el correo, el servicio no está configurado adecuadamente, por favor, contacta al administrador." -#: seahub/auth/forms.py:78 +#: seahub/auth/forms.py:77 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" -msgstr "La dirección de correo suministrada no está asociada a ninguna cuenta de usuario. ¿Estás seguro de que estás registrado en el sistema?" +msgstr "Esa dirección de correo no está asociada a ninguna cuenta de usuario. ¿Está seguro de que está registrado en el sistema?" -#: seahub/auth/forms.py:108 +#: seahub/auth/forms.py:101 #, python-format -msgid "Password reset on %s" -msgstr "contraseña reestablecida para %s" +msgid "Reset Password on %s" +msgstr "Reestablecer contraseña en %s" -#: seahub/auth/forms.py:116 +#: seahub/auth/forms.py:109 msgid "New password" msgstr "Nueva contraseña" -#: seahub/auth/forms.py:117 +#: seahub/auth/forms.py:110 msgid "New password confirmation" -msgstr "Nueva confirmación de contraseña" +msgstr "Confirmación de nueva contraseña" -#: seahub/auth/forms.py:143 +#: seahub/auth/forms.py:136 msgid "Old password" -msgstr "Contraseña antigua" +msgstr "Contraseña anterior" -#: seahub/auth/forms.py:151 +#: seahub/auth/forms.py:144 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "La contraseña antigua suministrada es incorrecta. Por favor, repítala" +msgstr "La contraseña anterior ingresada es incorrecta. Por favor, ingrésela nuevamente." -#: seahub/auth/forms.py:160 seahub/base/accounts.py:402 +#: seahub/auth/forms.py:153 seahub/base/accounts.py:402 msgid "Password (again)" -msgstr "Escriba la contraseña nuevamente:" +msgstr "Contraseña (de nuevo)" #: seahub/auth/views.py:157 msgid "Logged out" -msgstr "Desconectarse" +msgstr "Desconectado" #: seahub/auth/views.py:205 msgid "Failed to send email, please contact administrator." -msgstr "Fallo al enviar el correo, por favor, contacte al administrador" +msgstr "Fallo al enviar el correo, por favor, contacta al administrador" #: seahub/auth/management/commands/createsuperuser.py:24 #: seahub/base/management/commands/createsuperuser.py:25 msgid "Enter a valid e-mail address." -msgstr "Escriba una dirección de correo electrónica válida." +msgstr "Ingresa una dirección de correo válida." #: seahub/avatar/forms.py:34 seahub/avatar/forms.py:57 #, python-format msgid "" "%(ext)s is an invalid file extension. Authorized extensions are : " "%(valid_exts_list)s" -msgstr "La extención %(ext)s no es una extensión válida de archivo. Las extensiones autorizadas son: %(valid_exts_list)s" +msgstr "La extensión de archivo %(ext)s no es válida . Las extensiones permitidas son: %(valid_exts_list)s" #: seahub/avatar/forms.py:38 seahub/avatar/forms.py:61 #, python-format msgid "" "Your file is too big (%(size)s), the maximum allowed size is " "%(max_valid_size)s" -msgstr "Tu archivo es demasiado extenso: (%(size)s), el máximo tamaño permitido es %(max_valid_size)s" +msgstr "Tu archivo es demasiado grande: (%(size)s), el máximo tamaño permitido es %(max_valid_size)s" #: seahub/avatar/forms.py:44 #, python-format msgid "" "You already have %(nb_avatars)d avatars, and the maximum allowed is " "%(nb_max_avatars)d." -msgstr "Actualmente tienes %(nb_avatars)d avatars, y el máximo permitido es%(nb_max_avatars)d." +msgstr "Actualmente tienes %(nb_avatars)d avatares, y el máximo permitido es%(nb_max_avatars)d." -#: seahub/avatar/models.py:138 seahub/avatar/models.py:163 +#: seahub/avatar/models.py:137 seahub/avatar/models.py:165 #, python-format msgid "Avatar for %s" -msgstr "Avatar para %s" +msgstr "Avatar de %s" #: seahub/avatar/views.py:78 msgid "Successfully uploaded a new avatar." -msgstr "El nuevo avatar fue subido satisfactoriamente" +msgstr "El nuevo avatar fue subido con éxito." #: seahub/avatar/views.py:128 msgid "Successfully uploaded a new group avatar." -msgstr "El nuevo avatar para el grupo fue subido satisfactoriamente." +msgstr "El nuevo avatar grupal fue subido con éxito." #: seahub/avatar/views.py:166 msgid "Successfully updated your avatar." -msgstr "La actualización del avatar fue satisfactoria." +msgstr "Avatar actualizado con éxito." #: seahub/avatar/views.py:208 msgid "Successfully deleted the requested avatars." -msgstr "La solicitud de borrado del avatar seleccionado se realizó satisfactoriamente." +msgstr "Avatares borrados con éxito." #: seahub/avatar/templates/avatar/add.html:6 msgid "Upload Avatar" @@ -508,7 +572,7 @@ msgstr "Tu avatar actual:" #: seahub/avatar/templates/avatar/add.html:9 #: seahub/avatar/templates/avatar/set_avatar.html:12 msgid "Upload New Avatar: " -msgstr "Subir nuevo Avatar:" +msgstr "Subir nuevo avatar:" #: seahub/avatar/templates/avatar/add.html:13 #: seahub/avatar/templates/avatar/change.html:30 @@ -524,11 +588,11 @@ msgstr "Por favor, selecciona el avatar que deseas borrar." msgid "" "You have no avatars to delete. Please upload one now." -msgstr "No posees avatars que puedan ser borrados. Por favor sube uno." +msgstr "No tienes avatares para borrar. Por favor sube uno." #: seahub/avatar/templates/avatar/confirm_delete.html:18 msgid "Delete These" -msgstr "Borrar este" +msgstr "Eliminar seleccionados" #: seahub/avatar/templates/avatar/set_avatar.html:8 msgid "Avatar Change" @@ -543,57 +607,62 @@ msgstr "Avatar actual:" #: seahub/contacts/templates/contacts/contact_list.html:62 #: seahub/group/templates/group/discussion_list.html:42 #: seahub/group/templates/group/group_base.html:61 -#: seahub/group/templates/group/group_discuss.html:16 -#: seahub/group/templates/group/group_discuss.html:98 -#: seahub/group/templates/group/group_discuss.html:155 +#: seahub/group/templates/group/group_discuss.html:17 +#: seahub/group/templates/group/group_discuss.html:29 +#: seahub/group/templates/group/group_discuss.html:112 +#: seahub/group/templates/group/group_discuss.html:168 #: seahub/group/templates/group/group_info.html:130 #: seahub/group/templates/group/group_manage.html:100 #: seahub/group/templates/group/group_manage.html:108 #: seahub/group/templates/group/group_pubinfo.html:24 -#: seahub/group/templates/group/group_wiki.html:25 -#: seahub/group/templates/group/group_wiki.html:57 +#: seahub/group/templates/group/group_wiki.html:51 +#: seahub/group/templates/group/group_wiki.html:61 +#: seahub/group/templates/group/group_wiki.html:94 #: seahub/group/templates/group/group_wiki_pages.html:33 #: seahub/group/templates/group/groups_right_panel.html:37 #: seahub/group/templates/group/grpmember_add_form.html:32 -#: seahub/group/templates/group/new_msg_reply.html:65 -#: seahub/message/templates/message/all_msg_list.html:50 -#: seahub/message/templates/message/user_msg_list.html:20 -#: seahub/notifications/templates/notifications/notification_list.html:15 +#: seahub/group/templates/group/new_msg_reply.html:67 +#: seahub/message/templates/message/all_msg_list.html:51 +#: seahub/message/templates/message/user_msg_list.html:21 +#: seahub/message/templates/message/user_msg_list.html:33 +#: seahub/notifications/templates/notifications/notification_list.html:14 #: seahub/options/templates/options/set_user_options.html:14 -#: seahub/profile/templates/profile/set_profile.html:60 -#: seahub/profile/templates/profile/set_profile.html:75 +#: seahub/profile/templates/profile/set_profile.html:61 #: seahub/profile/templates/profile/set_profile.html:86 -#: seahub/profile/templates/profile/set_profile.html:112 +#: seahub/profile/templates/profile/set_profile.html:97 +#: seahub/profile/templates/profile/set_profile.html:123 #: seahub/templates/activities.html:25 #: seahub/templates/decrypt_repo_form.html:13 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245 -#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72 -#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152 -#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197 -#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231 -#: seahub/templates/repo_settings.html:28 -#: seahub/templates/repo_settings.html:36 +#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63 +#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143 +#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188 +#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229 +#: seahub/templates/repo_settings.html:31 +#: seahub/templates/repo_settings.html:39 +#: seahub/templates/repo_settings.html:53 +#: seahub/templates/share_access_validation.html:10 #: seahub/templates/shared_file_view.html:50 -#: seahub/templates/registration/login.html:34 #: seahub/templates/registration/password_change_form.html:18 #: seahub/templates/registration/password_reset_confirm.html:19 #: seahub/templates/registration/password_reset_form.html:13 -#: seahub/templates/registration/registration_form.html:33 #: seahub/templates/snippets/add_to_contacts_form.html:8 #: seahub/templates/snippets/file_share_popup.html:24 -#: seahub/templates/snippets/file_share_popup.html:41 -#: seahub/templates/snippets/file_share_popup.html:61 +#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:95 #: seahub/templates/snippets/group_recommend_form.html:19 #: seahub/templates/snippets/repo_create_form.html:26 -#: seahub/templates/snippets/repo_share_form.html:52 +#: seahub/templates/snippets/repo_share_form.html:30 #: seahub/templates/snippets/search_form.html:57 #: seahub/templates/sysadmin/repo_transfer_form.html:8 -#: seahub/templates/sysadmin/sys_repo_search.html:11 -#: seahub/templates/sysadmin/sys_useradmin.html:31 -#: seahub/templates/sysadmin/user_search.html:10 -#: seahub/templates/sysadmin/userinfo.html:53 -#: seahub/templates/wiki/personal_wiki.html:24 -#: seahub/templates/wiki/personal_wiki.html:52 +#: seahub/templates/sysadmin/sys_repo_search.html:13 +#: seahub/templates/sysadmin/sys_useradmin.html:36 +#: seahub/templates/sysadmin/sys_useradmin.html:51 +#: seahub/templates/sysadmin/user_search.html:12 +#: seahub/templates/sysadmin/userinfo.html:47 +#: seahub/templates/wiki/personal_wiki.html:46 +#: seahub/templates/wiki/personal_wiki.html:56 +#: seahub/templates/wiki/personal_wiki.html:85 #: seahub/templates/wiki/personal_wiki_pages.html:31 msgid "Submit" msgstr "Enviar" @@ -603,16 +672,16 @@ msgstr "Enviar" msgid "" "%(avatar_creator)s has updated their avatar %(avatar)s." -msgstr "%(avatar_creator)s Ha actualizado su avatar %(avatar)s." +msgstr "%(avatar_creator)s actualizó su avatar %(avatar)s." #: seahub/avatar/templates/notification/avatar_updated/notice.html:2 #, python-format msgid "You have updated your avatar %(avatar)s." msgstr "Has actualizado tu avatar %(avatar)s." -#: seahub/avatar/templatetags/avatar_tags.py:46 +#: seahub/avatar/templatetags/avatar_tags.py:47 msgid "Default Avatar" -msgstr "Avatar por defecto" +msgstr "Avatar predeterminado" #: seahub/base/accounts.py:391 msgid "Email address" @@ -620,7 +689,7 @@ msgstr "Dirección de correo" #: seahub/base/accounts.py:397 msgid "This value must be of length 40" -msgstr "Este valor debe tener una longitud de 40" +msgstr "Debe tener una longitud de 40" #: seahub/base/accounts.py:414 msgid "Invalid user id." @@ -628,27 +697,27 @@ msgstr "ID de usuario inválido" #: seahub/base/accounts.py:434 msgid "name" -msgstr "" +msgstr "nombre" #: seahub/base/accounts.py:436 msgid "department" -msgstr "" +msgstr "departamento" #: seahub/base/accounts.py:438 msgid "telephone" -msgstr "" +msgstr "teléfono" #: seahub/base/accounts.py:440 msgid "note" -msgstr "" +msgstr "nota" -#: seahub/base/decorators.py:85 +#: seahub/base/decorators.py:102 msgid "Files in this library can not be viewed online." -msgstr "Los archivos en esta biblioteca no se pueden ver online." +msgstr "Los archivos de esta biblioteca no se pueden ver en línea." #: seahub/base/templatetags/seahub_tags.py:87 msgid "Added" -msgstr "Incluido" +msgstr "Agregado" #: seahub/base/templatetags/seahub_tags.py:88 msgid "Deleted" @@ -656,7 +725,7 @@ msgstr "Borrado" #: seahub/base/templatetags/seahub_tags.py:89 msgid "Removed" -msgstr "Removido" +msgstr "Eliminado" #: seahub/base/templatetags/seahub_tags.py:90 msgid "Modified" @@ -672,11 +741,11 @@ msgstr "Movido" #: seahub/base/templatetags/seahub_tags.py:93 msgid "Added directory" -msgstr "Carpeta incluida" +msgstr "Carpeta agregada" #: seahub/base/templatetags/seahub_tags.py:94 msgid "Removed directory" -msgstr "Carpeta removida" +msgstr "Carpeta eliminada" #: seahub/base/templatetags/seahub_tags.py:95 msgid "Renamed directory" @@ -688,32 +757,32 @@ msgstr "Carpeta movida" #: seahub/base/templatetags/seahub_tags.py:111 msgid "Reverted library to status at" -msgstr "Biblioteca revertida para status a " +msgstr "Estado de la biblioteca revertido a las" #: seahub/base/templatetags/seahub_tags.py:114 #, python-format msgid "Reverted file \"%(file)s\" to status at %(time)s." -msgstr "Revertir archivo \"%(file)s\" para status a %(time)s." +msgstr "Archivo \"%(file)s\" revertido a las %(time)s." #: seahub/base/templatetags/seahub_tags.py:118 msgid "Recovered deleted directory" msgstr "Carpeta borrada recuperada" -#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879 +#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965 msgid "Changed library name or description" -msgstr "La descripción o el nombre de la biblioteca fue modificado" +msgstr "Descripción o nombre de la biblioteca modificados." #: seahub/base/templatetags/seahub_tags.py:122 msgid "Auto merge by seafile system" -msgstr "Auto merge por el sistema seafile " +msgstr "Auto fusionar por sistema seafile" #: seahub/base/templatetags/seahub_tags.py:179 #: seahub/base/templatetags/seahub_tags.py:213 -#: seahub/group/templates/group/group_discuss.html:140 -#: seahub/templates/repo.html:1543 -#: seahub/templates/snippets/my_owned_repos.html:226 +#: seahub/group/templates/group/group_discuss.html:154 +#: seahub/templates/repo.html:1647 +#: seahub/templates/snippets/my_owned_repos.html:130 msgid "Just now" -msgstr "Ya" +msgstr "Ahora" #: seahub/base/templatetags/seahub_tags.py:188 #, python-format @@ -726,14 +795,14 @@ msgstr[1] "Hace %(days)d días" #, python-format msgid "%(hours)d hour ago" msgid_plural "%(hours)d hours ago" -msgstr[0] "Hace menos de %(hours)d hora" +msgstr[0] "Hace %(hours)d hora" msgstr[1] "Hace %(hours)d horas" #: seahub/base/templatetags/seahub_tags.py:202 #, python-format msgid "%(minutes)d minute ago" msgid_plural "%(minutes)d minutes ago" -msgstr[0] "Hace menos de un minuto" +msgstr[0] "Hace %(minutes)d minuto" msgstr[1] "Hace %(minutes)d minutos" #: seahub/base/templatetags/seahub_tags.py:208 @@ -747,80 +816,86 @@ msgstr[1] "Hace %(seconds)d segundos" #: seahub/group/templates/group/group_info.html:31 #: seahub/group/templates/group/group_info.html:34 #: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/share/views.py:365 seahub/share/views.py:496 +#: seahub/share/views.py:362 seahub/share/views.py:493 #: seahub/share/templates/share/list_priv_shared_folders.html:23 #: seahub/share/templates/share/list_priv_shared_folders.html:36 #: seahub/share/templates/share/repos.html:24 #: seahub/share/templates/share/repos.html:26 #: seahub/share/templates/share/repos.html:40 #: seahub/share/templates/share/user_share_list.html:42 -#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26 +#: seahub/templates/pubrepo.html.py:29 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 #: seahub/templates/snippets/my_owned_repos.html:29 #: seahub/templates/snippets/my_owned_repos.html:31 #: seahub/templates/snippets/my_owned_repos.html:75 #: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:223 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 #: seahub/templates/snippets/repo_create_form.html:11 -#: seahub/templates/snippets/repo_share_form.html:47 -#: seahub/templates/sysadmin/userinfo.html:78 -#: seahub/templates/sysadmin/userinfo.html:104 +#: seahub/templates/snippets/repo_share_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:72 +#: seahub/templates/sysadmin/userinfo.html:98 msgid "Read-Write" -msgstr "Lectura-Escritura" +msgstr "Lectura / Escritura" #: seahub/base/templatetags/seahub_tags.py:312 #: seahub/group/templates/group/group_info.html:36 #: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/views.py:367 seahub/share/views.py:498 +#: seahub/share/views.py:364 seahub/share/views.py:495 #: seahub/share/templates/share/list_priv_shared_folders.html:34 #: seahub/share/templates/share/repos.html:38 #: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:190 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31 +#: seahub/templates/repo.html:20 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_shared_repos.html:22 #: seahub/templates/snippets/repo_create_form.html:12 -#: seahub/templates/snippets/repo_share_form.html:48 +#: seahub/templates/snippets/repo_share_form.html:26 msgid "Read-Only" msgstr "Sólo lectura" #: seahub/contacts/models.py:72 #: seahub/contacts/templates/contacts/contact_list.html:125 msgid "Email is required." -msgstr "Se requiere correo electrónico" +msgstr "Se requiere correo." -#: seahub/contacts/views.py:62 seahub/contacts/views.py:99 -#: seahub/group/views.py:806 +#: seahub/contacts/views.py:64 seahub/contacts/views.py:101 +#: seahub/group/views.py:796 #, python-format msgid "%s is not a valid email." -msgstr "" +msgstr "%s no es un correo válido." -#: seahub/contacts/views.py:67 seahub/contacts/views.py:103 +#: seahub/contacts/views.py:69 seahub/contacts/views.py:105 #, python-format msgid "%s is already in your contacts." -msgstr "" +msgstr "%s ya está en sus contactos." -#: seahub/contacts/views.py:76 seahub/contacts/views.py:111 +#: seahub/contacts/views.py:78 seahub/contacts/views.py:113 #, python-format msgid "Successfully added %s to contacts." -msgstr "El contacto %s fue agregado satisfactoriamente." +msgstr "Se agregó con éxito %s a los contactos." -#: seahub/contacts/views.py:81 seahub/contacts/views.py:114 +#: seahub/contacts/views.py:83 seahub/contacts/views.py:116 #, python-format msgid "Failed to add %s to contacts." -msgstr "Falla al incluir %s a contactos." +msgstr "Fallo al agregar %s a los contactos." -#: seahub/contacts/views.py:136 +#: seahub/contacts/views.py:138 #, python-format msgid "Successfully edited %s." -msgstr "%s fue editado satisfactoriamente" +msgstr "Editado con éxito %s" -#: seahub/contacts/views.py:149 +#: seahub/contacts/views.py:151 #, python-format msgid "Successfully Deleted %s" -msgstr "%s fue borrado satisfactoriamente" +msgstr "Borrado con éxito %s" #: seahub/contacts/templates/contacts/contact_list.html:4 #: seahub/contacts/templates/contacts/contact_list.html:10 @@ -837,15 +912,15 @@ msgstr "Agregar Contactos" #: seahub/contacts/templates/contacts/contact_list.html:17 msgid "Email " -msgstr "_E-Mail" +msgstr "E-Mail" #: seahub/contacts/templates/contacts/contact_list.html:18 #: seahub/group/templates/group/group_info.html:21 #: seahub/group/templates/group/group_info_for_pub.html:13 -#: seahub/group/templates/group/group_wiki.html:20 -#: seahub/group/templates/group/group_wiki.html:54 +#: seahub/group/templates/group/group_wiki.html:46 +#: seahub/group/templates/group/group_wiki.html:91 #: seahub/group/templates/group/group_wiki_pages.html:30 -#: seahub/message/templates/message/all_msg_list.html:21 +#: seahub/message/templates/message/all_msg_list.html:22 #: seahub/share/templates/share/links.html:20 #: seahub/share/templates/share/links.html:56 #: seahub/share/templates/share/list_priv_shared_folders.html:15 @@ -853,45 +928,46 @@ msgstr "_E-Mail" #: seahub/share/templates/share/priv_shared_files.html:53 #: seahub/share/templates/share/repos.html:15 #: seahub/share/templates/share/user_share_list.html:33 -#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52 +#: seahub/templates/my_group_repos.html:8 +#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16 +#: seahub/templates/repo_history_view.html:52 #: seahub/templates/repo_recycle_view.html:53 -#: seahub/templates/repo_settings.html:15 -#: seahub/templates/view_shared_dir.html:32 -#: seahub/templates/registration/registration_form.html:12 +#: seahub/templates/repo_settings.html:17 +#: seahub/templates/view_shared_dir.html:27 +#: seahub/templates/registration/registration_form.html:13 +#: seahub/templates/snippets/my_group_repos.html:8 #: seahub/templates/snippets/my_owned_repos.html:20 #: seahub/templates/snippets/my_owned_repos.html:67 -#: seahub/templates/snippets/my_owned_repos.html:114 -#: seahub/templates/snippets/my_owned_repos.html:168 -#: seahub/templates/snippets/my_owned_repos.html:217 +#: seahub/templates/snippets/my_owned_repos.html:121 +#: seahub/templates/snippets/my_shared_repos.html:6 #: seahub/templates/snippets/repo_create_form.html:4 -#: seahub/templates/snippets/repo_dir_data.html:38 +#: seahub/templates/snippets/repo_dir_data.html:40 #: seahub/templates/sysadmin/repoadmin_table.html:4 -#: seahub/templates/sysadmin/sys_group_admin.html:12 -#: seahub/templates/sysadmin/sys_list_system.html:20 +#: seahub/templates/sysadmin/sys_group_admin.html:13 +#: seahub/templates/sysadmin/sys_list_system.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:11 -#: seahub/templates/sysadmin/sys_publink_admin.html:10 -#: seahub/templates/sysadmin/sys_repo_search.html:9 -#: seahub/templates/sysadmin/userinfo.html:71 -#: seahub/templates/sysadmin/userinfo.html:97 -#: seahub/templates/wiki/personal_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:49 +#: seahub/templates/sysadmin/sys_publink_admin.html:12 +#: seahub/templates/sysadmin/sys_repo_search.html:11 +#: seahub/templates/sysadmin/userinfo.html:65 +#: seahub/templates/sysadmin/userinfo.html:91 +#: seahub/templates/wiki/personal_wiki.html:41 +#: seahub/templates/wiki/personal_wiki.html:82 #: seahub/templates/wiki/personal_wiki_pages.html:28 msgid "Name" msgstr "Nombre" #: seahub/contacts/templates/contacts/contact_list.html:19 -#: seahub/templates/registration/registration_form.html:28 +#: seahub/templates/registration/registration_form.html:29 msgid "Note" msgstr "Nota" #: seahub/contacts/templates/contacts/contact_list.html:20 #: seahub/group/templates/group/group_info.html:25 #: seahub/group/templates/group/group_info_for_pub.html:17 -#: seahub/group/templates/group/group_manage.html:22 +#: seahub/group/templates/group/group_manage.html:25 #: seahub/group/templates/group/group_manage.html:49 #: seahub/group/templates/group/group_manage.html:79 -#: seahub/notifications/templates/notifications/notification_list.html:7 -#: seahub/notifications/templates/notifications/notification_list.html:26 +#: seahub/notifications/templates/notifications/notification_list.html:21 #: seahub/share/templates/share/links.html:23 #: seahub/share/templates/share/links.html:59 #: seahub/share/templates/share/list_priv_shared_folders.html:19 @@ -900,56 +976,64 @@ msgstr "Nota" #: seahub/share/templates/share/repos.html:19 #: seahub/share/templates/share/user_share_list.html:36 #: seahub/templates/client_mgmt.html:17 -#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17 +#: seahub/templates/file_revisions.html:28 +#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20 #: seahub/templates/repo_recycle_view.html:56 #: seahub/templates/repo_view_snapshot.html:18 -#: seahub/templates/view_shared_dir.html:34 +#: seahub/templates/view_shared_dir.html:29 #: seahub/templates/snippets/my_owned_repos.html:23 #: seahub/templates/snippets/my_owned_repos.html:70 -#: seahub/templates/snippets/my_owned_repos.html:118 -#: seahub/templates/snippets/my_owned_repos.html:220 -#: seahub/templates/snippets/repo_dir_data.html:41 +#: seahub/templates/snippets/my_owned_repos.html:124 +#: seahub/templates/snippets/my_shared_repos.html:10 +#: seahub/templates/snippets/repo_dir_data.html:43 #: seahub/templates/sysadmin/repoadmin_table.html:8 -#: seahub/templates/sysadmin/sys_group_admin.html:15 +#: seahub/templates/sysadmin/sys_group_admin.html:16 #: seahub/templates/sysadmin/sys_org_admin.html:15 -#: seahub/templates/sysadmin/sys_publink_admin.html:14 -#: seahub/templates/sysadmin/useradmin_table.html:8 -#: seahub/templates/sysadmin/userinfo.html:73 +#: seahub/templates/sysadmin/sys_publink_admin.html:16 +#: seahub/templates/sysadmin/useradmin_table.html:9 +#: seahub/templates/sysadmin/useradmin_table.html:74 +#: seahub/templates/sysadmin/userinfo.html:67 msgid "Operations" msgstr "Operaciones" #: seahub/contacts/templates/contacts/contact_list.html:29 +#: seahub/group/templates/group/group_wiki.html:22 #: seahub/share/templates/share/list_priv_shared_folders.html:29 #: seahub/share/templates/share/repos.html:33 #: seahub/templates/file_edit.html:80 #: seahub/templates/view_file_markdown.html:13 #: seahub/templates/view_file_sf.html:6 #: seahub/templates/view_file_text.html:24 -#: seahub/templates/sysadmin/useradmin_table.html:23 +#: seahub/templates/sysadmin/useradmin_table.html:24 +#: seahub/templates/sysadmin/useradmin_table.html:90 +#: seahub/templates/wiki/personal_wiki.html:21 msgid "Edit" msgstr "Editar" #: seahub/contacts/templates/contacts/contact_list.html:30 -#: seahub/group/templates/group/group_discuss.html:33 -#: seahub/group/templates/group/group_discuss.html:138 -#: seahub/group/templates/group/group_manage.html:31 +#: seahub/group/templates/group/group_discuss.html:45 +#: seahub/group/templates/group/group_discuss.html:152 +#: seahub/group/templates/group/group_manage.html:34 #: seahub/group/templates/group/group_manage.html:58 -#: seahub/notifications/templates/notifications/notification_list.html:38 -#: seahub/profile/templates/profile/set_profile.html:102 -#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267 +#: seahub/message/templates/message/user_msg.html:8 +#: seahub/message/templates/message/user_msg_list.html:52 +#: seahub/notifications/templates/notifications/notification_list.html:33 +#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264 #: seahub/templates/view_shared_upload_link.html:87 -#: seahub/templates/snippets/file_share_popup.html:34 -#: seahub/templates/snippets/file_share_popup.html:54 +#: seahub/templates/snippets/file_share_popup.html:55 +#: seahub/templates/snippets/file_share_popup.html:88 #: seahub/templates/snippets/my_owned_repos.html:46 #: seahub/templates/snippets/my_owned_repos.html:94 -#: seahub/templates/snippets/my_owned_repos.html:232 +#: seahub/templates/snippets/my_owned_repos.html:136 #: seahub/templates/snippets/repo_dirents.html:35 #: seahub/templates/snippets/repo_dirents.html:89 -#: seahub/templates/sysadmin/repoadmin_table.html:18 -#: seahub/templates/sysadmin/sys_group_admin.html:22 +#: seahub/templates/sysadmin/repoadmin_table.html:24 +#: seahub/templates/sysadmin/sys_group_admin.html:23 #: seahub/templates/sysadmin/sys_org_admin.html:23 -#: seahub/templates/sysadmin/useradmin_table.html:46 -#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/useradmin_table.html:49 +#: seahub/templates/sysadmin/useradmin_table.html:115 +#: seahub/templates/sysadmin/userinfo.html:76 msgid "Delete" msgstr "Borrar" @@ -961,23 +1045,25 @@ msgstr "No tienes ningún contacto" msgid "" "Add your contacts so you can quickly share libraries and send file shared " "link." -msgstr "Agrega tus contactos para que puedas compartir bibliotecas rápidamente y enviar los enlaces hacia los archivos compartidos" +msgstr "Agrega contactos para compartir bibliotecas y enviar enlaces de descarga rápidamente." #: seahub/contacts/templates/contacts/contact_list.html:44 #: seahub/contacts/templates/contacts/contact_list.html:55 -#: seahub/group/templates/group/group_manage.html:21 +#: seahub/group/templates/group/group_manage.html:24 #: seahub/group/templates/group/group_manage.html:48 -#: seahub/templates/repo_settings.html:34 -#: seahub/templates/registration/login.html:8 -#: seahub/templates/registration/registration_form.html:16 +#: seahub/templates/repo_settings.html:37 +#: seahub/templates/registration/login.html:34 +#: seahub/templates/registration/registration_form.html:17 #: seahub/templates/snippets/add_to_contacts_form.html:2 #: seahub/templates/sysadmin/repo_transfer_form.html:5 -#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18 -#: seahub/templates/sysadmin/sys_useradmin.html:24 -#: seahub/templates/sysadmin/user_search.html:9 -#: seahub/templates/sysadmin/useradmin_table.html:4 +#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22 +#: seahub/templates/sysadmin/sys_useradmin.html:29 +#: seahub/templates/sysadmin/user_search.html:11 +#: seahub/templates/sysadmin/useradmin_table.html:5 +#: seahub/templates/sysadmin/useradmin_table.html:70 +#: seahub/templates/sysadmin/userinfo.html:11 msgid "Email" -msgstr "Correo electrónico" +msgstr "Email" #: seahub/contacts/templates/contacts/contact_list.html:46 #: seahub/contacts/templates/contacts/contact_list.html:57 @@ -993,24 +1079,24 @@ msgstr "Nota (opcional)" #: seahub/contacts/templates/contacts/contact_list.html:54 msgid "Edit Contact" -msgstr "Editar contactos" +msgstr "Editar Contacto" #: seahub/contacts/templates/contacts/contact_list.html:115 msgid "Delete Contact" -msgstr "Borrar contacto" +msgstr "Borrar Contacto" #: seahub/contacts/templates/contacts/contact_list.html:115 -#: seahub/notifications/templates/notifications/notification_list.html:57 -#: seahub/templates/sysadmin/sys_group_admin.html:63 +#: seahub/notifications/templates/notifications/notification_list.html:52 +#: seahub/templates/sysadmin/sys_group_admin.html:64 #: seahub/templates/sysadmin/sys_org_admin.html:63 #: seahub/templates/sysadmin/useradmin_js.html:4 #, python-format msgid "Are you sure you want to delete %s ?" -msgstr "" +msgstr "¿Seguro que quiere borrar %s ?" #: seahub/contacts/templates/contacts/contact_list.html:129 msgid "You cannot add yourself." -msgstr "" +msgstr "No puedes agregarte a ti mismo." #: seahub/group/error_msg.py:7 msgid "The group has already created" @@ -1030,7 +1116,7 @@ msgstr "No se pudo crear el grupo en org." #: seahub/group/error_msg.py:15 msgid "Permission error: only group staff can add member" -msgstr "Error de permisología: sólo miembros del grupo de administradores pueden agregar miembros" +msgstr "Error de permiso: sólo miembros del grupo de administradores pueden agregar miembros" #: seahub/group/error_msg.py:16 seahub/group/error_msg.py:22 msgid "Group does not exist" @@ -1042,11 +1128,11 @@ msgstr "El grupo está completo" #: seahub/group/error_msg.py:18 msgid "Failed to add member to group" -msgstr "No se pudo agregar un miembro al grupo" +msgstr "Fallo al agregar miembro al grupo" #: seahub/group/error_msg.py:21 msgid "Only group staff can remove member" -msgstr "Sólo el grupo de administración puede remover miembros" +msgstr "Sólo el equipo de administración puede remover miembros" #: seahub/group/error_msg.py:23 msgid "Can not remove myself" @@ -1058,427 +1144,443 @@ msgstr "El nombre del grupo no puede estar vacío" #: seahub/group/forms.py:31 msgid "Group name is too long (maximum is 255 characters)" -msgstr "El nombre del grupo es demasiado extenso (el máximo es de 255 caracteres" +msgstr "El nombre del grupo es demasiado largo (máximo 255 caracteres)" #: seahub/group/forms.py:36 msgid "Group name can only contain letters, numbers or underscore" -msgstr "" +msgstr "El nombre del grupo sólo puede contener letras, números o guión bajo" #: seahub/group/forms.py:46 msgid "Verification message can't be empty" -msgstr "La verificación del mensaje no puede estar vacía" +msgstr "El mensaje de verificación no puede estar vacío" #: seahub/group/forms.py:47 msgid "Verification message is too long (maximun is 255 characters)" -msgstr "El mensaje de verificación es muy extenso (máximo 255 caracteres)" +msgstr "El mensaje de verificación es muy largo (máximo 255 caracteres)" #: seahub/group/forms.py:67 seahub/wiki/forms.py:27 #, python-format msgid "\"%s\" is not a valid name" msgstr "\"%s\" no es un nombre válido" -#: seahub/group/views.py:145 +#: seahub/group/views.py:140 #, python-format msgid "" "You can only create %d groups.Upgrade " "account." -msgstr "" +msgstr "Sólo puede crear %d grupos.Actualizar cuenta." -#: seahub/group/views.py:160 +#: seahub/group/views.py:155 msgid "There is already a group with that name." msgstr "Ya existe un grupo con ese nombre" -#: seahub/group/views.py:264 +#: seahub/group/views.py:259 #, python-format msgid "Successfully renamed group to \"%s\"." -msgstr "" +msgstr "Grupo renombrado con éxito a \"%s\"." -#: seahub/group/views.py:266 +#: seahub/group/views.py:261 msgid "" "Failed to rename group, group name can only contain letters, numbers or " "underscore" -msgstr "" +msgstr "Fallo al renombrar el grupo, el nombre del grupo sólo puede contener letras, números y guión bajo" -#: seahub/group/views.py:285 +#: seahub/group/views.py:280 #, python-format msgid "Email %s is not valid." -msgstr "" +msgstr "Email %s es inválido." -#: seahub/group/views.py:314 seahub/group/views.py:336 +#: seahub/group/views.py:309 seahub/group/views.py:331 msgid "Only administrators can make the group public" -msgstr "Sólo los administradores pueden crear el grupo público" +msgstr "Sólo los administradores pueden hacer público el grupo" -#: seahub/group/views.py:382 +#: seahub/group/views.py:377 seahub/message/views.py:121 msgid "The message doesn't exist" msgstr "El mensaje no existe" -#: seahub/group/views.py:392 +#: seahub/group/views.py:387 seahub/message/views.py:130 msgid "You don't have the permission." -msgstr "No posees la permisología adecuada" +msgstr "No tienes los permisos adecuados" -#: seahub/group/views.py:630 seahub/group/views.py:781 +#: seahub/group/views.py:626 seahub/group/views.py:771 #, python-format msgid "" "You can only invite %d members.Upgrade " "account." -msgstr "" +msgstr "Sólo puedes invitar %d miembros. Actualizar cuenta." -#: seahub/group/views.py:655 -msgid "Your friend added you to a group at Seafile." -msgstr "Un amigo te agregó a un grupo en Seafile" +#: seahub/group/views.py:645 +#, python-format +msgid "You are invited to join a group on %s" +msgstr "Has sido invitado a unirte a un grupo en %s" -#: seahub/group/views.py:681 +#: seahub/group/views.py:671 #, python-format msgid "Failed to add, %s is not registerd." -msgstr "No se pudo agregar a %s pues no está registrado." +msgstr "Fallo al agregar a %s, no está registrado." -#: seahub/group/views.py:695 +#: seahub/group/views.py:685 #, python-format msgid "Successfully added. An email has been sent." msgid_plural "Successfully added. %(count)s emails have been sent." -msgstr[0] "Satisfactoriamente agregado. Se envió un correo" -msgstr[1] "Satisfactoriamente agregado. Se han envíado %(count)s correos." +msgstr[0] "Agregado con éxito. Se envió un correo" +msgstr[1] "Agregado con éxito. Se enviaron %(count)s correos." -#: seahub/group/views.py:703 +#: seahub/group/views.py:693 msgid "Successfully added." -msgstr "Satisfactoriamente agregado." +msgstr "Agregado con éxito." + +#: seahub/group/views.py:742 +#, python-format +msgid "Failed to add, %s is not a valid email." +msgstr "Fallo al agregar, %s no es un correo válido." #: seahub/group/views.py:752 #, python-format -msgid "Failed to add, %s is not a valid email." -msgstr "" - -#: seahub/group/views.py:762 -#, python-format msgid "Failed to add, %s is not registrated." -msgstr "No se pudo agregar, %s no se encuentra registrado." +msgstr "Fallo al agregar, %s no está registrado." -#: seahub/group/views.py:794 seahub/group/views.py:811 -#: seahub/group/views.py:838 +#: seahub/group/views.py:784 seahub/group/views.py:801 +#: seahub/group/views.py:828 msgid "Operation succeeded." -msgstr "Operación correcta." +msgstr "Operación exitosa." -#: seahub/group/views.py:840 +#: seahub/group/views.py:830 #, python-format msgid "Failed：%s" -msgstr "Falló: %s" +msgstr "Fallo: %s" -#: seahub/group/views.py:865 +#: seahub/group/views.py:855 msgid "Failed to unshare: the group doesn't exist." -msgstr "No se pudo dejar de compartir: el grupo no existe." +msgstr "Fallo al dejar de compartir: el grupo no existe." -#: seahub/group/views.py:870 +#: seahub/group/views.py:860 msgid "" "Operation failed: only administrators and the owner of the library can " "unshare it." -msgstr "Operación fallida: sólo administradores y propietarios de una biblioteca pueden dejar de compartirla." +msgstr "Operación fallida: sólo administradores y el propietario de una biblioteca pueden dejar de compartirla." -#: seahub/group/views.py:873 +#: seahub/group/views.py:863 msgid "Failed to unshare: internal error." -msgstr "Fallo al intentar dejar de compartir: error interno." +msgstr "Fallo al dejar de compartir: error interno." -#: seahub/group/views.py:902 +#: seahub/group/views.py:892 msgid "Error: wrong group id" msgstr "Error: id de grupo erróneo" -#: seahub/group/views.py:907 +#: seahub/group/views.py:897 msgid "Error: the group does not exist." msgstr "Error: el grupo no existe." -#: seahub/group/views.py:939 +#: seahub/group/views.py:929 #, python-format msgid "Successfully posted to %(groups)s." -msgstr "" +msgstr "Posteado con éxito en %(groups)s." -#: seahub/group/views.py:942 +#: seahub/group/views.py:932 #, python-format msgid "Error: you are not in group %s." msgstr "Error: no estás en el grupo %s." -#: seahub/group/views.py:954 +#: seahub/group/views.py:944 msgid "Error: the library does not exist." msgstr "Error: la biblioteca no existe." -#: seahub/group/views.py:957 +#: seahub/group/views.py:947 msgid "Error: no path." -msgstr "Error: sin camino." +msgstr "Error: sin ruta" -#: seahub/group/views.py:995 +#: seahub/group/views.py:985 msgid "Failed to create: the group does not exist." msgstr "No se pudo crear: el grupo no existe." -#: seahub/group/views.py:999 +#: seahub/group/views.py:989 msgid "Failed to create: you are not in the group." -msgstr "No se pudo crear: no estás en ningún grupo." +msgstr "No se pudo crear: no estás en el grupo." -#: seahub/group/views.py:1025 seahub/group/views.py:1056 -#: seahub/group/views.py:1436 seahub/views/wiki.py:127 +#: seahub/group/views.py:1015 seahub/group/views.py:1046 +#: seahub/group/views.py:1460 seahub/views/wiki.py:146 msgid "Failed to create" msgstr "No se pudo crear" -#: seahub/group/views.py:1039 seahub/group/views.py:1069 -#: seahub/group/views.py:1445 +#: seahub/group/views.py:1029 seahub/group/views.py:1059 +#: seahub/group/views.py:1469 msgid "Failed to create: internal error." msgstr "No se pudo crear: error interno." -#: seahub/group/views.py:1093 +#: seahub/group/views.py:1083 msgid "You are already in the group." msgstr "Ya estás en el grupo." -#: seahub/group/views.py:1108 +#: seahub/group/views.py:1098 msgid "Sent successfully, the group admin will handle it." -msgstr "Enviado satisfactoriamente, el administrador del grupo manejará la petición" +msgstr "Petición enviada con éxito al administrador." -#: seahub/group/views.py:1269 seahub/views/__init__.py:575 -#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596 -#: seahub/views/file.py:686 +#: seahub/group/views.py:1174 +msgid "Discussion is required." +msgstr "Se requiere discusión" + +#: seahub/group/views.py:1277 seahub/views/__init__.py:659 +#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618 +#: seahub/views/file.py:710 msgid "File does not exist" msgstr "El archivo no existe" -#: seahub/group/views.py:1305 +#: seahub/group/views.py:1313 msgid "Successfully enable \"Wiki\"." -msgstr "\"Wiki\" habilitado." +msgstr "\"Wiki\" activado con éxito" -#: seahub/group/views.py:1310 +#: seahub/group/views.py:1318 msgid "Successfully disable \"Wiki\"." -msgstr "\"Wiki\" deshabilitado." +msgstr "\"Wiki\" desactivado con éxito" -#: seahub/group/views.py:1346 seahub/group/views.py:1483 -#: seahub/views/wiki.py:54 seahub/views/wiki.py:161 +#: seahub/group/views.py:1357 seahub/group/views.py:1531 +#: seahub/views/wiki.py:60 seahub/views/wiki.py:202 msgid "Failed to create wiki page. Please retry later." -msgstr "No se pudo crear la página wiki. Por favor, inténtelo de nuevo más tarde." +msgstr "Fallo al crear la página wiki. Intenta más tarde." -#: seahub/group/views.py:1388 seahub/views/__init__.py:569 -#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448 -#: seahub/views/wiki.py:90 +#: seahub/group/views.py:1412 seahub/views/__init__.py:653 +#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532 +#: seahub/views/wiki.py:109 msgid "Internal Server Error" msgstr "Error interno del servidor" -#: seahub/group/views.py:1390 seahub/views/wiki.py:92 +#: seahub/group/views.py:1414 seahub/views/wiki.py:111 msgid "Wiki does not exists." -msgstr "Wiki no existe." +msgstr "No existe la wiki" -#: seahub/group/views.py:1452 seahub/views/wiki.py:134 +#: seahub/group/views.py:1476 seahub/group/views.py:1501 +#: seahub/views/wiki.py:153 seahub/views/wiki.py:176 msgid "Failed to create home page. Please retry later" -msgstr "Falla al crear la home page. Por favor intente mas tarde" +msgstr "Fallo al crear página de inicio. Intenta más tarde." -#: seahub/group/views.py:1473 seahub/group/views.py:1499 -#: seahub/group/views.py:1517 seahub/views/wiki.py:151 -#: seahub/views/wiki.py:174 seahub/views/wiki.py:189 +#: seahub/group/views.py:1492 seahub/views/wiki.py:167 +msgid "Failed to set wiki library." +msgstr "Fallo al establecer biblioteca de wiki." + +#: seahub/group/views.py:1521 seahub/group/views.py:1547 +#: seahub/group/views.py:1565 seahub/views/wiki.py:192 +#: seahub/views/wiki.py:215 seahub/views/wiki.py:230 msgid "Wiki is not found." -msgstr "Wiki no encontrado." +msgstr "Wiki no encontrado" -#: seahub/group/views.py:1480 seahub/views/wiki.py:158 +#: seahub/group/views.py:1528 seahub/views/wiki.py:199 #, python-format msgid "Page \"%s\" already exists." -msgstr "Página \"%s\" ya existe." +msgstr "La página \"%s\" ya existe." -#: seahub/group/templates/group/add_member_email.html:2 +#: seahub/group/views.py:1570 #, python-format -msgid "" -"%(email)s invite you to join group %(group.group_name)s. Please go to the " -"following page and sign up:" -msgstr "%(email)s de invitación para unirte al grupo %(group.group_name)s. Por favor ve a la siguiente página e inscríbete: " +msgid "Successfully deleted \"%s\"." +msgstr "Borrado con éxito \"%s\"." -#: seahub/group/templates/group/add_member_email.html:5 -#: seahub/group/templates/group/group_join_email.html:6 -#: seahub/templates/shared_link_email.html:7 -#: seahub/templates/shared_upload_link_email.html:7 -#: seahub/templates/registration/password_reset_email.html:10 -#: seahub/templates/sysadmin/user_add_email.html:14 -#: seahub/templates/sysadmin/user_reset_email.html:6 -msgid "Thanks for using our site!" -msgstr "Gracias por usar nuestro sitio!" - -#: seahub/group/templates/group/add_member_email.html:7 -#: seahub/group/templates/group/group_join_email.html:8 -#: seahub/templates/shared_link_email.html:9 -#: seahub/templates/shared_upload_link_email.html:9 -#: seahub/templates/registration/password_reset_email.html:12 -#: seahub/templates/sysadmin/user_add_email.html:16 -#: seahub/templates/sysadmin/user_reset_email.html:8 +#: seahub/group/views.py:1572 #, python-format -msgid "The %(site_name)s team" -msgstr "El equipo de trabajo de %(site_name)s" +msgid "Failed to delete \"%s\". Please retry later." +msgstr "Fallo al eliminar \"%s\". Intenta más tarde." + +#: seahub/group/templates/group/add_member_email.html:8 +msgid "Hi, " +msgstr "Hola," + +#: seahub/group/templates/group/add_member_email.html:11 +#, python-format +msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: " +msgstr "%(email)s te ha invitado a unirte al grupo %(grp_name)s en %(site_name)s: " #: seahub/group/templates/group/discussion_list.html:18 -#: seahub/group/templates/group/group_discuss.html:72 -#: seahub/group/templates/group/group_discuss.html:148 -#: seahub/group/templates/group/new_msg_reply.html:46 +#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:161 +#: seahub/group/templates/group/new_msg_reply.html:48 msgid "Hide replies" -msgstr "Esconder respuestas" +msgstr "Ocultar respuestas" #: seahub/group/templates/group/discussion_list.html:31 -#: seahub/group/templates/group/group_discuss.html:86 +#: seahub/group/templates/group/group_discuss.html:100 #: seahub/group/templates/group/group_reply_list.html:11 -#: seahub/group/templates/group/new_msg_reply.html:56 +#: seahub/group/templates/group/new_msg_reply.html:58 msgid "Reply" msgstr "Responder" #: seahub/group/templates/group/discussion_list.html:40 -#: seahub/group/templates/group/group_discuss.html:96 -#: seahub/group/templates/group/group_discuss.html:153 -#: seahub/group/templates/group/new_msg_reply.html:63 +#: seahub/group/templates/group/group_discuss.html:110 +#: seahub/group/templates/group/group_discuss.html:166 +#: seahub/group/templates/group/new_msg_reply.html:65 msgid "Add a reply..." -msgstr "Incluir una respuesta..." +msgstr "Agregar respuesta..." #: seahub/group/templates/group/discussion_list.html:41 -#: seahub/group/templates/group/group_discuss.html:97 -#: seahub/group/templates/group/group_discuss.html:154 -#: seahub/group/templates/group/new_msg_reply.html:64 +#: seahub/group/templates/group/group_discuss.html:111 +#: seahub/group/templates/group/group_discuss.html:167 +#: seahub/group/templates/group/new_msg_reply.html:66 msgid "It can not be blank and should be no more than 2048 characters." -msgstr "No puede ser en blanco y debe ser no más de 2048 caracteres." +msgstr "No puede estar en blanco ni ser mayor a 2048 caracteres." #: seahub/group/templates/group/discussion_list.html:43 -#: seahub/group/templates/group/group_discuss.html:17 -#: seahub/group/templates/group/group_discuss.html:99 -#: seahub/group/templates/group/group_discuss.html:156 +#: seahub/group/templates/group/group_discuss.html:18 +#: seahub/group/templates/group/group_discuss.html:30 +#: seahub/group/templates/group/group_discuss.html:113 +#: seahub/group/templates/group/group_discuss.html:169 #: seahub/group/templates/group/group_info.html:131 -#: seahub/group/templates/group/new_msg_reply.html:66 -#: seahub/message/templates/message/all_msg_list.html:51 -#: seahub/message/templates/message/user_msg_list.html:21 -#: seahub/profile/templates/profile/set_profile.html:113 +#: seahub/group/templates/group/group_wiki.html:62 +#: seahub/group/templates/group/new_msg_reply.html:68 +#: seahub/message/templates/message/all_msg_list.html:52 +#: seahub/message/templates/message/user_msg_list.html:22 +#: seahub/message/templates/message/user_msg_list.html:34 +#: seahub/profile/templates/profile/set_profile.html:124 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99 -#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153 -#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198 -#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266 -#: seahub/templates/shared_file_view.html:51 +#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144 +#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189 +#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205 +#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51 #: seahub/templates/view_shared_upload_link.html:86 -#: seahub/templates/snippets/file_share_popup.html:42 -#: seahub/templates/snippets/file_share_popup.html:62 +#: seahub/templates/snippets/file_share_popup.html:63 +#: seahub/templates/snippets/file_share_popup.html:96 #: seahub/templates/sysadmin/repo_transfer_form.html:9 +#: seahub/templates/wiki/personal_wiki.html:57 msgid "Cancel" msgstr "Cancelar" -#: seahub/group/templates/group/group_base.html:13 +#: seahub/group/templates/group/group_base.html:16 +#: seahub/group/templates/group/group_base.html:48 +#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39 +msgid "Enable Modules" +msgstr "Habilitar Módulos" + +#: seahub/group/templates/group/group_base.html:18 msgid "This group is public." msgstr "Este grupo es público." -#: seahub/group/templates/group/group_base.html:16 -#: seahub/group/templates/group/group_base.html:50 -#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38 -#: seahub/templates/snippets/modules_toggle_tab.html:2 -msgid "Enable Modules" -msgstr "Habilitar módulos" - -#: seahub/group/templates/group/group_base.html:19 -msgid "Quit" -msgstr "" - -#: seahub/group/templates/group/group_base.html:23 +#: seahub/group/templates/group/group_base.html:21 #: seahub/group/templates/group/group_info.html:11 #: seahub/group/templates/group/group_info_for_pub.html:8 #: seahub/group/templates/group/groups_right_panel.html:16 #: seahub/share/templates/share/repos.html:10 -#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12 -#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4 -#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12 -#: seahub/templates/pubrepo.html:8 +#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29 +#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11 +#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9 +#: seahub/templates/sysadmin/base.html:9 msgid "Libraries" msgstr "Bibliotecas" -#: seahub/group/templates/group/group_base.html:29 -#: seahub/group/templates/group/group_base.html:56 +#: seahub/group/templates/group/group_base.html:27 +#: seahub/group/templates/group/group_base.html:55 #: seahub/group/templates/group/groups_right_panel.html:19 msgid "Wiki" msgstr "Wiki" -#: seahub/group/templates/group/group_base.html:34 -#: seahub/templates/home_base.html:30 +#: seahub/group/templates/group/group_base.html:32 +#: seahub/templates/home_base.html:31 msgid "Files" msgstr "Archivos" -#: seahub/group/templates/group/group_base.html:38 -#: seahub/group/templates/group/group_manage.html:9 -#: seahub/group/templates/group/group_members.html:7 +#: seahub/group/templates/group/group_base.html:36 +#: seahub/group/templates/group/group_manage.html:10 +#: seahub/group/templates/group/group_members.html:8 +#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16 msgid "Members" msgstr "Miembros" -#: seahub/group/templates/group/group_base.html:42 +#: seahub/group/templates/group/group_base.html:40 +#: seahub/templates/sysadmin/sys_useradmin.html:16 msgid "Admin" -msgstr "Administrador" - -#: seahub/group/templates/group/group_base.html:73 -msgid "Quit Group" -msgstr "Salir del grupo" - -#: seahub/group/templates/group/group_base.html:74 -msgid "Are you sure you want to quit this group?" -msgstr "Usted quiere salir de este grupo?" +msgstr "Administrar" #: seahub/group/templates/group/group_discuss.html:12 msgid "Add a discussion..." -msgstr "Agregar una discusión ..." +msgstr "Agregar discusión..." -#: seahub/group/templates/group/group_discuss.html:21 +#: seahub/group/templates/group/group_discuss.html:19 +#: seahub/message/templates/message/all_msg_list.html:46 +#: seahub/message/templates/message/user_msg_list.html:23 +msgid "Add files" +msgstr "Agregar archivos" + +#: seahub/group/templates/group/group_discuss.html:25 +#: seahub/message/templates/message/user_msg_list.html:29 +msgid "Choose a file or files:" +msgstr "Elije uno o mas archivos:" + +#: seahub/group/templates/group/group_discuss.html:33 msgid "After login, you can post discussions and add replies." -msgstr "Después del login, puede publicar las discusiones y añadir respuestas." +msgstr "Despues de iniciar sesión, puedes agregar discusiones y respuestas." -#: seahub/group/templates/group/group_discuss.html:112 -#: seahub/message/templates/message/user_msg_list.html:65 -#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52 +#: seahub/group/templates/group/group_discuss.html:126 +#: seahub/message/templates/message/user_msg_list.html:80 +#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54 #: seahub/templates/repo_view_snapshot.html:51 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:29 -#: seahub/templates/sysadmin/sys_publink_admin.html:30 -#: seahub/templates/sysadmin/sys_repo_admin.html:23 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:30 +#: seahub/templates/sysadmin/sys_publink_admin.html:31 +#: seahub/templates/sysadmin/sys_repo_admin.html:25 +#: seahub/templates/sysadmin/sys_trafficadmin.html:41 #: seahub/templates/sysadmin/useradmin_paginator.html:4 msgid "Previous" msgstr "Anterior" -#: seahub/group/templates/group/group_discuss.html:122 -#: seahub/message/templates/message/user_msg_list.html:75 -#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55 +#: seahub/group/templates/group/group_discuss.html:136 +#: seahub/message/templates/message/user_msg_list.html:90 +#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57 #: seahub/templates/repo_view_snapshot.html:54 #: seahub/templates/view_file_pdf.html:30 -#: seahub/templates/snippets/file_content_js.html:63 -#: seahub/templates/sysadmin/sys_group_admin.html:32 -#: seahub/templates/sysadmin/sys_publink_admin.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:26 +#: seahub/templates/snippets/file_content_js.html:89 +#: seahub/templates/sysadmin/sys_group_admin.html:33 +#: seahub/templates/sysadmin/sys_publink_admin.html:34 +#: seahub/templates/sysadmin/sys_repo_admin.html:28 +#: seahub/templates/sysadmin/sys_trafficadmin.html:44 #: seahub/templates/sysadmin/useradmin_paginator.html:7 msgid "Next" msgstr "Próximo" -#: seahub/group/templates/group/group_discuss.html:128 -#: seahub/message/templates/message/user_msg_list.html:81 +#: seahub/group/templates/group/group_discuss.html:142 +#: seahub/message/templates/message/user_msg_list.html:96 msgid "↑Top" msgstr "↑Arriba" -#: seahub/group/templates/group/group_discuss.html:248 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 msgid "Really want to delete this discussion?" -msgstr "Realmente quiere eliminar esta discusión?" +msgstr "¿Seguro que deseas eliminar esta discusión?" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55 +#: seahub/templates/devices.html:45 #: seahub/templates/snippets/repo_del_popup.html:4 msgid "Yes" msgstr "Sí" -#: seahub/group/templates/group/group_discuss.html:248 -#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56 +#: seahub/group/templates/group/group_discuss.html:261 +#: seahub/message/templates/message/user_msg_list.html:183 +#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56 +#: seahub/templates/devices.html:46 #: seahub/templates/snippets/repo_del_popup.html:5 msgid "No" msgstr "No" -#: seahub/group/templates/group/group_discuss.html:263 +#: seahub/group/templates/group/group_discuss.html:276 +#: seahub/message/templates/message/user_msg_list.html:198 msgid "Successfully deleted" -msgstr "Eliminado satisfactoriamente" +msgstr "Eliminado con éxito" -#: seahub/group/templates/group/group_discuss.html:265 +#: seahub/group/templates/group/group_discuss.html:278 +#: seahub/message/templates/message/user_msg_list.html:200 msgid "Failed to delete: " -msgstr "No se pudo eliminar:" +msgstr "Fallo al eliminar:" -#: seahub/group/templates/group/group_discuss.html:269 -#: seahub/templates/repo.html:771 +#: seahub/group/templates/group/group_discuss.html:282 +#: seahub/message/templates/message/user_msg_list.html:204 +#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761 msgid "Failed." -msgstr "Falló" +msgstr "Falló." #: seahub/group/templates/group/group_info.html:12 msgid "Recent Changes" msgstr "Cambios recientes" #: seahub/group/templates/group/group_info.html:14 +#: seahub/templates/pubrepo.html:10 #: seahub/templates/snippets/my_owned_repos.html:13 #: seahub/templates/snippets/repo_create_form.html:3 msgid "New Library" @@ -1487,79 +1589,60 @@ msgstr "Nueva biblioteca" #: seahub/group/templates/group/group_info.html:22 #: seahub/group/templates/group/group_info.html:76 #: seahub/group/templates/group/group_info_for_pub.html:14 -#: seahub/group/templates/group/group_wiki.html:22 +#: seahub/group/templates/group/group_wiki.html:48 #: seahub/share/templates/share/list_priv_shared_folders.html:18 #: seahub/share/templates/share/repos.html:18 #: seahub/share/templates/share/user_share_list.html:34 -#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23 -#: seahub/templates/repo_settings.html:17 +#: seahub/templates/my_group_repos.html:9 +#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17 +#: seahub/templates/repo_history.html:23 +#: seahub/templates/repo_settings.html:19 +#: seahub/templates/snippets/my_group_repos.html:9 #: seahub/templates/snippets/my_owned_repos.html:21 -#: seahub/templates/snippets/my_owned_repos.html:115 -#: seahub/templates/snippets/my_owned_repos.html:169 -#: seahub/templates/snippets/my_owned_repos.html:218 +#: seahub/templates/snippets/my_owned_repos.html:122 +#: seahub/templates/snippets/my_shared_repos.html:7 #: seahub/templates/snippets/repo_create_form.html:6 #: seahub/templates/sysadmin/repoadmin_table.html:7 -#: seahub/templates/sysadmin/sys_list_system.html:22 -#: seahub/templates/sysadmin/userinfo.html:72 -#: seahub/templates/sysadmin/userinfo.html:99 -#: seahub/templates/wiki/personal_wiki.html:21 +#: seahub/templates/sysadmin/sys_list_system.html:25 +#: seahub/templates/sysadmin/userinfo.html:66 +#: seahub/templates/sysadmin/userinfo.html:93 +#: seahub/templates/wiki/personal_wiki.html:43 msgid "Description" msgstr "Descripción" #: seahub/group/templates/group/group_info.html:23 #: seahub/group/templates/group/group_info_for_pub.html:15 #: seahub/share/templates/share/user_share_list.html:35 -#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15 +#: seahub/templates/my_group_repos.html:10 +#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18 +#: seahub/templates/starred.html:15 +#: seahub/templates/snippets/my_group_repos.html:10 #: seahub/templates/snippets/my_owned_repos.html:22 #: seahub/templates/snippets/my_owned_repos.html:69 -#: seahub/templates/snippets/my_owned_repos.html:116 -#: seahub/templates/snippets/my_owned_repos.html:170 -#: seahub/templates/snippets/my_owned_repos.html:219 -#: seahub/templates/snippets/repo_dir_data.html:40 +#: seahub/templates/snippets/my_owned_repos.html:123 +#: seahub/templates/snippets/my_shared_repos.html:8 +#: seahub/templates/snippets/repo_dir_data.html:42 msgid "Last Update" msgstr "Última actualización" #: seahub/group/templates/group/group_info.html:24 #: seahub/group/templates/group/group_info_for_pub.html:16 -#: seahub/templates/snippets/my_owned_repos.html:117 -#: seahub/templates/snippets/my_owned_repos.html:171 +#: seahub/templates/my_group_repos.html:11 +#: seahub/templates/my_shared_repos.html:10 +#: seahub/templates/snippets/my_group_repos.html:11 +#: seahub/templates/snippets/my_shared_repos.html:9 msgid "Shared By" msgstr "Compartida por" -#: seahub/group/templates/group/group_info.html:31 -#: seahub/group/templates/group/group_info.html:34 -#: seahub/group/templates/group/group_info.html:36 -#: seahub/group/templates/group/group_info_for_pub.html:24 -#: seahub/group/templates/group/group_info_for_pub.html:26 -#: seahub/share/templates/share/list_priv_shared_folders.html:23 -#: seahub/share/templates/share/repos.html:24 -#: seahub/share/templates/share/repos.html:26 -#: seahub/share/templates/share/user_share_list.html:42 -#: seahub/share/templates/share/user_share_list.html:44 -#: seahub/templates/snippets/my_owned_repos.html:29 -#: seahub/templates/snippets/my_owned_repos.html:31 -#: seahub/templates/snippets/my_owned_repos.html:75 -#: seahub/templates/snippets/my_owned_repos.html:77 -#: seahub/templates/snippets/my_owned_repos.html:125 -#: seahub/templates/snippets/my_owned_repos.html:128 -#: seahub/templates/snippets/my_owned_repos.html:130 -#: seahub/templates/snippets/my_owned_repos.html:185 -#: seahub/templates/snippets/my_owned_repos.html:188 -#: seahub/templates/snippets/my_owned_repos.html:190 -#: seahub/templates/snippets/my_owned_repos.html:223 -#: seahub/templates/sysadmin/userinfo.html:78 -msgid "directory icon" -msgstr "directorio de iconos" - #: seahub/group/templates/group/group_info.html:52 #: seahub/share/templates/share/user_share_list.html:56 -#: seahub/templates/pubrepo.html:38 +#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41 #: seahub/templates/snippets/my_owned_repos.html:43 #: seahub/templates/snippets/my_owned_repos.html:89 -#: seahub/templates/snippets/my_owned_repos.html:144 -#: seahub/templates/snippets/my_owned_repos.html:229 +#: seahub/templates/snippets/my_owned_repos.html:133 +#: seahub/templates/snippets/my_shared_repos.html:36 msgid "Download and Sync" -msgstr "Bajar y Sincronizar" +msgstr "Descargar y Sincronizar" #: seahub/group/templates/group/group_info.html:55 #: seahub/share/templates/share/list_priv_shared_folders.html:43 @@ -1573,26 +1656,26 @@ msgstr "Bajar y Sincronizar" #: seahub/share/templates/share/repos.html:54 #: seahub/share/templates/share/repos.html:56 #: seahub/share/templates/share/user_share_list.html:61 -#: seahub/templates/pubrepo.html:41 +#: seahub/templates/pubrepo.html:44 msgid "Unshare" msgstr "Dejar de compartir" #: seahub/group/templates/group/group_info.html:63 msgid "No library is sharing to this group" -msgstr "No hay ninguna biblioteca compartida con este grupo" +msgstr "No hay bibiliotecas compartidas con este grupo" #: seahub/group/templates/group/group_info.html:64 msgid "" "You can share libraries by clicking the \"New Library\" button above or the " "\"Share\" icon on your libraries list." -msgstr "Puede compartir bibliotecas haciendo clic en el botón \"Nueva Biblioteca\" arriba o en el icono de \"Compartir\" en la lista de bibliotecas." +msgstr "Puedes compartir bibliotecas haciendo click en \"Nueva Biblioteca\" o en el icono \"Compartir\" de la lista de bibliotecas." #: seahub/group/templates/group/group_info.html:65 msgid "" "Libraries shared as writable can be downloaded and synced by other group " "members. Read only libraries can only be downloaded, updates by others will " "not be uploaded." -msgstr "Bibliotecas compartidas como grabable pueden ser descargadas y sincronizadas por otros miembros del grupo. Bibliotecas de sólo lectura solo se pueden descargar, actualizaciones de otros no se pueden subir." +msgstr "Las bibliotecas compratidas con escritura habilitada pueden ser descargadas y sincronizadas por otros miembros del grupo. Las bibliotecas de sólo lectura sólo pueden descargarse, las actualizaciones locales no serán reflejadas." #: seahub/group/templates/group/group_info.html:75 #: seahub/group/templates/group/group_info.html:124 @@ -1607,18 +1690,19 @@ msgstr "Biblioteca" #: seahub/group/templates/group/group_info.html:77 msgid "Modified at" -msgstr "Modificado a" +msgstr "Modificado el" #: seahub/group/templates/group/group_info.html:78 +#: seahub/templates/file_revisions.html:26 #: seahub/templates/repo_history.html:22 msgid "Modifier" -msgstr "Modificado" +msgstr "Modificó" #: seahub/group/templates/group/group_info.html:98 #: seahub/group/templates/group/group_info.html:100 -#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164 -#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170 -#: seahub/templates/repo_history.html:44 +#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155 +#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161 +#: seahub/templates/repo_history.html:45 #: seahub/templates/repo_view_snapshot.html:38 #: seahub/templates/snippets/current_commit.html:4 #: seahub/templates/snippets/events_body.html:18 @@ -1627,30 +1711,30 @@ msgid "Details" msgstr "Detalles" #: seahub/group/templates/group/group_info.html:107 -#: seahub/group/templates/group/new_msg_reply.html:74 -#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35 +#: seahub/group/templates/group/new_msg_reply.html:76 +#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36 #: seahub/templates/repo_view_snapshot.html:29 -#: seahub/templates/sysadmin/sys_list_orphan.html:20 -#: seahub/templates/sysadmin/sys_list_system.html:33 -#: seahub/templates/sysadmin/sys_repo_admin.html:49 -#: seahub/templates/sysadmin/userinfo.html:88 -#: seahub/templates/sysadmin/userinfo.html:112 +#: seahub/templates/sysadmin/sys_list_orphan.html:23 +#: seahub/templates/sysadmin/sys_list_system.html:36 +#: seahub/templates/sysadmin/sys_repo_admin.html:51 +#: seahub/templates/sysadmin/userinfo.html:82 +#: seahub/templates/sysadmin/userinfo.html:106 msgid "None" -msgstr "Ninguno" +msgstr "Ninguna" #: seahub/group/templates/group/group_info.html:112 -#: seahub/templates/file_revisions.html:45 -#: seahub/templates/repo_history.html:38 +#: seahub/templates/file_revisions.html:49 +#: seahub/templates/repo_history.html:39 #: seahub/templates/repo_history_view.html:21 #: seahub/templates/repo_view_snapshot.html:32 -#: seahub/templates/snippets/current_commit.html:15 +#: seahub/templates/snippets/current_commit.html:11 msgid "Unknown" msgstr "Desconocido" #: seahub/group/templates/group/group_info.html:124 #: seahub/templates/activities.html:19 seahub/templates/file_edit.html:240 msgid "is encrypted" -msgstr "está encriptado" +msgstr "está encriptada" #: seahub/group/templates/group/group_info.html:126 #: seahub/templates/activities.html:21 seahub/templates/file_edit.html:241 @@ -1660,58 +1744,97 @@ msgstr "Contraseña:" #: seahub/group/templates/group/group_info.html:128 #: seahub/templates/activities.html:23 seahub/templates/file_edit.html:243 msgid "The password will be kept in the server for only 1 hour." -msgstr "La contraseña será guardada en el servidor por sólo 1 hora." +msgstr "La contraseña será almacenada en el servidor por 1 hora." + +#: seahub/group/templates/group/group_info.html:146 +msgid "Unshare Library" +msgstr "Dejar de compartir biblioteca" #: seahub/group/templates/group/group_info.html:147 -msgid "Unshare Library" -msgstr "No seguir compartiendo la biblioteca" - -#: seahub/group/templates/group/group_info.html:148 #, python-format msgid "Are you sure you want to unshare %s ?" -msgstr "" +msgstr "¿Seguro que quieres dejar de compartir %s?" + +#: seahub/group/templates/group/group_info_for_pub.html:24 +#: seahub/group/templates/group/group_info_for_pub.html:26 +#: seahub/share/templates/share/list_priv_shared_folders.html:23 +#: seahub/share/templates/share/repos.html:24 +#: seahub/share/templates/share/repos.html:26 +#: seahub/share/templates/share/user_share_list.html:42 +#: seahub/share/templates/share/user_share_list.html:44 +#: seahub/templates/my_group_repos.html:25 +#: seahub/templates/my_group_repos.html:28 +#: seahub/templates/my_group_repos.html:30 +#: seahub/templates/my_shared_repos.html:18 +#: seahub/templates/my_shared_repos.html:21 +#: seahub/templates/my_shared_repos.html:23 +#: seahub/templates/snippets/my_group_repos.html:25 +#: seahub/templates/snippets/my_group_repos.html:28 +#: seahub/templates/snippets/my_group_repos.html:30 +#: seahub/templates/snippets/my_owned_repos.html:29 +#: seahub/templates/snippets/my_owned_repos.html:31 +#: seahub/templates/snippets/my_owned_repos.html:75 +#: seahub/templates/snippets/my_owned_repos.html:77 +#: seahub/templates/snippets/my_owned_repos.html:127 +#: seahub/templates/snippets/my_shared_repos.html:17 +#: seahub/templates/snippets/my_shared_repos.html:20 +#: seahub/templates/snippets/my_shared_repos.html:22 +#: seahub/templates/sysadmin/userinfo.html:72 +msgid "directory icon" +msgstr "icono de carpeta" #: seahub/group/templates/group/group_info_for_pub.html:46 msgid "No public library is in this group" -msgstr "No hay ninguna biblioteca pública en este grupo " +msgstr "No hay bibliotecas públicas en este grupo" #: seahub/group/templates/group/group_info_for_pub.html:47 msgid "" "A library can be made public in its settings page.(Not implemented yet)" -msgstr "" +msgstr "Una biblioteca puede hacerse pública en su página de configuración. (No implementado todavía)" #: seahub/group/templates/group/group_join_email.html:2 #, python-format msgid "" "%(user)s want to join to Group \"%(group_name)s\", here is the verification " "message: " -msgstr "%(user)s desean unirse al Grupo \"%(group_name)s\", acá está el mensaje de verificación: " +msgstr "%(user)s desea unirse al Grupo \"%(group_name)s\", mensaje de verificación: " -#: seahub/group/templates/group/group_manage.html:10 -msgid "Admins" -msgstr "" +#: seahub/group/templates/group/group_join_email.html:6 +#: seahub/templates/email_base.html:9 +msgid "Thanks for using our site!" +msgstr "Gracias por usar nuestro sitio!" + +#: seahub/group/templates/group/group_join_email.html:8 +#: seahub/templates/email_base.html:13 +#, python-format +msgid "The %(site_name)s team" +msgstr "El equipo de %(site_name)s" #: seahub/group/templates/group/group_manage.html:11 -#: seahub/profile/templates/profile/set_profile.html:22 -#: seahub/templates/repo.html:28 -#: seahub/templates/snippets/space_and_traffic.html:27 +msgid "Admins" +msgstr "Administradores" + +#: seahub/group/templates/group/group_manage.html:12 +#: seahub/profile/templates/profile/set_profile.html:5 +#: seahub/profile/templates/profile/set_profile.html:23 +#: seahub/templates/base.html:68 seahub/templates/repo.html:29 msgid "Settings" -msgstr "Configuraciones" +msgstr "Configuración" #: seahub/group/templates/group/group_manage.html:15 msgid "Add Members" msgstr "Agregar miembros" -#: seahub/group/templates/group/group_manage.html:42 +#: seahub/group/templates/group/group_manage.html:16 msgid "Add Admins" -msgstr "" +msgstr "Agregar Administradores" #: seahub/group/templates/group/group_manage.html:69 msgid "Avatar" -msgstr "" +msgstr "Avatar" #: seahub/group/templates/group/group_manage.html:73 -#: seahub/profile/templates/profile/set_profile.html:29 +#: seahub/profile/templates/profile/set_profile.html:30 msgid "Change" msgstr "Cambiar" @@ -1723,14 +1846,14 @@ msgstr "Renombrar" #: seahub/group/templates/group/group_manage.html:83 msgid "Revoke Public" -msgstr "Dejar de ser público" +msgstr "Revocar Público" #: seahub/group/templates/group/group_manage.html:85 msgid "Make Public" msgstr "Hacer Público" #: seahub/group/templates/group/group_manage.html:87 -#: seahub/templates/sysadmin/repoadmin_table.html:19 +#: seahub/templates/sysadmin/repoadmin_table.html:25 msgid "Transfer" msgstr "Transferir" @@ -1740,42 +1863,54 @@ msgstr "Descartar" #: seahub/group/templates/group/group_manage.html:96 msgid "Transfer Group To" -msgstr "Transferir Grupo A" +msgstr "Tranferir Grupo a" #: seahub/group/templates/group/group_manage.html:97 msgid "email" -msgstr "email" +msgstr "correo" #: seahub/group/templates/group/group_manage.html:98 msgid "Tip: the email should be already registered." -msgstr "" +msgstr "Tip: el correo ya debe estar registrado." #: seahub/group/templates/group/group_manage.html:104 msgid "Rename Group To" -msgstr "" +msgstr "Renombrar Grupo a" -#: seahub/group/templates/group/group_manage.html:121 +#: seahub/group/templates/group/group_manage.html:140 msgid "Dismiss Group" msgstr "Descartar Gupo" -#: seahub/group/templates/group/group_manage.html:122 +#: seahub/group/templates/group/group_manage.html:141 msgid "Really want to dismiss this group?" -msgstr "" +msgstr "¿Seguro que deseas descartar este grupo?" -#: seahub/group/templates/group/group_manage.html:125 +#: seahub/group/templates/group/group_manage.html:144 msgid "Delete Member" msgstr "Borrar miembro" -#: seahub/group/templates/group/group_manage.html:126 +#: seahub/group/templates/group/group_manage.html:145 #, python-format msgid "Really want to delete %s ?" -msgstr "" +msgstr "¿Seguro que deseas borrar %s?" -#: seahub/group/templates/group/group_members.html:17 +#: seahub/group/templates/group/group_members.html:10 +msgid "Quit" +msgstr "Salir" + +#: seahub/group/templates/group/group_members.html:22 #: seahub/profile/templates/profile/user_profile.html:28 -#: seahub/templates/pubuser.html:19 +#: seahub/templates/pubuser.html:27 msgid "Add to Contacts" -msgstr "" +msgstr "Agregar a los contactos" + +#: seahub/group/templates/group/group_members.html:35 +msgid "Quit Group" +msgstr "Salir del grupo" + +#: seahub/group/templates/group/group_members.html:36 +msgid "Are you sure you want to quit this group?" +msgstr "¿Estás seguro que deseas abandonar el grupo?" #: seahub/group/templates/group/group_pubinfo.html:9 msgid "Join Group" @@ -1803,97 +1938,137 @@ msgstr "Miembros:" msgid "Verification Message" msgstr "Mensaje de verificación" -#: seahub/group/templates/group/group_wiki.html:12 -msgid "This group currently has no wiki" -msgstr "" - #: seahub/group/templates/group/group_wiki.html:13 -#: seahub/templates/wiki/personal_wiki.html:14 +#: seahub/group/templates/group/group_wiki.html:20 +#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/templates/wiki/personal_wiki.html:20 +msgid "Wiki Index" +msgstr "Índice del wiki" + +#: seahub/group/templates/group/group_wiki.html:14 +#: seahub/templates/wiki/personal_wiki.html:16 +msgid "No index now." +msgstr "Actualmente no hay índice" + +#: seahub/group/templates/group/group_wiki.html:16 +#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17 +msgid "Create" +msgstr "Crear" + +#: seahub/group/templates/group/group_wiki.html:35 +msgid "This group currently has no wiki" +msgstr "Este grupo no tiene wiki actualmente" + +#: seahub/group/templates/group/group_wiki.html:36 +#: seahub/templates/wiki/personal_wiki.html:33 msgid "" "Seafile Wiki enables you to organize your knowledge in a simple way. The " "contents of wiki is stored in a normal library with pre-defined file/folder " "structure. This enables you to edit your wiki in your desktop and then sync " "back to the server." -msgstr "" +msgstr "El Wiki permite organizar el conocimiento de una manera sencilla. Los contenidos del wiki se almacenan en una biblioteca normal con una estructura de archivo/carpeta predefinida. Ésto permite editar el wiki desde el escritorio y luego sincronizar con el servidor." -#: seahub/group/templates/group/group_wiki.html:15 -#: seahub/templates/wiki/personal_wiki.html:15 +#: seahub/group/templates/group/group_wiki.html:38 +#: seahub/templates/wiki/personal_wiki.html:34 msgid "Create Wiki Now" -msgstr "" +msgstr "Crear Wiki ahora" -#: seahub/group/templates/group/group_wiki.html:19 -#: seahub/templates/wiki/personal_wiki.html:18 +#: seahub/group/templates/group/group_wiki.html:40 +#: seahub/templates/wiki/personal_wiki.html:36 +msgid "Choose a library as wiki" +msgstr "Elegir una biblioteca como wiki" + +#: seahub/group/templates/group/group_wiki.html:45 +#: seahub/templates/wiki/personal_wiki.html:40 msgid "Create Wiki" msgstr "Crear Wiki" -#: seahub/group/templates/group/group_wiki.html:23 +#: seahub/group/templates/group/group_wiki.html:49 msgid "Wiki Pages" msgstr "Páginas Wiki" -#: seahub/group/templates/group/group_wiki.html:31 +#: seahub/group/templates/group/group_wiki.html:55 +#: seahub/templates/wiki/personal_wiki.html:50 +msgid "Choose a library as wiki:" +msgstr "Elije una biblioteca como wiki:" + +#: seahub/group/templates/group/group_wiki.html:60 +#: seahub/profile/templates/profile/set_profile.html:122 +#: seahub/templates/wiki/personal_wiki.html:55 +msgid "Please click and choose a library." +msgstr "Haz click y elije una biblioteca." + +#: seahub/group/templates/group/group_wiki.html:68 #: seahub/group/templates/group/group_wiki_pages.html:11 -#: seahub/templates/wiki/personal_wiki.html:30 +#: seahub/templates/wiki/personal_wiki.html:63 #: seahub/templates/wiki/personal_wiki_pages.html:13 msgid "Home" -msgstr "Home" +msgstr "Inicio" -#: seahub/group/templates/group/group_wiki.html:32 +#: seahub/group/templates/group/group_wiki.html:69 #: seahub/group/templates/group/group_wiki_pages.html:12 -#: seahub/templates/wiki/personal_wiki.html:31 +#: seahub/templates/wiki/personal_wiki.html:64 #: seahub/templates/wiki/personal_wiki_pages.html:14 msgid "Pages" msgstr "Páginas" -#: seahub/group/templates/group/group_wiki.html:34 +#: seahub/group/templates/group/group_wiki.html:71 #: seahub/group/templates/group/group_wiki_pages.html:14 -#: seahub/templates/wiki/personal_wiki.html:32 +#: seahub/templates/wiki/personal_wiki.html:65 #: seahub/templates/wiki/personal_wiki_pages.html:15 msgid "Wiki History" -msgstr "Histórico del Wiki" +msgstr "Historial del Wiki" -#: seahub/group/templates/group/group_wiki.html:39 -#: seahub/group/templates/group/group_wiki.html:53 +#: seahub/group/templates/group/group_wiki.html:76 +#: seahub/group/templates/group/group_wiki.html:90 #: seahub/group/templates/group/group_wiki_pages.html:18 #: seahub/group/templates/group/group_wiki_pages.html:29 -#: seahub/templates/wiki/personal_wiki.html:35 -#: seahub/templates/wiki/personal_wiki.html:48 +#: seahub/templates/wiki/personal_wiki.html:68 +#: seahub/templates/wiki/personal_wiki.html:81 #: seahub/templates/wiki/personal_wiki_pages.html:17 #: seahub/templates/wiki/personal_wiki_pages.html:27 msgid "New Page" -msgstr "Nueva Página" +msgstr "Página Nueva" -#: seahub/group/templates/group/group_wiki.html:40 -#: seahub/templates/wiki/personal_wiki.html:36 +#: seahub/group/templates/group/group_wiki.html:77 +#: seahub/group/templates/group/group_wiki.html:136 +#: seahub/templates/wiki/personal_wiki.html:69 +#: seahub/templates/wiki/personal_wiki.html:127 msgid "Delete Page" msgstr "Borrar Página" -#: seahub/group/templates/group/group_wiki.html:41 -#: seahub/templates/wiki/personal_wiki.html:37 +#: seahub/group/templates/group/group_wiki.html:78 +#: seahub/templates/wiki/personal_wiki.html:70 msgid "Edit Page" msgstr "Editar Página" -#: seahub/group/templates/group/group_wiki.html:42 -#: seahub/templates/wiki/personal_wiki.html:38 +#: seahub/group/templates/group/group_wiki.html:79 +#: seahub/templates/wiki/personal_wiki.html:71 msgid "Page History" -msgstr "Histórico de la Página" +msgstr "Historial de página" -#: seahub/group/templates/group/group_wiki.html:49 -#: seahub/templates/wiki/personal_wiki.html:44 +#: seahub/group/templates/group/group_wiki.html:86 +#: seahub/templates/wiki/personal_wiki.html:77 #, python-format msgid "Last modified by %(modifier)s, %(modify_time)s" -msgstr "" +msgstr "Última modificación %(modifier)s, %(modify_time)s" -#: seahub/group/templates/group/group_wiki.html:112 -#: seahub/templates/repo_settings.html:60 -#: seahub/templates/wiki/personal_wiki.html:107 +#: seahub/group/templates/group/group_wiki.html:137 +#: seahub/templates/wiki/personal_wiki.html:128 +msgid "Are you sure you want to delete this page?" +msgstr "¿Seguro que deseas borrar esta página?" + +#: seahub/group/templates/group/group_wiki.html:158 +#: seahub/templates/repo_settings.html:78 +#: seahub/templates/wiki/personal_wiki.html:149 msgid "Name is required." -msgstr "" +msgstr "Se requiere nombre." -#: seahub/group/templates/group/group_wiki.html:116 -#: seahub/templates/repo_settings.html:64 -#: seahub/templates/wiki/personal_wiki.html:111 +#: seahub/group/templates/group/group_wiki.html:162 +#: seahub/templates/repo_settings.html:82 +#: seahub/templates/wiki/personal_wiki.html:153 msgid "Description is required." -msgstr "" +msgstr "Se requiere descripción." #: seahub/group/templates/group/groups_left_panel.html:3 msgid "Tips" @@ -1902,7 +2077,7 @@ msgstr "Consejos" #: seahub/group/templates/group/groups_left_panel.html:5 msgid "" "After creating a group, you can add members and share libraries into it." -msgstr "Después de crear un grupo, puedes agregar miembros y compartir bibliotecas entre ellos." +msgstr "Después de crear un grupo, puedes agregar miembros y compartir bibliotecas en él." #: seahub/group/templates/group/groups_right_panel.html:4 msgid "My Groups" @@ -1916,7 +2091,7 @@ msgstr "Nuevo Grupo" #: seahub/group/templates/group/groups_right_panel.html:14 #: seahub/templates/pubgrp.html:17 msgid "Time: " -msgstr "Tiempo:" +msgstr "Fecha:" #: seahub/group/templates/group/groups_right_panel.html:28 msgid "You are not in any groups" @@ -1926,7 +2101,7 @@ msgstr "No estás en ningún grupo" msgid "" "You can create a group by clicking \"New Group\" button. Group is a place " "for you and your friends leaving messages and collaborating on libraries." -msgstr "Puedes crear un grupo dando click en el enlace \"Nuevo Grupo\". El grupo es un lugar para que tú y tus amigos puedan intercambiar mensajes y colaborar en bibliotecas." +msgstr "Puedes crear un grupo haciendo click en el enlace \"Nuevo Grupo\". El grupo es un lugar para intercambiar mensajes y colaborar en bibliotecas con tus contactos," #: seahub/group/templates/group/groups_right_panel.html:34 msgid "Group Name" @@ -1938,32 +2113,35 @@ msgstr "Agregar miembros" #: seahub/group/templates/group/grpmember_add_form.html:6 #: seahub/templates/snippets/repo_share_form.html:6 +#: seahub/templates/sysadmin/sys_useradmin.html:42 msgid "Enter" -msgstr "" +msgstr "Aceptar" #: seahub/group/templates/group/grpmember_add_form.html:10 +#: seahub/templates/sysadmin/sys_useradmin.html:45 msgid "emails, separated by ','" msgstr "correos electrónicos separados por ','" #: seahub/group/templates/group/grpmember_add_form.html:12 msgid "Tip: an invitation will be sent if the email is not registered." -msgstr "Consejo: una invitación será envíada si la dirección de correo no está registrada" +msgstr "Consejo: una invitación será enviada si la dirección de correo no está registrada" #: seahub/group/templates/group/grpmember_add_form.html:14 msgid "Tip: the emails should be already registered." -msgstr "" +msgstr "Tip: los correos deben estar registrados" #: seahub/group/templates/group/grpmember_add_js.html:8 msgid "Add administrators" msgstr "Agregar administradores" -#: seahub/group/templates/group/grpmember_add_js.html:41 +#: seahub/group/templates/group/grpmember_add_js.html:33 +#: seahub/templates/sysadmin/sys_useradmin.html:167 msgid "Please enter emails, or select some." -msgstr "" +msgstr "Ingresa o selecciona los correos." #: seahub/group/templates/group/msg_js.html:157 msgid "Failed to post reply." -msgstr "" +msgstr "Fallo al dejar respuesta." #: seahub/group/templates/group/new_msg_reply.html:18 msgid "Group: " @@ -1972,98 +2150,98 @@ msgstr "Grupo:" #: seahub/help/templates/help/help_base.html:7 msgctxt "help" msgid "Client" -msgstr "" +msgstr "Cliente" #: seahub/help/templates/help/help_base.html:9 msgid "Install and Sync Files" -msgstr "" +msgstr "Instalar y sincronizar archivos" #: seahub/help/templates/help/help_base.html:10 msgid "Deleting a library" -msgstr "" +msgstr "Borrando una biblioteca" #: seahub/help/templates/help/help_base.html:11 msgid "Encrypting a library" -msgstr "" +msgstr "Encriptando una biblioteca" #: seahub/help/templates/help/help_base.html:12 #: seahub/help/templates/help/help_colab.html:7 msgid "File conflicts" -msgstr "" +msgstr "Conflictos de archivo" #: seahub/help/templates/help/help_base.html:13 msgid "Excluding files" -msgstr "" +msgstr "Excluyendo archivos" #: seahub/help/templates/help/help_base.html:15 msgid "Web Site" -msgstr "" +msgstr "Sitio Web" #: seahub/help/templates/help/help_base.html:17 msgid "Sharing to a group" -msgstr "" +msgstr "Compartiendo con un grupo" #: seahub/help/templates/help/help_base.html:18 #: seahub/help/templates/help/help_view_encrypted.html:8 msgid "Viewing an encrypted library" -msgstr "" +msgstr "Viendo una biblioteca encriptada" #: seahub/help/templates/help/help_colab.html:8 msgid "" "Once you and your friends sync a shared library onto your computers, you may" " add, delete or edit files in the library together. Every change you make " "to the library will be automatically synced to others' computers." -msgstr "" +msgstr "Cuando varias personas sincronizan bibliotecas en sus computadoras, pueden agregar, eliminar o editar archivos juntos. Cada cambio realizado en la biblioteca será sincronizado automáticamente en las computadoras de los demás." #: seahub/help/templates/help/help_colab.html:10 msgid "" "\n" " Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep your version unchanged, while save your friends' versions as \"conflict files\". A conflict file's name ends with its author's email address, plus the current time, e.g. test.txt (name@example.com 2013-10-01-00-12-24).\n" "\t" -msgstr "" +msgstr "\n Cuando varias personas editan el mismo archivo simultáneamente, los cambios pueden provocar conflictos entre sí. En este caso, Seafile mantiene tu versión sin cambios, mientras que las versiones ajenas son almacenadas como \"archivos de conflicto\". El nombre del archivo de conflicto tiene al final el email del autor mas la hora actual. Ej. prueba.txt (name@example.com 2013-10-01-00-12-24).\n\t" #: seahub/help/templates/help/help_delete.html:7 msgid "Deleting a file library" -msgstr "" +msgstr "Eliminando biblioteca de archivos" #: seahub/help/templates/help/help_delete.html:9 msgid "" "To maximize your data security, deletion of file libraries on the website " "and on your computer are not \"synced\" automatically. " -msgstr "" +msgstr "Para maximizar la seguridad de los datos, la eliminación de bibliotecas en el sitio web y en la computadora, no se sincronizan automáticamente." #: seahub/help/templates/help/help_delete.html:11 msgid "" "After a file library is deleted on the website, the library downloaded to " "your computer won't be deleted. But it won't be synced with the website any " "more." -msgstr "" +msgstr "Después de que una biblioteca se elimina en el sitio web, la biblioteca descargada en la computadora no será borrada. Pero ya no se sincronizará con el sitio web." #: seahub/help/templates/help/help_delete.html:12 msgid "" "After a file library is deleted on your computer, the library on the website" " won't be deleted. You may download and sync it again later." -msgstr "" +msgstr "Después de borrar una biblioteca en tu computadora, la biblioteca del sitio web no se borrará. Puedes descargarla y sincronizarla nuevamente." #: seahub/help/templates/help/help_group_share.html:7 msgid "Sharing a library to a group" -msgstr "" +msgstr "Compartiendo una biblioteca con un grupo" #: seahub/help/templates/help/help_group_share.html:9 msgid "You have two ways to share a library to a group" -msgstr "" +msgstr "Hay dos modos para compartir una biblioteca con un grupo" #: seahub/help/templates/help/help_group_share.html:11 msgid "Create a file library directly inside the group workspace." -msgstr "" +msgstr "Crear directamente una biblioteca de archivos dentro del espacio de trabajo del grupo." #: seahub/help/templates/help/help_group_share.html:12 msgid "Share an existing personal library to the group." -msgstr "" +msgstr "Compartir una biblioteca personal con el grupo." #: seahub/help/templates/help/help_ignore.html:8 msgid "Excluding files/folders from syncing" -msgstr "" +msgstr "Excluyendo archivos/carpetas" #: seahub/help/templates/help/help_ignore.html:10 msgid "" @@ -2072,15 +2250,15 @@ msgid "" "folder of this library. In this special file, you specify the files and " "folders that Seafile should not sync. Each line in this file specifies a " "pattern. The following pattern format are supported." -msgstr "" +msgstr "Cuando no quiera sincronizar algunos archivos o carpetas dentro de una biblioteca cree un archivo llamado seafile-ignore.txt en la carpeta principal de la biblioteca. En este archivo especial especifique los archivos y carpetas que Seafile no sincronizará. Cada línea de este archivo especifica un patrón. Los siguientes tipos de patrón están soportados." #: seahub/help/templates/help/help_ignore.html:13 msgid "A blank line matches no files." -msgstr "" +msgstr "Una línea en blanco, equivale a ningún archivo." #: seahub/help/templates/help/help_ignore.html:14 msgid "A line starting with # serves as a comment." -msgstr "" +msgstr "Una línea que comienza con # sirve como comentario." #: seahub/help/templates/help/help_ignore.html:15 msgid "" @@ -2089,14 +2267,14 @@ msgid "" "\"foo/hello\". Note that the wildcard character * recursively matches all " "the paths under a folder. For instance, \"foo/*.html\" matches " "\"foo/a.html\" and \"foo/templates/b.html\"." -msgstr "" +msgstr "Seafile soporta comodines en el patrón. Por ejemplo \"foo/*\" concuerda con \"foo/1\"y \"foo/hello\". Mientras que \"foo/?\" concuerda con \"foo/1\" pero no con \"foo/hello\". Notar que el carácter comodín * sirve para todas las rutas de una carpeta. Por ejemplo \"foo/*html\" concuerda con \"foo/a.html\" y \"foo/templates/b.html\"." #: seahub/help/templates/help/help_ignore.html:16 msgid "" "If the pattern ends with a slash, it would only match a folder. In other " "words, foo/ will match a folder \"foo\" and paths underneath it, but will " "not match a regular file or a symbolic link \"foo\"." -msgstr "" +msgstr "Si el patrón termina con una diagonal, sólo aplica para carpetas. En otras palabras foo/ concuerda con una carpeta \"foo\" y rutas derivadas, pero no concordará con un archivo normal o un link simbólico \"foo\"." #: seahub/help/templates/help/help_ignore.html:17 msgid "" @@ -2104,128 +2282,128 @@ msgid "" "folder. For example, \"foo\" can only match regular file \"foo\" or a " "symbolic link; while \"foo/\" and \"foo*\" match a folder and paths under " "it." -msgstr "" +msgstr "Si un patrón no termina con diagonal o comodín, nunca aplicará para carpetas. Por ejemplo, \"foo\" solo concordará con archivos normales \"foo\" o links simbólicos; mientras que \"foo/\" y \"foo*\" sirven para carpetas y rutas derivadas de ellas." #: seahub/help/templates/help/help_ignore.html:20 msgid "Example" -msgstr "" +msgstr "Ejemplo" #: seahub/help/templates/help/help_ignore.html:38 msgid "Notes" -msgstr "" +msgstr "Notas" #: seahub/help/templates/help/help_ignore.html:40 msgid "" "The seafile-ignore.txt file only controls which files to exclude on the " "client side. You can still create a file from seahub web interface that's " "excluded on the client. In this case," -msgstr "" +msgstr "El archivo seafile-ignore.txt solamente controla que archivos excluir en el cliente. Aún así puede crear un archivo desde la interface web que será excluido en el cliente. En este caso," #: seahub/help/templates/help/help_ignore.html:43 msgid "" "The created file will still be synced back to clients. But any later local " "changes to those files will be ignored." -msgstr "" +msgstr "El archivo creado se sincronizará con los clientes. Pero los cambios locales posteriores realizados en el archivo serán ignorados." #: seahub/help/templates/help/help_ignore.html:44 msgid "" "If the file is modified on seahub, the new version will also be synced back " "to clients; If the file on the client is also modified, a conflict file will" " be generated on the client." -msgstr "" +msgstr "Si el archivo se modifica en seahub, la nueva versión se sincronizará con los clientes. Si el archivo en el cliente también se modifica, un archivo de conflicto será generado en el cliente." #: seahub/help/templates/help/help_ignore.html:47 msgid "" "seafile-ignore.txt only ignores files that are not synced yet. If a file is " "already synced, and some time later you add it to the ignore list, its " "existing versions won't be removed." -msgstr "" +msgstr "seafile-ignore.txt sólo ignora archivos que aún no han sido sincronizados. Si un archivo ya está sincronizado, y después se agrega a la lista de ignorados, las versiones ya existentes no se removerán." #: seahub/help/templates/help/help_install_v2.html:8 msgid "Installing and Using Seafile Client" -msgstr "" +msgstr "Instalando y usando el ciente Seafile" #: seahub/help/templates/help/help_install_v2.html:10 msgid "" "After downloading Seafile client program, you have 3 steps left to get it up" " and running." -msgstr "" +msgstr "Después de descargar el cliente Seafile, restan sólo 3 pasos." #: seahub/help/templates/help/help_install_v2.html:12 msgid "1. Select a disk partition to store local Seafile data" -msgstr "" +msgstr "1. Seleccionar una carpeta para almacenar datos locales de Seafile" #: seahub/help/templates/help/help_install_v2.html:16 msgid "2. Add an account" -msgstr "" +msgstr "2. Agregar una cuenta" #: seahub/help/templates/help/help_install_v2.html:17 msgid "Add an account on your private Seafile server or our public server." -msgstr "" +msgstr "Agregar una cuenta en el servidor Seafile privado o en el público." #: seahub/help/templates/help/help_install_v2.html:22 msgid "3. Download a library and syncing files" -msgstr "" +msgstr "3. Descargar bibliotecas y sincronizar archivos" #: seahub/help/templates/help/help_install_v2.html:26 msgid "Click the \"Download\" button to download a library to a local folder." -msgstr "" +msgstr "Haga click en el botón \"Descargar\" para bajar la biblioteca en una carpeta local." #: seahub/help/templates/help/help_install_v2.html:27 msgid "" "Then you add some files into the library. They will be automatically synced " "with cloud platform." -msgstr "" +msgstr "Después agregue algunos archivos a la biblioteca. Se sincronizarán automáticamente con la plataforma en la nube." #: seahub/help/templates/help/help_install_v2.html:32 msgid "4. (Optional) Create a library" -msgstr "" +msgstr "4. (Opcional) Crear una biblioteca" #: seahub/help/templates/help/help_install_v2.html:34 msgid "You can also create a library from a local folder." -msgstr "" +msgstr "También puede crear una biblioteca a partir de una carpeta local." #: seahub/help/templates/help/help_security.html:7 msgid "Encrypting a file library" -msgstr "" +msgstr "Encriptando una biblioteca de archivos" #: seahub/help/templates/help/help_security.html:8 msgid "" "Seafile supports encryption of file libraries to strengthen your data " "security. To encrypt a file library, you need to set a password when you " "create a library." -msgstr "" +msgstr "Seafile soporta encriptación de bibliotecas para incrementar la seguridad de los datos. Para encriptar una biblioteca, necesita definir una contraseña al crear la biblioteca." #: seahub/help/templates/help/help_security.html:10 msgid "The password won't be stored on Seafile cloud platform." -msgstr "" +msgstr "La contraseña no se almacenará en la plataforma cloud de Seafile." #: seahub/help/templates/help/help_security.html:10 msgid "" "So even the adminastrator of the servers cannot view your encrypted data " "without the password." -msgstr "" +msgstr "Así que ni siquiera el administrador del servidor podrá ver sus datos encriptados sin la contraseña." #: seahub/help/templates/help/help_security.html:12 msgid "" "To download and sync an encrypted library to your computer, you need to " "provide the password. Seafile client program will download the encrypted " "data and decrypt it on your computer." -msgstr "" +msgstr "Para descargar y sincronizar una biblioteca encriptada a la computadora, necesita ingresar la contraseña. El cliente Seafile descargará los datos encriptados y los desencriptará en su computadora." #: seahub/help/templates/help/help_security.html:13 msgid "The password can only be set when you create the library." -msgstr "" +msgstr "La contraseña sólo se puede definir cuando se crea la biblioteca." #: seahub/help/templates/help/help_security.html:13 msgid "It cannot be changed since then." -msgstr "" +msgstr "Después no se puede cambiar." #: seahub/help/templates/help/help_security.html:14 msgid "" "To share an encrypted library with your friends, you also need to tell them " "the password." -msgstr "" +msgstr "Para compartir una biblioteca encriptada con colaboradores, necesita compartirles la contraseña." #: seahub/help/templates/help/help_view_encrypted.html:10 msgid "" @@ -2234,188 +2412,192 @@ msgid "" "library. Your password is only stored in the server's encrypted memory. It " "would be cleared from the memory in an hour. After that, if you want to view" " the library, you'll have to enter password again." -msgstr "" +msgstr "Los servidores Seafile no almacenan la contraseña para un biblioteca encriptada. Para ver una biblioteca compartida en línea necesita ingresar la contraseña de la biblioteca. Esta contraseña se almacena en la memoria encriptada del servidor, de donde se borrará al cabo de una hora. Luego, para ver la biblioteca, debe ingresar la contraseña nuevamente." -#: seahub/message/views.py:134 -#: seahub/message/templates/message/all_msg_list.html:164 +#: seahub/message/views.py:156 +#: seahub/message/templates/message/all_msg_list.html:166 msgid "message is required" -msgstr "mensaje es obligatorio" - -#: seahub/message/views.py:137 -#: seahub/message/templates/message/all_msg_list.html:168 -msgid "contact is required" -msgstr "contacto es obligatorio" +msgstr "se requiere mensaje" #: seahub/message/views.py:159 -msgid "You can not send message to yourself." -msgstr "Noe puede mandar un mensaje para si mismo" +#: seahub/message/templates/message/all_msg_list.html:170 +msgid "contact is required" +msgstr "se requiere contacto" -#: seahub/message/views.py:163 +#: seahub/message/views.py:184 +msgid "You can not send message to yourself." +msgstr "No puedes enviarte un mensaje a ti mismo." + +#: seahub/message/views.py:188 #, python-format msgid "Failed to send message to %s, user not found." -msgstr "" +msgstr "Fallo el enviar mensaje a %s, usuario no encontrado." -#: seahub/message/templates/message/all_msg_list.html:4 -#: seahub/message/templates/message/all_msg_list.html:15 -#: seahub/message/templates/message/user_msg_list.html:4 -#: seahub/share/templates/share/user_share_list.html:24 -#: seahub/templates/home_base.html:22 -msgid "Messages" -msgstr "Mensajes" - -#: seahub/message/templates/message/all_msg_list.html:16 +#: seahub/message/templates/message/all_msg_list.html:17 msgid "New Message" -msgstr "" +msgstr "Nuevo Mensaje" -#: seahub/message/templates/message/all_msg_list.html:22 +#: seahub/message/templates/message/all_msg_list.html:23 #: seahub/notifications/templates/notifications/user_notification_list.html:20 msgid "Message" msgstr "Mensaje" -#: seahub/message/templates/message/all_msg_list.html:23 +#: seahub/message/templates/message/all_msg_list.html:24 #: seahub/notifications/templates/notifications/user_notification_list.html:21 #: seahub/templates/file_revisions.html:25 #: seahub/templates/repo_history.html:21 msgid "Time" -msgstr "Tiempo" +msgstr "Fecha" -#: seahub/message/templates/message/all_msg_list.html:42 +#: seahub/message/templates/message/all_msg_list.html:43 msgid "message..." msgstr "mensaje..." -#: seahub/message/templates/message/all_msg_list.html:45 -msgid "Add files" -msgstr "Agregar archivos" - -#: seahub/message/templates/message/all_msg_list.html:95 +#: seahub/message/templates/message/all_msg_list.html:97 msgid "send to: click to select contacts" -msgstr "" +msgstr "enviar a: click para seleccionar contactos" -#: seahub/message/templates/message/all_msg_list.html:101 +#: seahub/message/templates/message/all_msg_list.html:103 msgid "please add contacts at first" -msgstr "" +msgstr "agrega contactos primero" -#: seahub/message/templates/message/all_msg_list.html:105 +#: seahub/message/templates/message/all_msg_list.html:107 msgid "Failed to get your contacts for sending a message." -msgstr "" +msgstr "Fallo en la búsqueda de contactos para el mensaje." -#: seahub/message/templates/message/all_msg_list.html:136 +#: seahub/message/templates/message/all_msg_list.html:138 +#: seahub/templates/snippets/msg_form_js.html:25 msgid "You don't have any library at present" -msgstr "" - -#: seahub/message/templates/message/user_msg_list.html:9 -#, python-format -msgid "Messages with %(name)s" -msgstr "" +msgstr "Actualmente no tienes niguna biblioteca" #: seahub/message/templates/message/user_msg_list.html:15 msgid "Send a message..." msgstr "Enviar un mensaje..." -#: seahub/notifications/models.py:446 +#: seahub/notifications/models.py:450 #, python-format msgid "" "A file named %(file_name)s is uploaded to your " "folder %(folder)s" -msgstr "" +msgstr "Un archivo nombrado %(file_name)s se ha guardado en la carpeta %(folder)s" -#: seahub/notifications/models.py:469 +#: seahub/notifications/models.py:473 #, python-format msgid "" "%(user)s has shared a library named %(repo_name)s to " "you." -msgstr "" +msgstr "%(user)s ha compartido la biblioteca %(repo_name)s contigo." -#: seahub/notifications/models.py:487 +#: seahub/notifications/models.py:491 #, python-format msgid "" "%(user)s has shared a file named %(file_name)s to " "you." -msgstr "" +msgstr "%(user)s ha compartido el archivo %(file_name)s contigo." -#: seahub/notifications/models.py:503 +#: seahub/notifications/models.py:507 #, python-format -msgid "You have recieved a new message from %(user)s." -msgstr "" +msgid "You have received a new message from %(user)s." +msgstr "Has recibido un nuevo mensaje de %(user)s." -#: seahub/notifications/models.py:518 seahub/notifications/models.py:549 -#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778 +#: seahub/notifications/models.py:522 seahub/notifications/models.py:553 +#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832 msgid "Internal error" msgstr "Error interno" -#: seahub/notifications/models.py:529 +#: seahub/notifications/models.py:533 #, python-format msgid "%(group_name)s has new discussion" -msgstr "" +msgstr "%(group_name)s tiene una nueva discusión" -#: seahub/notifications/models.py:533 +#: seahub/notifications/models.py:537 #, python-format msgid "" "%(user)s posted a new discussion in %(group_name)s" -msgstr "" - -#: seahub/notifications/models.py:555 -#, python-format -msgid "One group discussion has new reply" -msgstr "" +msgstr "%(user)s agregó una nueva discusión en %(group_name)s" #: seahub/notifications/models.py:559 #, python-format -msgid "%(user)s replied your group discussion" -msgstr "" +msgid "One group discussion has new reply" +msgstr "La discusión grupal tiene una nueva respuesta" -#: seahub/notifications/models.py:582 +#: seahub/notifications/models.py:563 +#, python-format +msgid "%(user)s replied your group discussion" +msgstr "%(user)s respondió en la discusión grupal " + +#: seahub/notifications/models.py:586 #, python-format msgid "" "User %(username)s has asked to join group %(group_name)s, verification message: " "%(join_request_msg)s" -msgstr "" +msgstr "El usuario %(username)s solicitó unirse al grupo %(group_name)s, mensaje de verificación: %(join_request_msg)s" #: seahub/notifications/views.py:120 msgid "Successfully cleared all notices." -msgstr "" +msgstr "Todos los avisos eliminados." -#: seahub/notifications/templates/notifications/notification_list.html:9 -#: seahub/notifications/templates/notifications/notification_list.html:13 -msgid "Add new notification" -msgstr "Agregar nueva notificación" +#: seahub/notifications/templates/notifications/notice_email.html:8 +#, python-format +msgid "Hi %(name)s," +msgstr "Hola %(name)s," -#: seahub/notifications/templates/notifications/notification_list.html:21 +#: seahub/notifications/templates/notifications/notice_email.html:11 +#, python-format +msgid "" +"\n" +"You've got 1 new notice on %(site_name)s.\n" +msgid_plural "" +"\n" +"You've got %(num)s new notices on %(site_name)s.\n" +msgstr[0] "\nTienes una nueva notificación en %(site_name)s.\n" +msgstr[1] "\nTienes %(num)s nuevas notificaciones en %(site_name)s.\n" + +#: seahub/notifications/templates/notifications/notice_email.html:19 +msgid "Go check out at the following page:" +msgstr "Verificar en la siguiente página:" + +#: seahub/notifications/templates/notifications/notification_list.html:8 msgid "All Notifications" msgstr "Todas las notificaciones" -#: seahub/notifications/templates/notifications/notification_list.html:25 +#: seahub/notifications/templates/notifications/notification_list.html:9 +#: seahub/notifications/templates/notifications/notification_list.html:12 +msgid "Add new notification" +msgstr "Agregar nueva notificación" + +#: seahub/notifications/templates/notifications/notification_list.html:20 msgid "Notification Detail" msgstr "Detalles de notificaciones" -#: seahub/notifications/templates/notifications/notification_list.html:32 +#: seahub/notifications/templates/notifications/notification_list.html:27 msgid "(current notification)" -msgstr "(notificaciones actuales)" +msgstr "(notificación actual)" -#: seahub/notifications/templates/notifications/notification_list.html:36 +#: seahub/notifications/templates/notifications/notification_list.html:31 msgid "Set to current" -msgstr "Ajustar a los valores actuales" +msgstr "Establecer actual" -#: seahub/notifications/templates/notifications/notification_list.html:44 -#: seahub/templates/sysadmin/sys_group_admin.html:55 +#: seahub/notifications/templates/notifications/notification_list.html:39 +#: seahub/templates/sysadmin/sys_group_admin.html:56 #: seahub/templates/sysadmin/sys_org_admin.html:55 -#: seahub/templates/sysadmin/sys_publink_admin.html:56 +#: seahub/templates/sysadmin/sys_publink_admin.html:57 msgid "Empty" -msgstr "Vacio" +msgstr "Vacío" -#: seahub/notifications/templates/notifications/notification_list.html:56 +#: seahub/notifications/templates/notifications/notification_list.html:51 msgid "Delete Notification" -msgstr "Borrar notificaciones" +msgstr "Borrar notificación" #: seahub/notifications/templates/notifications/user_notification_list.html:4 #: seahub/notifications/templates/notifications/user_notification_list.html:9 msgid "Notices" -msgstr "" +msgstr "Notificaciones" #: seahub/notifications/templates/notifications/user_notification_list.html:11 msgid "Clear" -msgstr "" +msgstr "Limpiar" #: seahub/notifications/templates/notifications/user_notification_list.html:27 #: seahub/templates/activities.html:15 @@ -2424,396 +2606,401 @@ msgstr "Más" #: seahub/options/templates/options/set_user_options.html:7 msgid "Please choose how to view encrypted libraries online:" -msgstr "" +msgstr "Selecciona como deseas ver las bibliotecas encriptadas en línea:" #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Send passwords to the server." -msgstr "" +msgstr "Enviar contraseñas al servidor." #: seahub/options/templates/options/set_user_options.html:10 -#: seahub/profile/templates/profile/set_profile.html:70 +#: seahub/profile/templates/profile/set_profile.html:81 msgid "Files will be decrypted in the server before being sent to you." -msgstr "" +msgstr "Los archivos se desencriptarán en el servidor antes de enviártelos." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Save passwords in your browser." -msgstr "" +msgstr "Guardar contraseñas en el navegador." #: seahub/options/templates/options/set_user_options.html:12 -#: seahub/profile/templates/profile/set_profile.html:73 +#: seahub/profile/templates/profile/set_profile.html:84 msgid "Files will be decrypted in your browser when you download them." -msgstr "" +msgstr "Los archivos serán desencriptados en tu navegador cuando se descarguen." #: seahub/options/templates/options/set_user_options.html:13 -#: seahub/profile/templates/profile/set_profile.html:74 +#: seahub/profile/templates/profile/set_profile.html:85 msgid "" "Tip: the latter way is more secure, but it is not supported well by all " "browsers. We advise you to use the latest version of Chrome or Firefox." -msgstr "" +msgstr "Tip: la manera más segura es la última, pero no está soportado por todos los navegadores. Recomendamos utilizar la última versión de Chrome o Firefox." #: seahub/profile/views.py:37 msgid "Successfully edited profile." -msgstr "Perfil editado satisfactoriamente." +msgstr "Perfil editado con éxito." #: seahub/profile/views.py:43 msgid "Failed to edit profile" -msgstr "Hubo un fallo al intentar editar el perfil." +msgstr "Fallo al editar el perfil." #: seahub/profile/views.py:114 seahub/profile/views.py:150 msgid "Has not accepted invitation yet" -msgstr "No se ha aceptado ninguna invitación aun" +msgstr "Aún no ha aceptado la invitación" #: seahub/profile/views.py:166 msgid "Demo account can not be deleted." -msgstr "" +msgstr "La cuenta demo no puede ser eliminada." #: seahub/profile/views.py:187 msgid "Failed to set default library." -msgstr "" +msgstr "Fallo al definir biblioteca predeterminada." #: seahub/profile/views.py:192 #, python-format msgid "Successfully set \"%s\" as your default library." -msgstr "" +msgstr "\"%s\" definida con éxito como biblioteca predeterminada." #: seahub/profile/templates/profile/profile_base.html:4 -#: seahub/profile/templates/profile/set_profile.html:5 -#: seahub/profile/templates/profile/set_profile.html:25 +#: seahub/profile/templates/profile/set_profile.html:26 msgid "Profile Setting" msgstr "Configuración del perfil" #: seahub/profile/templates/profile/set_profile.html:10 -#: seahub/templates/sysadmin/userinfo.html:17 +#: seahub/templates/sysadmin/userinfo.html:8 msgid "Profile" msgstr "Perfil" -#: seahub/profile/templates/profile/set_profile.html:12 -msgid "Encrypted Libraries" -msgstr "" +#: seahub/profile/templates/profile/set_profile.html:11 +msgid "Language" +msgstr "Idioma" -#: seahub/profile/templates/profile/set_profile.html:14 -msgid "Sub-library" -msgstr "" +#: seahub/profile/templates/profile/set_profile.html:13 +msgid "Encrypted Libraries" +msgstr "Bibliotecas Encriptadas" #: seahub/profile/templates/profile/set_profile.html:15 -msgid "Default Library" -msgstr "" +msgid "Sub-library" +msgstr "Sub-Biblioteca" #: seahub/profile/templates/profile/set_profile.html:16 -#: seahub/profile/templates/profile/set_profile.html:100 -#: seahub/profile/templates/profile/set_profile.html:127 -msgid "Delete Account" -msgstr "Borrar cuenta" +msgid "Default Library" +msgstr "Biblioteca predeterminada." -#: seahub/profile/templates/profile/set_profile.html:27 +#: seahub/profile/templates/profile/set_profile.html:17 +#: seahub/profile/templates/profile/set_profile.html:111 +#: seahub/profile/templates/profile/set_profile.html:138 +msgid "Delete Account" +msgstr "Eliminar Cuenta" + +#: seahub/profile/templates/profile/set_profile.html:28 msgid "Avatar:" msgstr "Avatar:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 msgid "Password:" -msgstr "Contraseña" +msgstr "Contraseña:" -#: seahub/profile/templates/profile/set_profile.html:35 +#: seahub/profile/templates/profile/set_profile.html:36 #: seahub/templates/snippets/repo_dirents.html:79 msgid "Update" msgstr "Actualizar" -#: seahub/profile/templates/profile/set_profile.html:36 +#: seahub/profile/templates/profile/set_profile.html:37 msgctxt "true name" msgid "Name:" -msgstr "" +msgstr "Nombre:" -#: seahub/profile/templates/profile/set_profile.html:41 +#: seahub/profile/templates/profile/set_profile.html:42 msgid "About me:" msgstr "Mi información:" -#: seahub/profile/templates/profile/set_profile.html:48 +#: seahub/profile/templates/profile/set_profile.html:49 msgid "Department:" -msgstr "" +msgstr "Departamento:" -#: seahub/profile/templates/profile/set_profile.html:53 +#: seahub/profile/templates/profile/set_profile.html:54 msgid "Telephone:" -msgstr "" +msgstr "Teléfono:" #: seahub/profile/templates/profile/set_profile.html:66 +msgid "Language Setting" +msgstr "Configuración de idioma" + +#: seahub/profile/templates/profile/set_profile.html:77 msgid "Encrypted Libraries Setting" -msgstr "" +msgstr "Configuracion de Bibliotecas Encriptadas" -#: seahub/profile/templates/profile/set_profile.html:68 +#: seahub/profile/templates/profile/set_profile.html:79 msgid "How to view encrypted libraries online:" -msgstr "" +msgstr "Como ver bibliotecas encriptadas en línea." -#: seahub/profile/templates/profile/set_profile.html:81 +#: seahub/profile/templates/profile/set_profile.html:92 msgid "Sub-library Setting" -msgstr "" +msgstr "Configuración de Sub-biblioteca" -#: seahub/profile/templates/profile/set_profile.html:83 +#: seahub/profile/templates/profile/set_profile.html:94 msgid "Enable sub-library" -msgstr "" +msgstr "Activar sub-biblioteca" -#: seahub/profile/templates/profile/set_profile.html:84 +#: seahub/profile/templates/profile/set_profile.html:95 msgid "" "This feature enables you to selectively sync a folder inside a library. A " "sub-library can be created from any folder. After being created, it will be " "listed in your desktop client, and you can download it just like downloading" " a normal library. It will be automatically kept in sync with its origin " "library." -msgstr "" +msgstr "Esta función permite sincronizar selectivamente una carpeta dentro de una biblioteca. Una sub-biblioteca puede ser creada a partir de cualquier carpeta. Después de ser creada, se listará en el cliente de escritorio y puede descargarse como una biblioteca normal. Se mantendrá sincronizada automáticamente con su biblioteca original." -#: seahub/profile/templates/profile/set_profile.html:85 +#: seahub/profile/templates/profile/set_profile.html:96 msgid "" "Sub-library is also used when sharing a folder to a group or another user. " "Without this option on, a hidden sub-library will be created automatically " "in such case. With this option on, those hidden sub-libraries will also be " "listed, which enables you to manage them." -msgstr "" +msgstr "Las sub-bibliotecas también se usan cuando se comparte una carpeta con un usuario o un grupo. Sin esta opción habilitada, se crea automáticamente una sub-biblioteca oculta. Con la opción habilitada, estas sub-bibliotecas también se listarán, lo que permite administrarlas." -#: seahub/profile/templates/profile/set_profile.html:91 +#: seahub/profile/templates/profile/set_profile.html:102 msgid "Default Library Setting" -msgstr "" +msgstr "Configuración predeterminada de biblioteca" -#: seahub/profile/templates/profile/set_profile.html:93 +#: seahub/profile/templates/profile/set_profile.html:104 msgid "Your default library:" -msgstr "" +msgstr "Tu biblioteca predeterminada:" -#: seahub/profile/templates/profile/set_profile.html:95 +#: seahub/profile/templates/profile/set_profile.html:106 msgid "" "Default library is the default place to store your personal documents and " "pictures." -msgstr "" +msgstr "La biblioteca predeterminada es el lugar donde se almacenarán tus documentos e imágenes." -#: seahub/profile/templates/profile/set_profile.html:96 +#: seahub/profile/templates/profile/set_profile.html:107 msgid "Choose Default Library" -msgstr "" +msgstr "Elegir Biblioteca Predeterminada" -#: seahub/profile/templates/profile/set_profile.html:101 +#: seahub/profile/templates/profile/set_profile.html:112 msgid "This operation will not be reverted. Please think twice!" -msgstr "Esta operación no puede ser revertida. Piense dos veces." +msgstr "Esta operación no se puede revertir. ¿Estás seguro?" -#: seahub/profile/templates/profile/set_profile.html:106 +#: seahub/profile/templates/profile/set_profile.html:117 msgid "Choose default library:" -msgstr "" +msgstr "Elegir biblioteca predeterminada:" -#: seahub/profile/templates/profile/set_profile.html:111 -msgid "Please click and choose a library." -msgstr "" - -#: seahub/profile/templates/profile/set_profile.html:128 +#: seahub/profile/templates/profile/set_profile.html:139 msgid "Really want to delete your account?" -msgstr "Realmente quiere borrar su cuenta?" +msgstr "¿Seguro que deseas eliminar tu cuenta?" #: seahub/profile/templates/profile/user_profile.html:32 msgid "Send message" -msgstr "" +msgstr "Enviar mensaje" #: seahub/profile/templates/profile/user_profile.html:38 msgid "Info" -msgstr "" +msgstr "Info" #: seahub/profile/templates/profile/user_profile.html:41 -#: seahub/templates/sysadmin/userinfo.html:21 +#: seahub/templates/sysadmin/userinfo.html:15 msgctxt "true name" msgid "Name" -msgstr "" +msgstr "Nombre" #: seahub/profile/templates/profile/user_profile.html:44 -#: seahub/templates/sysadmin/userinfo.html:24 +#: seahub/templates/sysadmin/userinfo.html:18 msgid "Self-introduction" -msgstr "" +msgstr "Auto-descripción" #: seahub/profile/templates/profile/user_profile.html:48 -#: seahub/templates/registration/registration_form.html:24 -#: seahub/templates/sysadmin/userinfo.html:29 +#: seahub/templates/registration/registration_form.html:25 +#: seahub/templates/sysadmin/userinfo.html:23 msgid "Department" -msgstr "" +msgstr "Departamento" #: seahub/profile/templates/profile/user_profile.html:51 -#: seahub/templates/registration/registration_form.html:26 -#: seahub/templates/sysadmin/userinfo.html:32 +#: seahub/templates/registration/registration_form.html:27 +#: seahub/templates/sysadmin/userinfo.html:26 msgid "Telephone" -msgstr "" +msgstr "Teléfono" #: seahub/share/forms.py:20 seahub/share/forms.py:30 msgid "Email is not longer than 512 characters" -msgstr "La dirección de correo no debe superar los 255 caracteres" +msgstr "La dirección de correo no debe superar los 512 caracteres" + +#: seahub/share/views.py:57 +msgid "Failed to share to all members, please try again later." +msgstr "Fallo al compartir con los miembros, intenta más tarde." #: seahub/share/views.py:59 -msgid "Failed to share to all members, please try again later." -msgstr "" - -#: seahub/share/views.py:61 #, python-format msgid "" "Shared to all members successfully, go check it at Shares." -msgstr "" +msgstr "Compartido con éxito con todos los miembros, verifica en Compartidos" -#: seahub/share/views.py:73 +#: seahub/share/views.py:71 #, python-format msgid "\"%(repo)s\" is already in group %(group)s. View" -msgstr "" +msgstr "\"%(repo)s\" ya se encuentra en el grupo %(group)s. Ver" -#: seahub/share/views.py:83 +#: seahub/share/views.py:81 #, python-format msgid "Failed to share %(repo)s to %(group)s, please try again later." -msgstr "" +msgstr "Fallo al compartir %(repo)s con %(group)s, intenta más tarde." -#: seahub/share/views.py:87 +#: seahub/share/views.py:85 #, python-format msgid "" "Shared to %(group)s successfully，go check it at Shares." -msgstr "" +msgstr "Compartido con éxito con %(group)s, verifica en Compartidos" -#: seahub/share/views.py:97 +#: seahub/share/views.py:95 msgid "You can not share libray to yourself." -msgstr "" +msgstr "No puedes compartir bibliotecas contigo mismo." -#: seahub/share/views.py:106 +#: seahub/share/views.py:104 #, python-format msgid "Failed to share to %s, please try again later." -msgstr "" +msgstr "Fallo al compartir con %s, intenta más tarde." -#: seahub/share/views.py:113 +#: seahub/share/views.py:111 #, python-format msgid "" "Shared to %(email)s successfully，go check it at Shares." -msgstr "" +msgstr "Compartido con éxito con %(email)s, verifica en Compartidos" -#: seahub/share/views.py:117 +#: seahub/share/views.py:115 #, python-format msgid "Failed to share to %s, as the email is not registered." -msgstr "No se pudo compartir %s, ya que el correo no está registrado." +msgstr "No se pudo compartir %s, el correo no está registrado." -#: seahub/share/views.py:176 +#: seahub/share/views.py:174 msgid "Only the owner of the library has permission to share it." -msgstr "Sólo el propietario de la biblioteca tiene la permisología para compartirla" +msgstr "Sólo el propietario de la biblioteca puede compartirla." -#: seahub/share/views.py:208 +#: seahub/share/views.py:204 #, python-format msgid "" "Failed to share \"%s\", no enough quota. Upgrade account." -msgstr "" +msgstr "Fallo al compartir \"%s\", cuota insuficiente. Actualizar cuenta" -#: seahub/share/views.py:233 seahub/share/views.py:240 +#: seahub/share/views.py:229 seahub/share/views.py:236 msgid "Argument is not valid" -msgstr "" - -#: seahub/share/views.py:244 seahub/share/views.py:254 -msgid "Failed to remove share" -msgstr "No se pudo remover el recurso compartido" - -#: seahub/share/views.py:250 -msgid "group id is not valid" -msgstr "El id del grupo no es válido" - -#: seahub/share/views.py:263 -msgid "Successfully removed share" -msgstr "El recurso compartido fue removido satisfactoriamente" - -#: seahub/share/views.py:355 seahub/share/views.py:486 -msgid "all members" -msgstr "Todos los miembros" - -#: seahub/share/views.py:665 seahub/share/views.py:1011 -#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543 -#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873 -#: seahub/views/ajax.py:890 seahub/views/file.py:770 -msgid "Invalid arguments" msgstr "Argumento inválido" -#: seahub/share/views.py:674 seahub/share/views.py:1016 +#: seahub/share/views.py:240 seahub/share/views.py:250 +msgid "Failed to remove share" +msgstr "Fallo al remover compartido" + +#: seahub/share/views.py:246 +msgid "group id is not valid" +msgstr "id de grupo inválido" + +#: seahub/share/views.py:259 +msgid "Successfully removed share" +msgstr "Compartido removido con éxito" + +#: seahub/share/views.py:352 seahub/share/views.py:483 +msgid "all members" +msgstr "todos los miembros" + +#: seahub/share/views.py:663 seahub/share/views.py:985 +#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623 +#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036 +#: seahub/views/ajax.py:1053 seahub/views/file.py:821 +msgid "Invalid arguments" +msgstr "Argumentos inválidos" + +#: seahub/share/views.py:668 seahub/share/views.py:990 msgid "You cannot share the library in this way." -msgstr "No puedes compartir la librería usando ese método." +msgstr "No puedes compartir la biblioteca usando ese método." -#: seahub/share/views.py:699 seahub/share/views.py:1039 -msgid "Failed to get the link, please retry later." -msgstr "No se pudo obtener el enlace, por favor intente más tarde" - -#: seahub/share/views.py:721 seahub/share/views.py:754 +#: seahub/share/views.py:700 seahub/share/views.py:733 msgid "Removed successfully" -msgstr "Removido satisfactoriamente" +msgstr "Removido con éxito" -#: seahub/share/views.py:738 seahub/share/views.py:771 +#: seahub/share/views.py:717 seahub/share/views.py:750 msgid "The link doesn't exist" -msgstr "El link no existe" +msgstr "El enlace no existe" -#: seahub/share/views.py:785 +#: seahub/share/views.py:764 msgid "" "Sending shared link failed. Email service is not properly configured, please" " contact administrator." -msgstr "No se pudo enviar el enlace compartido. El servicio de correo electrónico no está adecuadamente configurado, por favor, contacte al administrador" +msgstr "Fallo al enviar el enlace compartido. El servicio de correo electrónico no está adecuadamente configurado, por favor, contacta al administrador" -#: seahub/share/views.py:810 -msgid "Your friend shared a file to you on Seafile" -msgstr "Un amigo compartió contigo un archivo en Seafile." +#: seahub/share/views.py:787 +#, python-format +msgid "A file is shared to you on %s" +msgstr "Un archivo ha sido compartido contigo en %s" -#: seahub/share/views.py:815 seahub/share/views.py:1089 +#: seahub/share/views.py:791 seahub/share/views.py:1060 msgid "Internal server error. Send failed." msgstr "Error interno del servidor: no se pudo enviar" -#: seahub/share/views.py:818 seahub/share/views.py:1092 +#: seahub/share/views.py:794 seahub/share/views.py:1063 msgid "Successfully sent." -msgstr "Envíado satisfactoriamente." +msgstr "Enviado con éxito." -#: seahub/share/views.py:838 +#: seahub/share/views.py:814 msgid "Please choose a directory." -msgstr "" +msgstr "Elije una carpeta." -#: seahub/share/views.py:855 seahub/share/views.py:949 +#: seahub/share/views.py:831 seahub/share/views.py:923 msgid "Successfully saved." -msgstr "Grabado con éxito." +msgstr "Guardado con éxito." -#: seahub/share/views.py:874 +#: seahub/share/views.py:850 #, python-format msgid "Failed to share to \"%s\", user not found." -msgstr "Falla al compartir com \"%s\", usuario no encontrado." +msgstr "Fallo al compartir con \"%s\", usuario no encontrado." -#: seahub/share/views.py:888 +#: seahub/share/views.py:864 #, python-format msgid "Successfully shared %s." msgstr "Compartido con éxito %s." -#: seahub/share/views.py:914 +#: seahub/share/views.py:888 #, python-format msgid "Successfully unshared \"%s\"." -msgstr "Descompatido con éxito \"%s\"." +msgstr "Se dejó de compartir \"%s\"." -#: seahub/share/views.py:916 +#: seahub/share/views.py:890 #, python-format -msgid "You don't have permission to unshared %s." -msgstr "No tiene permio para descompartir %s." +msgid "You don't have permission to unshare %s." +msgstr "No tienes permiso para dejar de compartir %s" -#: seahub/share/views.py:952 +#: seahub/share/views.py:926 #, python-format msgid "You don't have permission to save %s." -msgstr "No tiene permiso para grabar %s." +msgstr "No tienes permiso suficiente para guardar %s." -#: seahub/share/views.py:1059 +#: seahub/share/views.py:1013 +msgid "Failed to get the link, please retry later." +msgstr "Fallo al obtener el enlace, intenta más tarde." + +#: seahub/share/views.py:1033 msgid "" "Sending shared upload link failed. Email service is not properly configured," " please contact administrator." -msgstr "" +msgstr "El envío del enlace de subida falló. El servicio de Email no está configurado adecuadamente, contacta al administrador." -#: seahub/share/views.py:1084 -msgid "Your friend shared a upload link to you on Seafile" -msgstr "" +#: seahub/share/views.py:1056 +#, python-format +msgid "An upload link is shared to you on %s" +msgstr "Un enlace de subida ha sido compartido contigo en %s" #: seahub/share/templates/share/links.html:5 msgid "Links - Share" -msgstr "" +msgstr "Enlaces - Compartir" #: seahub/share/templates/share/links.html:12 msgid "Download Links" -msgstr "" +msgstr "Enlaces de descarga" #: seahub/share/templates/share/links.html:13 msgid "Upload Links" -msgstr "" +msgstr "Enlaces de subida" #: seahub/share/templates/share/links.html:22 #: seahub/share/templates/share/links.html:58 @@ -2822,45 +3009,46 @@ msgstr "Visitas" #: seahub/share/templates/share/links.html:37 #: seahub/share/templates/share/links.html:68 -#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632 +#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621 +#: seahub/templates/repo.html.py:699 #: seahub/templates/repo_view_snapshot.html:42 msgid "View" msgstr "Ver" #: seahub/share/templates/share/links.html:38 #: seahub/share/templates/share/links.html:69 -#: seahub/templates/sysadmin/sys_publink_admin.html:22 +#: seahub/templates/sysadmin/sys_publink_admin.html:24 msgid "Remove" msgstr "Remover" #: seahub/share/templates/share/links.html:45 msgid "You don't have any download link" -msgstr "" +msgstr "No tienes ningún enlace de descarga" #: seahub/share/templates/share/links.html:46 msgid "" "You can generate a download link for a folder or a file. People receive this" " link can view the folder or the file online." -msgstr "" +msgstr "Puedes generar un enlace de descarga para una carpeta o un archivo. Las personas que reciban el enlace pueden ver la carpeta o el archivo en línea." #: seahub/share/templates/share/links.html:76 msgid "You don't have any upload link" -msgstr "" +msgstr "No tienes ningún enlace de subida" #: seahub/share/templates/share/links.html:77 msgid "" "You can generate an upload link from any folder. People receive this link " "can upload files to this folder." -msgstr "" +msgstr "Puedes generar un enlace de subida para cualquier carpeta. Las personas que reciben este enlace pueden subir archivos a esta carpeta." #: seahub/share/templates/share/list_priv_shared_folders.html:5 msgid "Folders - Share" -msgstr "" +msgstr "Carpetas - Compartir" #: seahub/share/templates/share/list_priv_shared_folders.html:10 -#: seahub/templates/home_base.html:29 +#: seahub/templates/home_base.html:30 msgid "Folders" -msgstr "" +msgstr "Carpetas" #: seahub/share/templates/share/list_priv_shared_folders.html:16 #: seahub/share/templates/share/repos.html:16 @@ -2870,41 +3058,41 @@ msgstr "Compartir con" #: seahub/share/templates/share/list_priv_shared_folders.html:17 #: seahub/share/templates/share/repos.html:17 msgid "Permission" -msgstr "Permisos" +msgstr "Permiso" #: seahub/share/templates/share/list_priv_shared_folders.html:61 msgid "You have not shared any folder" -msgstr "" +msgstr "No has compartido ninguna carpeta" #: seahub/share/templates/share/list_priv_shared_folders.html:62 msgid "" "You can share a single folder with a registered user if you don't want to " "share a whole library." -msgstr "" +msgstr "Puedes compartir solamente una carpeta con un usuario registrado si no quieres compartir toda la biblioteca." #: seahub/share/templates/share/list_priv_shared_folders.html:97 -#: seahub/share/templates/share/repos.html:101 +#: seahub/share/templates/share/repos.html:107 #: seahub/templates/sysadmin/useradmin_js.html:62 msgid "Edit succeeded" -msgstr "Edición sin inconvenientes" +msgstr "Editado con éxito" #: seahub/share/templates/share/list_priv_shared_folders.html:104 -#: seahub/share/templates/share/repos.html:108 +#: seahub/share/templates/share/repos.html:114 #: seahub/templates/sysadmin/useradmin_js.html:71 msgid "Edit failed." -msgstr "No se pudo editar" +msgstr "Fallo al editar." #: seahub/share/templates/share/priv_shared_files.html:5 msgid "Files - Share" -msgstr "" +msgstr "Archivos - Compartir" #: seahub/share/templates/share/priv_shared_files.html:12 msgid "From Others" -msgstr "De otros" +msgstr "De Otros" #: seahub/share/templates/share/priv_shared_files.html:13 msgid "To Others" -msgstr "Para otros" +msgstr "Para Otros" #: seahub/share/templates/share/priv_shared_files.html:22 msgid "From" @@ -2912,13 +3100,13 @@ msgstr "De" #: seahub/share/templates/share/priv_shared_files.html:42 msgid "No file is shared to you" -msgstr "" +msgstr "No hay archivos compartidos contigo" #: seahub/share/templates/share/priv_shared_files.html:43 msgid "" "Single files shared to you will be listed here, and you can download them or" " save them to some libraries." -msgstr "" +msgstr "Los archivos que han sido compartidos contigo serán listados aquí, puedes descargarlos o guardarlos en alguna biblioteca." #: seahub/share/templates/share/priv_shared_files.html:55 msgid "To" @@ -2926,17 +3114,17 @@ msgstr "Para" #: seahub/share/templates/share/priv_shared_files.html:75 msgid "You don't have any private shared files" -msgstr "Usted no tiene archivos compartidos privados" +msgstr "No tienes enlaces de descarga privados" #: seahub/share/templates/share/priv_shared_files.html:76 msgid "" "You can share a single file with a registered user if you don't want to " "share a whole library." -msgstr "" +msgstr "Puedes compartir solamente un archivo con un usuario registrado, si no quieres compartir la biblioteca completa." #: seahub/share/templates/share/repos.html:5 msgid "Libraries - Share" -msgstr "" +msgstr "Bibliotecas - Compartir" #: seahub/share/templates/share/repos.html:65 msgid "You have not shared any library" @@ -2947,7 +3135,7 @@ msgid "" "You can share libraries to 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 "Puedes compartir bibliotecas con tus amigos y colegas dando click al icono de compartir en tu página de inicio o creando una nueva biblioteca en la sección grupo al cual perteneces" +msgstr "Puedes compartir bibliotecas con contactos dando click al icono de compartir en la página de inicio o creando una nueva biblioteca en los grupos a los cuales pertenezcas" #: seahub/share/templates/share/user_share_list.html:4 #: seahub/share/templates/share/user_share_list.html:25 @@ -2956,7 +3144,7 @@ msgstr "Compartidos" #: seahub/share/templates/share/user_share_list.html:8 #: seahub/templates/org_admin_base.html:8 -#: seahub/templates/repo_settings.html:13 +#: seahub/templates/repo_settings.html:15 msgid "Basic Info" msgstr "Información básica" @@ -2966,98 +3154,67 @@ msgstr "Sin alias" #: seahub/share/templates/share/user_share_list.html:14 msgid "Add to contacts" -msgstr "Agregar a contactos" +msgstr "Agregar a los contactos" #: seahub/share/templates/share/user_share_list.html:59 -#: seahub/templates/snippets/my_owned_repos.html:147 +#: seahub/templates/my_shared_repos.html:40 +#: seahub/templates/snippets/my_shared_repos.html:39 msgid "Leave Share" msgstr "Dejar de compartir" #: seahub/share/templates/share/user_share_list.html:69 #, python-format msgid "You have no library sharing with %(to_email)s." -msgstr "" +msgstr "No tienes bibliotecas compartidas con %(to_email)s." #: seahub/templates/404.html:6 msgid "Sorry, but the requested page could not be found." -msgstr "Lo sentimos pero la página solicitada no puede ser encontrada" +msgstr "La página solicitada no pudo ser encontrada." #: seahub/templates/activities.html:4 seahub/templates/home_base.html:15 msgid "Activities" -msgstr "" +msgstr "Actividades" #: seahub/templates/admin_base.html:4 msgid "Exit System Admin" -msgstr "" +msgstr "Salir de Administrador" -#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14 -#: seahub/templates/pubuser.html:8 -msgid "Users" -msgstr "Usuarios" - -#: seahub/templates/admin_base.html:19 -msgid "Notifications" -msgstr "Notificaciones" - -#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31 -msgid "Links" -msgstr "Enlaces" - -#: seahub/templates/base.html:38 -msgid "System Admin" -msgstr "Administración del Sistema" - -#: seahub/templates/base.html:49 +#: seahub/templates/base.html:48 msgid "unread notices" -msgstr "" +msgstr "notas sin leer" -#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3 -#: seahub/templates/registration/login.html:6 -#: seahub/templates/registration/password_reset_complete.html:8 -msgid "Log In" -msgstr "Ingresar al sistema" - -#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36 -#: seahub/templates/registration/registration_form.html:9 -msgid "Signup" -msgstr "Registrarse en el sistema" - -#: seahub/templates/base.html:63 +#: seahub/templates/base.html:69 msgid "Log out" msgstr "Desconectarse" -#: seahub/templates/base.html:123 -msgid "Server Version: " -msgstr "Versión del servidor:" +#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6 +msgid "System Admin" +msgstr "Administración del Sistema" -#: seahub/templates/base.html:124 -msgid "Seafile" -msgstr "Seafile" - -#: seahub/templates/base.html:125 -msgid "Contact Us" -msgstr "Contáctenos" +#: seahub/templates/base.html:163 +#: seahub/templates/sysadmin/sys_group_admin.html:8 +msgid "All Groups" +msgstr "Todos los grupos" #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9 -#: seahub/templates/home_base.html:23 msgid "Clients" msgstr "Clientes" #: seahub/templates/client_mgmt.html:13 msgid "Client Name" -msgstr "Nome del Cliente" +msgstr "Nombre del Cliente" -#: seahub/templates/client_mgmt.html:15 +#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15 msgid "IP" msgstr "IP" #: seahub/templates/client_mgmt.html:16 msgid "Last Sync" -msgstr "Último sincronismo" +msgstr "ÚItima Sincronización" #: seahub/templates/client_mgmt.html:44 msgid "Not synced" -msgstr "" +msgstr "No sincronizadas" #: seahub/templates/client_mgmt.html:48 msgid "Unsync" @@ -3065,51 +3222,103 @@ msgstr "Desincronizar" #: seahub/templates/client_mgmt.html:54 msgid "Really want to unsync it?" -msgstr "" +msgstr "¿Realmente deseas desincronizarla?" #: seahub/templates/client_mgmt.html:60 msgid "You do not have connected clients" -msgstr "" +msgstr "No tienes ningún cliente conectado" #: seahub/templates/client_mgmt.html:61 msgid "" "The libraries synced to desktop clients are listed in this page. You can see" " the client's name and its IP address. You may unsync a client from a " "library if you no longer want to sync it." -msgstr "" +msgstr "Aquí se listan los clientes desktop con bibliotecas sincronizadas, aparece su nombre e IP. Es posible desincronizar un cliente de una biblioteca si así lo deseas." #: seahub/templates/client_mgmt.html:101 msgid "Successfully unsynced." -msgstr "" +msgstr "Desincronizada con éxito." #: seahub/templates/decrypt_repo_form.html:7 msgid "" "This library is encrypted. Please input the password if you want to browse " "it online. And the password will be kept on the server for only 1 hour." -msgstr "" +msgstr "Esta biblioteca está encriptada. Ingresa la contraseña para verla en línea. La contraseña se almacenará en el servidor durante 1 hora." -#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229 +#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227 +#: seahub/templates/share_access_validation.html:8 msgid "Password: " msgstr "Contraseña:" -#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234 +#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232 #, python-format msgid "" "You can change how to view encrypted libraries online here." -msgstr "" +msgstr "Puedes cambiar la forma de ver las bibliotecas compartidas en línea aquí." -#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337 +#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334 +#: seahub/templates/share_access_validation.html:25 msgid "Please enter the password." -msgstr "" +msgstr "Por favor ingresa la contraseña." -#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52 -#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25 +#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9 +#: seahub/templates/home_base.html:23 +msgid "Devices" +msgstr "Dispositivos" + +#: seahub/templates/devices.html:13 +msgid "Platform" +msgstr "Plataforma" + +#: seahub/templates/devices.html:14 +msgid "Device Name" +msgstr "Nombre de dispositivo" + +#: seahub/templates/devices.html:16 +msgid "Last Access" +msgstr "Último acceso" + +#: seahub/templates/devices.html:17 +msgid "# Libraries" +msgstr "# Bibliotecas" + +#: seahub/templates/devices.html:18 +msgid "Operation" +msgstr "Operación" + +#: seahub/templates/devices.html:37 +msgid "Unlink" +msgstr "Desvincular" + +#: seahub/templates/devices.html:43 +#, python-format +msgid "Really want to unlink %s?" +msgstr "¿Realmente deseas desvincular %s?" + +#: seahub/templates/devices.html:44 +msgid "It will immediately stop syncing." +msgstr "Dejará de sincronizarse inmediatamente." + +#: seahub/templates/devices.html:50 +msgid "You do not have connected devices" +msgstr "No tienes dispositivos conectados" + +#: seahub/templates/devices.html:51 +msgid "Your clients (Desktop/Android/iOS) will be listed here." +msgstr "Tus clientes (Desktop/Android/iOS) serán listados aquí." + +#: seahub/templates/devices.html:110 +msgid "Successfully unlinked." +msgstr "Desvinculado exitosamente." + +#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57 +#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26 #: seahub/templates/shared_file_view.html:35 -#: seahub/templates/view_file_base.html:74 +#: seahub/templates/view_file_base.html:75 #: seahub/templates/view_history_file.html:34 -#: seahub/templates/view_shared_dir.html:46 -#: seahub/templates/view_shared_dir.html:60 +#: seahub/templates/view_shared_dir.html:41 +#: seahub/templates/view_shared_dir.html:55 #: seahub/templates/snippets/repo_dirents.html:24 #: seahub/templates/snippets/repo_dirents.html:77 msgid "Download" @@ -3119,14 +3328,13 @@ msgstr "Descargar" #: seahub/templates/repo_history_view.html:38 #: seahub/templates/repo_recycle_view.html:16 #: seahub/templates/shared_file_view.html:17 -#: seahub/templates/view_shared_dir.html:16 -#: seahub/templates/snippets/repo_dir_data.html:4 +#: seahub/templates/view_shared_dir.html:13 msgid "Current path: " msgstr "Ruta actual:" #: seahub/templates/file_edit.html:93 msgid "Draft saved." -msgstr "Bosquejo grabado." +msgstr "Borrador guardado." #: seahub/templates/file_edit.html:95 msgid "Continue editing" @@ -3134,23 +3342,23 @@ msgstr "Continuar editando" #: seahub/templates/file_edit.html:96 msgid "Preview" -msgstr "Vista preliminar" +msgstr "Vista previa" #: seahub/templates/file_edit.html:122 msgid "Standard Syntax" -msgstr "" +msgstr "Sintaxis Estándar" #: seahub/templates/file_edit.html:126 msgid "Enter this" -msgstr "Entrar esto" +msgstr "Tipee ésto" #: seahub/templates/file_edit.html:127 msgid "To see this" -msgstr "Ver esto" +msgstr "Para ver ésto" #: seahub/templates/file_edit.html:130 seahub/templates/file_edit.html:131 msgid "bold" -msgstr "negrito" +msgstr "negrita" #: seahub/templates/file_edit.html:130 seahub/templates/file_edit.html:131 #: seahub/templates/file_edit.html:134 seahub/templates/file_edit.html:135 @@ -3159,7 +3367,7 @@ msgstr "texto" #: seahub/templates/file_edit.html:134 seahub/templates/file_edit.html:135 msgid "italics" -msgstr "itálico" +msgstr "itálica" #: seahub/templates/file_edit.html:138 seahub/templates/file_edit.html:141 msgid "Header" @@ -3167,19 +3375,19 @@ msgstr "Encabezado" #: seahub/templates/file_edit.html:145 seahub/templates/file_edit.html:147 msgid "Smaller header" -msgstr "Menor encabezado" +msgstr "Sub Encabezado" #: seahub/templates/file_edit.html:150 seahub/templates/file_edit.html:151 msgid "Link something" -msgstr "Linkar algo" +msgstr "Enlace web" #: seahub/templates/file_edit.html:154 msgid "alt text" -msgstr "texto alto" +msgstr "texto alternativo" #: seahub/templates/file_edit.html:158 msgid "Extended Syntax for Wiki" -msgstr "" +msgstr "Sintaxis Extendida para el wiki" #: seahub/templates/file_edit.html:160 msgid "or" @@ -3187,15 +3395,15 @@ msgstr "o" #: seahub/templates/file_edit.html:160 msgid "internal link to another wiki page." -msgstr "" +msgstr "enlace interno a otra página wiki." #: seahub/templates/file_edit.html:161 msgid "internal link to a picture at this-library/images/pic.jpg." -msgstr "" +msgstr "enlace interno a una imagen en esta_biblioteca/images/pic.jpg" #: seahub/templates/file_edit.html:162 msgid "internal link to a file at this-library/folder/file.doc." -msgstr "" +msgstr "enlace interno a un archivo en esta_biblioteca/folder/file.doc" #: seahub/templates/file_edit.html:170 msgid "Font" @@ -3203,11 +3411,11 @@ msgstr "Fuente" #: seahub/templates/file_edit.html:174 msgid "Font Size" -msgstr "Tamanho Fuente" +msgstr "Tamaño" #: seahub/templates/file_edit.html:176 msgid "Huge" -msgstr "Gigante" +msgstr "Enorme" #: seahub/templates/file_edit.html:177 msgid "Normal" @@ -3219,67 +3427,67 @@ msgstr "Pequeño" #: seahub/templates/file_edit.html:182 msgid "Font Color" -msgstr "Color de la fuente" +msgstr "Color de texto" #: seahub/templates/file_edit.html:184 msgid "defaut color" -msgstr "color default" +msgstr "color predefinido" #: seahub/templates/file_edit.html:196 msgid "Bold (Ctrl/Cmd+B)" -msgstr "Negrito (Ctrl/Cmd+B)" +msgstr "Negrita (Ctrl/Cmd+B)" #: seahub/templates/file_edit.html:197 msgid "Italic (Ctrl/Cmd+I)" -msgstr "Itálico (Ctrl/Cmd+I)" +msgstr "Itálica (Ctrl/Cmd+I)" #: seahub/templates/file_edit.html:198 msgid "Strikethrough" -msgstr "" +msgstr "Tachado" #: seahub/templates/file_edit.html:199 msgid "Underline (Ctrl/Cmd+U)" -msgstr "" +msgstr "Subrayado (Ctrl/Cmd+U)" #: seahub/templates/file_edit.html:200 msgid "Remove format" -msgstr "Remover formato" +msgstr "Eliminar formato" #: seahub/templates/file_edit.html:203 msgid "Bullet list" -msgstr "" +msgstr "Lista con viñeta" #: seahub/templates/file_edit.html:204 msgid "Number list" -msgstr "" +msgstr "Lista numerada" #: seahub/templates/file_edit.html:205 msgid "Reduce indent (Shift+Tab)" -msgstr "" +msgstr "Reducir indentación (Shift+Tab)" #: seahub/templates/file_edit.html:206 msgid "Indent (Tab)" -msgstr "" +msgstr "Indentar (Tab)" #: seahub/templates/file_edit.html:209 msgid "Align Left (Ctrl/Cmd+L)" -msgstr "" +msgstr "Alinear Izquierda(Ctrl/Cmd+L)" #: seahub/templates/file_edit.html:210 msgid "Center (Ctrl/Cmd+E)" -msgstr "" +msgstr "Centrar (Ctrl/Cmd+E)" #: seahub/templates/file_edit.html:211 msgid "Align Right (Ctrl/Cmd+R)" -msgstr "" +msgstr "Alinear Derecha (Ctrl/Cmd+R)" #: seahub/templates/file_edit.html:212 msgid "Justify (Ctrl/Cmd+J)" -msgstr "" +msgstr "Justificar (Ctrl/Cmd+J)" #: seahub/templates/file_edit.html:215 msgid "Hyperlink" -msgstr "Hyperlink" +msgstr "Hipervínculo" #: seahub/templates/file_edit.html:218 msgid "Add" @@ -3287,31 +3495,31 @@ msgstr "Agregar" #: seahub/templates/file_edit.html:220 msgid "Remove Hyperlink" -msgstr "Remover Hyperlink" +msgstr "Remover Hipervínculo" #: seahub/templates/file_edit.html:224 msgid "Insert picture (or just drag & drop)" -msgstr "" +msgstr "Insertar imagen (o arrastre y suelte)" #: seahub/templates/file_edit.html:227 msgid "Undo (Ctrl/Cmd+Z)" -msgstr "" +msgstr "Deshacer (Ctrl/Cmd+Z)" #: seahub/templates/file_edit.html:228 msgid "Redo (Ctrl/Cmd+Y)" -msgstr "" +msgstr "Rehacer (Ctrl/Cmd+Y)" #: seahub/templates/file_edit.html:251 msgid "Draft Available" -msgstr "" +msgstr "Borrador Disponible" #: seahub/templates/file_edit.html:252 msgid "There's a saved draft for this file, would you like to load it?" -msgstr "" +msgstr "Hay un borrador de este archivo, desea cargarlo?" #: seahub/templates/file_edit.html:253 msgid "Load" -msgstr "Cargar" +msgstr "Carga" #: seahub/templates/file_edit.html:254 msgid "Discard" @@ -3319,115 +3527,115 @@ msgstr "Descartar" #: seahub/templates/file_edit.html:267 msgid "Failed to save draft, exceeded max quota" -msgstr "" +msgstr "Fallo al grabar borrador, cuota excedida" #: seahub/templates/file_edit.html:366 msgid "Draft successfully loaded" -msgstr "" +msgstr "Borrador cargado con éxito" #: seahub/templates/file_edit.html:414 msgid "Strong Ctrl+B" -msgstr "" +msgstr "Resaltar Ctrl+B" #: seahub/templates/file_edit.html:415 msgid "strong text" -msgstr "" +msgstr "texto resaltado" #: seahub/templates/file_edit.html:417 msgid "Emphasis Ctrl+I" -msgstr "" +msgstr "Énfasis Ctrl+I" #: seahub/templates/file_edit.html:418 msgid "emphasized text" -msgstr "" +msgstr "texto enfatizado" #: seahub/templates/file_edit.html:420 msgid "Hyperlink Ctrl+L" -msgstr "" +msgstr "Hipervínculo Ctrl+L" #: seahub/templates/file_edit.html:421 msgid "enter link description here" -msgstr "" +msgstr "describa el enlace aquí" #: seahub/templates/file_edit.html:422 msgid "Insert Hyperlink" -msgstr "" +msgstr "Insertar Hipervínculo" #: seahub/templates/file_edit.html:422 seahub/templates/file_edit.html:432 msgid "optional title" -msgstr "" +msgstr "título opcional" #: seahub/templates/file_edit.html:424 msgid "Blockquote
Ctrl+Q" -msgstr "" +msgstr "Bloque de texto
Ctrl+Q" #: seahub/templates/file_edit.html:425 msgid "Blockquote" -msgstr "" +msgstr "Bloque de texto" #: seahub/templates/file_edit.html:427 msgid "Code Sample 
 Ctrl+K"
-msgstr ""
+msgstr "Fragmento de código 
 Ctrl+K"
 
 #: seahub/templates/file_edit.html:428
 msgid "enter code here"
-msgstr ""
+msgstr "ingrese código aquí"
 
 #: seahub/templates/file_edit.html:430
 msgid "Image  Ctrl+G"
-msgstr ""
+msgstr "Imagen  Ctrl+G"
 
 #: seahub/templates/file_edit.html:431
 msgid "enter image description here"
-msgstr ""
+msgstr "ingrese la descripción de la imagen"
 
 #: seahub/templates/file_edit.html:432
 msgid "Insert Image"
-msgstr "Incluir imagen"
+msgstr "Insertar Imagen"
 
 #: seahub/templates/file_edit.html:434
 msgid "Numbered List 
     Ctrl+O"
-msgstr ""
+msgstr "Lista Numerada 
      Ctrl+O"
 
 #: seahub/templates/file_edit.html:435
 msgid "Bulleted List 
         Ctrl+U"
-msgstr ""
+msgstr "Lista Viñeta 
           Ctrl+U"
 
 #: seahub/templates/file_edit.html:436
 msgid "List item"
-msgstr ""
+msgstr "elemento de lista"
 
 #: seahub/templates/file_edit.html:438
 msgid "Heading 
          /
           Ctrl+H"
-msgstr ""
+msgstr "Encabezado 
          /
           Ctrl+H"
 
 #: seahub/templates/file_edit.html:439
 msgid "Heading"
-msgstr ""
+msgstr "Encabezado"
 
 #: seahub/templates/file_edit.html:441
 msgid "Horizontal Rule 
           Ctrl+R"
-msgstr ""
+msgstr "División Horizontal 
           Ctrl+R"
 
 #: seahub/templates/file_edit.html:442
 msgid "Undo - Ctrl+Z"
-msgstr ""
+msgstr "Deshacer - Ctrl+Z"
 
 #: seahub/templates/file_edit.html:443
 msgid "Redo - Ctrl+Y"
-msgstr ""
+msgstr "Deshacer - Ctrl+Y"
 
 #: seahub/templates/file_edit.html:444
 msgid "Redo - Ctrl+Shift+Z"
-msgstr ""
+msgstr "Rehacer - Ctrl+Shift+Z"
 
 #: seahub/templates/file_edit.html:446
 msgid "Editing Help"
-msgstr ""
+msgstr "Ayuda de Edición"
 
 #: seahub/templates/file_edit.html:545
 msgid "Submit failed. Please check the network."
-msgstr "No se pudo enviar. Por favor, chequee la red"
+msgstr "No se pudo enviar. Por favor, verifica la red"
 
 #: seahub/templates/file_edit.html:563
 #: seahub/templates/snippets/repo_decrypt_js.html:11
@@ -3435,37 +3643,32 @@ msgid "Password is required."
 msgstr "Contraseña requerida"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
-msgstr "Histórico"
+msgstr "Historial"
 
 #: seahub/templates/file_revisions.html:8
 msgid "'s Version History"
-msgstr "s Historial de versiones"
+msgstr "Historial de versiones"
 
 #: seahub/templates/file_revisions.html:9
 msgid ""
 "Tip:a new version will be generated after each modification, and you can "
 "restore the file to a previous version."
-msgstr "Consejo: una nueva versión será generada después de cada modificación y tú  podrás restaurar el archivo desde una versión previa"
+msgstr "Consejo: una nueva versión será generada después de cada modificación, puedes restaurar el archivo desde una versión previa."
 
 #: seahub/templates/file_revisions.html:12 seahub/templates/text_diff.html:10
 msgid "Current Path:"
 msgstr "Ruta actual:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Última modificación"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Tamaño"
 
@@ -3473,54 +3676,71 @@ msgstr "Tamaño"
 msgid "(current version)"
 msgstr "(versión actual)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Renombrados o movidos desde %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Restaurar"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
-msgstr ""
+msgstr "Diff"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Documentos"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introducción"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Ayuda"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Cliente"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile para Windows, Mac y Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Versión del servidor:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Contáctenos"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
 msgid "snapshots"
-msgstr "Instantáneas"
+msgstr "instantáneas"
 
 #: seahub/templates/history_file_view.html:23
 #: seahub/templates/view_history_file.html:16
 msgid "history"
-msgstr "Historial"
+msgstr "historial"
 
 #: seahub/templates/history_file_view.html:26
 #: seahub/templates/text_diff.html:7
 #: seahub/templates/view_history_file.html:19
 msgid "Back to file versions"
-msgstr "Regresar a la opción de versiones de archivos"
+msgstr "Regresar a versiones"
 
 #: seahub/templates/history_file_view.html:30
 #: seahub/templates/history_file_view.html:41
@@ -3528,17 +3748,18 @@ msgstr "Regresar a la opción de versiones de archivos"
 #: seahub/templates/repo_recycle_view.html:17
 #: seahub/templates/view_trash_file.html:6
 msgid "'s trash"
-msgstr "s papelera"
+msgstr " papelera"
 
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Regresar a la biblioteca"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3551,53 +3772,74 @@ msgstr "Personal"
 
 #: seahub/templates/home_base.html:13 seahub/templates/starred.html:8
 msgid "Starred"
-msgstr "Marcadas"
+msgstr "Marcado"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Wiki Personal"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
-msgstr ""
+msgstr "Admin de Compartidos"
+
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Enlaces"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupo"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "No hay bibliotecas compartidas con tus grupos"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "No hay bibliotecas compartidas contigo"
+
+#: seahub/templates/myhome.html:40
+msgid "Welcome to Seafile!"
+msgstr "Bienvenido a Seafile!"
 
 #: seahub/templates/myhome.html:41
-msgid "Welcome to Seafile!"
-msgstr ""
-
-#: seahub/templates/myhome.html:42
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
-msgstr ""
+msgstr "Seafile organiza los archivos en bibliotecas. Cada biblioteca se puede sincronizar y compartir por separado. Se ha creado una biblioteca personal. Puedes crear más después."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
-msgstr ""
+msgstr "Inicio"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
-msgstr ""
+msgstr "Organización"
 
 #: seahub/templates/org_base.html:7
 msgid ""
 "Organization will be removed in next version, data will be merged into your "
 "current account."
-msgstr ""
+msgstr "La funcion de \"Organizacion\" será removida en la siguiente version, los datos se fusionarán con la cuenta actual."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3605,7 +3847,7 @@ msgstr "Compartir"
 
 #: seahub/templates/org_base.html:21
 msgid "Public Library"
-msgstr "Carpetas públicas"
+msgstr "Biblioteca Pública"
 
 #: seahub/templates/org_base.html:24
 msgid "Public Info"
@@ -3613,428 +3855,460 @@ msgstr "Información Pública"
 
 #: seahub/templates/pubgrp.html:24
 msgid "No one has created any groups yet"
-msgstr "Aun no se ha creado ningún grupo "
+msgstr "Aún no se ha creado ningún grupo "
 
 #: seahub/templates/pubgrp.html:25
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
-msgstr "Puedas dar click en el botón \"Agregar Grupo\" bajo la etiqueta \"Grupo\" para crear un grupo"
+msgstr "Puedes hacer click en el botón \"Agregar Grupo\" en \"Grupo\" para crear un grupo"
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Compartir desde"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
-msgstr "No existen bibliotecas públicas"
+msgstr "No hay bibliotecas públicas"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
-msgstr "Puedes crear una biblioteca pública dando click en el enlace \"Nueva biblioteca\" . A partir de ese momento, otros usuarios podrán ver y descargar  dicha biblioteca"
+msgstr "Puedes crear una biblioteca pública dando click en el enlace \"Nueva biblioteca\" . A partir de ese momento, otros usuarios podrán ver y descargarla"
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Papelera"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Buscar miembros..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Tamaño:"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Papelera"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Mover"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copiar"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Subir archivos"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
-msgstr ""
+msgstr "El dueño de esta biblioteca se quedó sin espacio."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
-msgstr ""
+msgstr "Seleciona un archivo primero."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
-msgstr ""
+msgstr "Agregar Archivos"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
-msgstr "Iniciar todo"
+msgstr "Iniciar Todo"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
-msgstr "Cancelar todo"
+msgstr "Cancelar Todo"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
-msgstr ""
+msgstr "La función de Arrastrar y Soltar sólo está disponible en Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
-msgstr ""
+msgstr "El tamaño del archivo debe ser menor a %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
-msgstr ""
+msgstr "Guardando..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
-msgstr ""
+msgstr "Actualizar %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
-msgstr "Elija un archivo"
+msgstr "Elegir un archivo"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
-msgstr ""
+msgstr "Más pequeños que %(max_file_size)s"
+
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
+msgid "New Directory"
+msgstr "Nueva carpeta"
+
+#: seahub/templates/repo.html:140
+msgid "Directory Name"
+msgstr "Nombre de la carpeta"
 
 #: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
-msgid "New Directory"
-msgstr "Nuevo directorio"
-
-#: seahub/templates/repo.html:149
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nuevo archivo"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
-msgstr "Funcionalidades del tipo de archivo"
+msgstr "tipo de archivo destacado"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Click para seleccionar"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
-msgstr ""
+msgstr "Formato de Texto Enriquecido"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
-msgstr "Formato de marcado sencillo (single markup format)"
+msgstr "Formateo sencillo."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
-msgstr "Fecha del archivo"
+msgstr "Nombre de Archivo"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Biblioteca actual"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Otras bibliotecas"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
-msgstr "Por favor, seleccione un directorio con un click."
+msgstr "Por favor, selecciona una carpeta con un click."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
-msgstr ""
+msgstr "Renombrar %(name)s como:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
-msgstr ""
+msgstr "Sincronizar %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
-msgstr ""
+msgstr "Una sub-biblioteca será creada a partir de esta carpeta. Se listará en el cliente de escritorio, puedes descargarla como una biblioteca normal."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr ""
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
-msgstr ""
+msgstr "Esta biblioteca está encriptada. Ingresa la contraseña para consultarla en línea. La contraseña se guardará durante 1 hora en el navegador."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Archivo demasiado grande"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
-msgstr ""
+msgstr "Archivo demasiado pequeño"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
-msgstr ""
+msgstr "Tipo de archivo no permitido"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
-msgstr ""
+msgstr "Número máximo de archivos excedido"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
-msgstr ""
+msgstr "Bytes actuales exceden el tamaño máximo"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
-msgstr ""
+msgstr "Resultado de subida incompleto"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
-msgstr ""
+msgstr "Inicio"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
-msgstr ""
+msgstr "Eliminar elementos"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
-msgstr ""
+msgstr "¿Seguro que deseas eliminar los elementos selecionados?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Procesando…"
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "%(name)s y otros %(amount)s elementos borrados con éxito."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
-msgstr ""
+msgstr "%(name)s eliminado con éxito."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "Error interno. Fallo al borrar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
-msgstr ""
+msgstr "Error interno. Fallo al borrar %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
-msgstr ""
+msgstr "Mover carpetas/archivos selecionados a:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
-msgstr ""
+msgstr "Copiar carpetas/archivos selecionados a:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
-msgstr ""
+msgstr "Ruta de destino inválida"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "%(name)s y otros %(amount)s elementos movidos con éxito."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
-msgstr ""
+msgstr "%(name)s movido con éxito."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "%(name)s y otros %(amount)s elementos copiados con éxito."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
-msgstr ""
+msgstr "%(name)s copiados con éxito."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "Error interno. Fallo al mover %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
-msgstr ""
+msgstr "Error interno. Fallo al mover %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
-msgstr ""
+msgstr "Error interno. Fallo al copiar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
-msgstr ""
+msgstr "Error interno. Fallo al copiar %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Moviendo..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Copiando..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "Movido con éxito %(s_num)s items."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "Fallo al mover %(f_num)s items."
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "Copiado con éxito %(s_num)s items."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Falló"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
-msgstr ""
+msgstr "Encriptando archivo..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
-msgstr ""
+msgstr "Error al encriptar."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
-msgstr ""
+msgstr "Encriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
-msgstr ""
+msgstr "Subiendo archivo..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
-msgstr ""
+msgstr "Terminado!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
-msgstr ""
+msgstr "Descargando..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
-msgstr ""
+msgstr "Descargando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
-msgstr ""
+msgstr "Desencriptando..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
-msgstr ""
+msgstr "Desencriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
-msgstr ""
+msgstr "Eliminados con éxito %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
-msgstr ""
+msgstr "Renombrar Archivo"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
-msgstr ""
+msgstr "Renombrar Carpeta"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
-msgstr ""
+msgstr "Copiar Archivo"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
-msgstr ""
+msgstr "Mover Archivo"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
-msgstr ""
+msgstr "Copiar Carpeta"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
-msgstr ""
+msgstr "Mover Carpeta"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
-msgstr ""
+msgstr "Copiar %(name)s a:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
-msgstr ""
+msgstr "Mover %(name)s a:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
-msgstr ""
+msgstr "La descarga de la carpeta no está permitida en esta biblioteca."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
-msgstr "desmarcar"
+msgstr "desmarcado"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
-msgstr "marcar"
+msgstr "marcado"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
-msgstr ""
+msgstr "Sub-biblioteca creada."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
-msgstr ""
+msgstr "Es requerido."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
-msgstr "Sólo una extensión, por favor, suministre un nombre."
+msgstr "Define un nombre, no solamente la extensión."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
-msgstr ""
+msgstr "Creando..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
-msgstr ""
+msgstr "No se ha renombrado."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
-msgstr ""
+msgstr "%(old_name)s renombrados a %(new_name)s con éxito"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Cancelado."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
-msgstr ""
+msgstr "Selecciona al menos un contacto."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
-msgstr ""
+msgstr "Ingresa o selecciona correos/grupos."
 
 #: seahub/templates/repo_access_deny.html:8
 msgid "You can't access this library."
@@ -4048,20 +4322,21 @@ msgstr "Historial de modificaciones"
 msgid ""
 "Tip: A snapshot will be generated after modification, which records the "
 "library state before this modification."
-msgstr "Consejo: Una instantánea será generada después de cada modificación, con ello  se almacenará un estado previo de la biblioteca antes de esta modificación"
+msgstr "Consejo: Una instantánea será generada después de cada modificación, para almacenar el estado anterior."
 
 #: seahub/templates/repo_history.html:14
 msgid "View Snapshot"
 msgstr "Ver instántanea"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
-msgstr "Visualizar:"
+msgstr "Por página:"
 
 #: seahub/templates/repo_history_view.html:8
 msgid "snapshot"
@@ -4073,12 +4348,12 @@ msgstr "Regresar a instantáneas"
 
 #: seahub/templates/repo_history_view.html:33
 msgid "Can't view this library"
-msgstr "Esta biblioteca no puede visualizarse"
+msgstr "No se puede ver esta biblioteca "
 
 #: seahub/templates/repo_history_view.html:58
 #: seahub/templates/repo_recycle_view.html:61
 msgid "Directory"
-msgstr "Directorio"
+msgstr "Carpeta"
 
 #: seahub/templates/repo_recycle_view.html:32
 #: seahub/templates/repo_recycle_view.html:34
@@ -4099,33 +4374,77 @@ msgstr "todos"
 msgid "Delete Time"
 msgstr "Borrar fecha"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
-msgstr "Configuraciones de la biblioteca"
+msgstr "Configuración de la biblioteca"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Mantener historial completo"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "No mantener historial"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
-msgstr "Sólo mantener un período del historial:"
+msgstr "Sólo mantener el historial por:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
-msgstr "Días"
+msgstr "días"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
-msgstr ""
+msgstr "Transferir Propiedad"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
-msgstr ""
+msgstr "Tranferir esta biblioteca a otro usuario:"
+
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Cambiar la contraseña de esta biblioteca:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Contraseña anterior"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Nueva contraseña (al menos 6 caracteres)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Nueva contraseña otra vez"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Ingrese la contraseña anterior"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Ingrese la nueva contraseña"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "La nueva contraseña es demasiado corta"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "La nueva contraseña es demasiado larga (el máximo es 35 caracteres)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Ingrese la nueva contraseña otra vez"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Las contraseñas no coinciden"
 
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
@@ -4135,6 +4454,10 @@ msgstr "Regresar al historial de modificaciones"
 msgid "Create Time"
 msgstr "Fecha de creación"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Última modificación"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4147,81 +4470,88 @@ msgstr "Restaurar biblioteca"
 
 #: seahub/templates/repo_view_snapshot.html:88
 msgid "Are you sure you want to restore this library?"
-msgstr ""
+msgstr "¿Estás seguro que deseas restaurar está biblioteca?"
 
 #: seahub/templates/seafile_access_check.html:6
 msgid "Preparing, please wait..."
-msgstr "Preparando archivos, por favor, espere..."
+msgstr "Preparando, por favor, espere..."
 
 #: seahub/templates/seafile_access_check.html:8
 msgid "No running Seafile client version 1.x is detected."
-msgstr ""
+msgstr "No se han detectado clientes Seafile version 1.x."
 
 #: seahub/templates/seafile_access_check.html:8
 msgid ""
 "If you're sure Seafile client is running, click the following link to "
 "continue downloading:"
-msgstr ""
+msgstr "Si estás seguro que el cliente Seafile está corriendo haz click en el siguiente enlace para continuar la descarga:"
 
 #: seahub/templates/seafile_access_check.html:9
 msgid ""
 "If you're using Seafile client version 2.0+, download the library from the "
 "client directly."
-msgstr ""
+msgstr "Si estás usando la versión 2.0+  del cliente Seafile, descarga la biblioteca directamente desde el cliente."
 
 #: seahub/templates/seafile_access_check.html:12
 msgid "Your Seafile client is out of date, please upgrade to latest version."
-msgstr "Tu cliente Seafile está desactualizado, por favor, actualícelo con la última versión"
+msgstr "Tu cliente Seafile está desactualizado, por favor, actualízalo con la última versión"
 
 #: seahub/templates/seafile_access_check.html:12
 msgid "Click to download."
 msgstr "Click para descargar."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Ingresa la contraseña si deseas visitar el archivo/carpeta compartido. Ésta será guardada en el servidor por una hora solamente."
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Compartido por:"
 
 #: seahub/templates/shared_file_view.html:32
 msgid "Save to..."
-msgstr ""
+msgstr "Guardar en..."
 
 #: seahub/templates/shared_file_view.html:42
 msgid "Save To:"
-msgstr ""
+msgstr "Guardar en:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Hola,"
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Estás recibiendo este correo electrónico porque %(email)s está compartiendo un archivo contigo en %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s ha compartido un archivo contigo en %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Por favor, visita la siguiente página y obten tu archivo:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr ""
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s ha compartido un enlace de subida contigo en %(site_name)s:"
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
-msgstr ""
+msgstr "Puedes ir a la siguiente página para subir los archivos:"
 
 #: seahub/templates/starred.html:4
 msgid "Stars"
-msgstr ""
+msgstr "Marcado"
 
 #: seahub/templates/starred.html:20
 msgid "icon"
 msgstr "icono"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Desmarcar"
 
@@ -4233,27 +4563,27 @@ msgstr "No has marcado ningún archivo como favorito."
 msgid ""
 "You can star important files by clicking the \"Star\" button on file viewing"
 " page, and they will be listed here."
-msgstr "Puedes marcar como favorito archivos que sean importantes dando click en el botón \"Marcar\" o visitando la página de ver archivos en donde  los encontrará listados"
+msgstr "Los archivos marcados se listarán aquí. Puedes marcar archivos importantes como favoritos haciendo click en el botón \"Marcar\" en la página del archivo."
 
 #: seahub/templates/starred.html:59
 msgid "Successfully unstarred."
-msgstr ""
+msgstr "Favorito removido."
 
 #: seahub/templates/text_diff.html:6
 msgid "modification details"
-msgstr "Detalles de modificación"
+msgstr "detalles de modificación"
 
 #: seahub/templates/text_diff.html:22
 msgid "It's a newly-created blank file."
-msgstr "Este es un archivo nuevo sin ningún contenido"
+msgstr "Éste es un archivo nuevo sin ningún contenido"
 
 #: seahub/templates/text_diff.html:29
 msgid "before modification"
-msgstr "Antes de la modificación"
+msgstr "antes de la modificación"
 
 #: seahub/templates/text_diff.html:31
 msgid "after modification"
-msgstr "Después de la modificación"
+msgstr "después de la modificación"
 
 #: seahub/templates/update_file_error.html:6
 msgid "Update file "
@@ -4262,7 +4592,7 @@ msgstr "Actualizar archivo"
 #: seahub/templates/update_file_error.html:14
 #: seahub/templates/upload_file_error.html:10
 msgid "error: "
-msgstr "Error:"
+msgstr "error:"
 
 #: seahub/templates/upload_file_error.html:6
 msgid "Upload file"
@@ -4274,70 +4604,70 @@ msgstr "para"
 
 #: seahub/templates/user_404.html:6
 msgid "Sorry, this user is not registered yet."
-msgstr ""
+msgstr "Este usuario no está registrado aún."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Marcar"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
-msgstr "Actualizar este archivo"
+msgstr "actualizó este archivo"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "Único contribuyente"
-msgstr[1] " %(counter)s contribuyentes"
+msgstr[1] " %(counter)s colaboradores"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
-msgstr "Desmarcado satisfactoriamente"
+msgstr "Desmarcado con éxito"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
-msgstr "Marcado satisfactorimente"
+msgstr "Marcado con éxito"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
-msgstr ""
+msgstr "también puedes presionar ←"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
-msgstr ""
+msgstr "previo"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
-msgstr ""
+msgstr "también puedes presionar → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
-msgstr ""
+msgstr "siguiente"
 
 #: seahub/templates/view_file_markdown.html:20
 #: seahub/templates/view_file_sf.html:13
 #: seahub/templates/view_file_text.html:31
 #: seahub/templates/snippets/file_encoding.html:5
 msgid "Encoding:"
-msgstr ""
+msgstr "Codificación:"
 
 #: seahub/templates/view_file_markdown.html:23
 #: seahub/templates/view_file_sf.html:16
 #: seahub/templates/view_file_text.html:34
 #: seahub/templates/snippets/file_encoding.html:8
 msgid "auto detect"
-msgstr ""
+msgstr "auto detectar"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
-msgstr "Cargando..."
+msgstr "cargando..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
-msgstr "Puedes usar IE 10 u otros navegadores, por ejemplo, para visualizarlo en línea"
+msgstr "Puedes usar IE 10, firefox o chrome para visualizar el archivo en línea."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
-msgstr "Para poder visualizar este documento en línea debes usar firefox, chrome o IE9"
+msgstr "Para ver este documento en línea puedes usar firefox, chrome o IE9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
-msgstr "Este tipo de archivos no puede ser visualizado online"
+msgstr "Este tipo de archivo no se puede ver en línea."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
 #: seahub/templates/view_shared_upload_link.html:21
 #, python-format
 msgid "Upload files to %(dir_name)s"
-msgstr ""
+msgstr "Subir archivos a %(dir_name)s"
 
 #: seahub/templates/view_shared_upload_link.html:22
 msgid "shared by:"
-msgstr ""
+msgstr "compartido por:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Ingresar"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
-msgstr ""
+msgstr "(recuperar contraseña)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
-msgstr ""
+msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
-msgstr ""
+msgstr "No legible? Refrescar."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
-msgstr "Correo electrónico o contraseña"
+msgstr "Correo electrónico o contraseña incorrecta"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
-msgstr ""
+msgstr "Recordarme por %(remember_days)s días"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Registrarse"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
-msgstr ""
+msgstr "Fallo al refrescar el CAPTCHA. Intenta más tarde."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
-msgstr "Correos no pueden estar en blanco"
+msgstr "El correo no puede estar en blanco"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
-msgstr "Contraseñas no pueden estar en blanco"
+msgstr "La contraseña no puede estar en blanco"
 
 #: seahub/templates/registration/logout.html:4
 msgid "Log Out"
@@ -4436,11 +4780,11 @@ msgstr " Volver a conectarse"
 
 #: seahub/templates/registration/password_change_done.html:4
 msgid "Password Change Successfully"
-msgstr "Contraseña cambiada satisfactoriamente"
+msgstr "Contraseña cambiada con éxito"
 
 #: seahub/templates/registration/password_change_done.html:9
 msgid "Your password has been changed successfully."
-msgstr "Tu contraseña ha sido cambiada satisfactoriamente."
+msgstr "Contraseña ha sido cambiada con éxito."
 
 #: seahub/templates/registration/password_change_form.html:3
 #: seahub/templates/registration/password_change_form.html:7
@@ -4463,196 +4807,214 @@ msgstr "Confirmar contraseña:"
 
 #: seahub/templates/registration/password_reset_complete.html:4
 msgid "Successfully reset password"
-msgstr "Contraseña restaurada satisfactoriamente"
+msgstr "Contraseña restablecida con éxito"
 
 #: seahub/templates/registration/password_reset_complete.html:8
 msgid "Successfully reset password."
-msgstr "Contraseña restaurada satisfactoriamente."
+msgstr "Contraseña restablecida con éxito."
 
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Reestablecer Contraseña"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Suministre una nueva contraseña"
+msgid "Reset Password"
+msgstr "Reestablecer contraseña"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
-msgstr "No se pudo restaurar la contraseña: este enlace ya no es válido"
+msgstr "Fallo al restaurar la contraseña: el enlace ya no está disponible."
 
 #: seahub/templates/registration/password_reset_done.html:4
 msgid "Password Reset Successfully"
-msgstr "Contraseña restaurada satisfactoriamente"
+msgstr "Contraseña restaurada con éxito"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Hemos envíado a tu cuenta de correo las instrucciones para restaurar  tu contraseña."
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Hemos enviado un email de reestablecer contraseña a tu casilla."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Estás recibiendo este correo porque solicitaste restaurar tu contraseña para  tu cuenta de usuario en el sitio %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "Para reestablecer la contraseña de tu cuenta %(account)s en %(site_name)s, dale click en el siguiente enlace:"
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Por favor, visita la siguiente página y selecciona una nueva contraseña"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Tu nombre de usuario en caso de que lo hayas olvidado:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Si no lo has solicitado, ignóralo."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
-msgstr "¿Cuál  es la dirección de correo que utiliza para conectarse?"
+msgstr "¿Cuál es la dirección de correo que utilizas para conectarte?"
 
 #: seahub/templates/registration/password_reset_form.html:12
 msgid "We will send you an email to set new password"
-msgstr "Al oprimir enviar se te enviarán instrucciones para colocar la nueva contraseña"
+msgstr "Se te enviará un correo con instrucciones para definir una nueva contraseña"
 
 #: seahub/templates/registration/registration_complete.html:4
 msgid "Registration complete"
-msgstr ""
+msgstr "Registro completo"
 
 #: seahub/templates/registration/registration_complete.html:9
 msgid ""
 "An activation email has been sent. Please check your email and click on the "
 "link to activate your account."
-msgstr ""
+msgstr "Se ha enviado un correo de activación. Revisa tu email y haz click en el enlace para activar la cuenta."
 
 #: seahub/templates/registration/registration_complete.html:11
 msgid ""
 "Registration complete, please wait for administrator to activate your "
 "account."
-msgstr ""
+msgstr "Registro completo, espera a que el administrador active tu cuenta."
 
 #: seahub/templates/registration/registration_form.html:3
 msgid "Register"
 msgstr "Registrar"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
-msgstr "Bienvenido otra vez, ya estás autenticado en el sistema."
+msgstr "Bienvenido otra vez, sesión iniciada."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Confirmar contraseña"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
-msgid "Please enter the password again"
-msgstr "Por favor, escriba la contraseña nuevamente"
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "Registrarse"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
+msgid "Please enter the password again"
+msgstr "Ingresa la contraseña nuevamente"
+
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
-msgstr "Las contraseñas no concuerdan"
+msgstr "Las contraseñas no coinciden"
 
 #: seahub/templates/snippets/avatar_upload_js.html:40
 msgid " is not supported. Please choose an image file."
-msgstr "no está soportado. Por favor, seleccione una imagen de un archivo"
+msgstr "no está soportado. Por favor, selecciona un archivo de imagen."
 
 #: seahub/templates/snippets/avatar_upload_js.html:45
 msgid " is not supported. File extensions can only be "
-msgstr "no es soportado. Extensiones de archivo sólo pueden ser "
+msgstr "no es soportado. Extensiones soportadas"
 
 #: seahub/templates/snippets/avatar_upload_js.html:52
 msgid " is too large. Allowed maximum size is 1MB."
-msgstr "Es demasiado extenso. Tamaño máximo permitido es 1 MB."
+msgstr "es demasiado extenso. Tamaño máximo permitido es 1 MB."
 
 #: seahub/templates/snippets/bottom_bar.html:3
 msgid "Discuss"
-msgstr ""
-
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr ""
+msgstr "Comentar"
 
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
-msgstr ""
+msgstr "Selecciona al menos 1 grupo."
 
 #: seahub/templates/snippets/bottom_bar.html:71
 msgid "Please input a discussion."
-msgstr ""
-
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Generado por el sistema"
+msgstr "Ingresa un tópico"
 
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
-msgstr ""
+msgstr "Compartir %(name)s"
 
 #: seahub/templates/snippets/file_share_popup.html:6
 msgid "Download Link"
-msgstr ""
+msgstr "Enlace de descarga"
 
 #: seahub/templates/snippets/file_share_popup.html:7
 msgid "Upload Link"
-msgstr ""
+msgstr "Link de subida"
 
 #: seahub/templates/snippets/file_share_popup.html:9
 #: seahub/templates/snippets/file_share_popup.html:12
 msgid "Private Share"
-msgstr ""
+msgstr "Compartido Privado"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Utilizar contraseña"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(al menos 6 caracteres)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Repetir contraseña"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Establecer vencimiento"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Días"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
-msgstr ""
+msgstr "Generar"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Enlace:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Enviar"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
-msgid "Send to:"
-msgstr "Envíar a:"
-
-#: seahub/templates/snippets/file_share_popup.html:38
 #: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
+msgid "Send to:"
+msgstr "Enviar a:"
+
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Correos separados por ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Enviando…"
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
-msgstr ""
+msgstr "Puedes compartir el enlace generado con otros para que puedan subir archivos a esta carpeta."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
-msgstr ""
+msgstr "Link de Subida:"
 
 #: seahub/templates/snippets/group_recommend_form.html:5
 msgid "Post a discussion to group"
-msgstr ""
+msgstr "Agregar discusión al grupo"
 
 #: seahub/templates/snippets/group_recommend_form.html:14
 msgid "discussion"
-msgstr ""
+msgstr "discusión"
 
 #: seahub/templates/snippets/list_commit_detail.html:11
 msgid "Modification Details"
@@ -4660,31 +5022,31 @@ msgstr "Detalles de modificación"
 
 #: seahub/templates/snippets/list_commit_detail.html:24
 msgid "New files"
-msgstr "Nuevo archivo"
+msgstr "Archivos nuevos"
 
 #: seahub/templates/snippets/list_commit_detail.html:25
 msgid "Deleted files"
-msgstr "Nombre de(los) archivo(s) borrado(s)"
+msgstr "Archivos borrados"
 
 #: seahub/templates/snippets/list_commit_detail.html:26
 msgid "Renamed or Moved files"
-msgstr "Renombrar o mover archivo"
+msgstr "Archivos renombrados o movidos"
 
 #: seahub/templates/snippets/list_commit_detail.html:27
 msgid "Modified files"
-msgstr "Archivo modificado"
+msgstr "Archivos modificados"
 
 #: seahub/templates/snippets/list_commit_detail.html:28
 msgid "New directories"
-msgstr "Nuevo directorios"
+msgstr "Carpetas nuevas"
 
 #: seahub/templates/snippets/list_commit_detail.html:29
 msgid "Deleted directories"
-msgstr "Directorios eliminados"
+msgstr "Carpetas eliminadas"
 
 #: seahub/templates/snippets/list_commit_detail.html:39
 msgid "Unknown error."
-msgstr "Eror desconocido"
+msgstr "Error desconocido"
 
 #: seahub/templates/snippets/my_owned_repos.html:6
 msgid "Mine"
@@ -4692,31 +5054,31 @@ msgstr "Mías"
 
 #: seahub/templates/snippets/my_owned_repos.html:8
 msgid "Sub-libraries"
-msgstr ""
+msgstr "Sub-bibliotecas"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
-msgstr "Compartida"
+msgstr "Compartidas"
 
 #: seahub/templates/snippets/my_owned_repos.html:55
 msgid "You have not created any libraries"
-msgstr "No ha creado ninguna biblioteca"
+msgstr "No has creado ninguna biblioteca"
 
 #: seahub/templates/snippets/my_owned_repos.html:56
 msgid ""
 "You can create a library to organize your files. For example, you can create"
 " one for each of your projects. Each library can be synchronized and shared "
 "separately."
-msgstr "Puede crear una biblioteca para organizar sus archivos. Por ejemplo, puede crear una para proyecto. Cada biblioteca puede ser sincronizada y compartida separadamente."
+msgstr "Puedes crear una biblioteca para organizar sus archivos. Por ejemplo, puedes crear una para cada proyecto. Cada biblioteca puede ser sincronizada y compartida separadamente."
 
 #: seahub/templates/snippets/my_owned_repos.html:68
 msgid "Origin"
-msgstr ""
+msgstr "Origen"
 
 #: seahub/templates/snippets/my_owned_repos.html:102
 msgid "You have not created any sub-libraries"
-msgstr ""
+msgstr "No has creado ninguna sub-biblioteca"
 
 #: seahub/templates/snippets/my_owned_repos.html:103
 msgid ""
@@ -4724,37 +5086,31 @@ msgid ""
 "library can be independently synced and shared. Files in the sub-library "
 "will be automatically kept in sync with those in the directory of the origin"
 " library."
-msgstr ""
-
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "No existen bibliotecas compartidas contigo"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr ""
+msgstr "Puedes crear una sub-biblioteca a partir de una carpeta de una biblioteca existente. Una sub-biblioteca puede ser sincronizada y compartida independientemente. Los archivos de la sub-bibilioteca se mantendrán sincronizados automáticamente con el directorio de origen de la biblioteca."
 
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
-msgstr ""
-
-#: seahub/templates/snippets/office_convert_js.html:39
-msgid "hide outline"
-msgstr ""
+msgstr "El archivo se está procesando, espera..."
 
 #: seahub/templates/snippets/office_convert_js.html:40
-msgid "show outline"
-msgstr ""
+msgid "hide outline"
+msgstr "ocultar esquema"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:41
+msgid "show outline"
+msgstr "mostrar esquema"
+
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
-msgstr "La conversión del documento falló"
+msgstr "Falló la conversión del documento "
 
 #: seahub/templates/snippets/repo_create_form.html:9
 msgid "Share Permission"
-msgstr "Compartir permisos"
+msgstr "Permisos al Compartir"
 
 #: seahub/templates/snippets/repo_create_form.html:18
 msgid "Encrypt"
@@ -4763,53 +5119,55 @@ msgstr "Encriptar"
 #: seahub/templates/snippets/repo_create_form.html:20
 #, python-format
 msgid "(at least %(repo_password_min_length)s characters)"
-msgstr ""
+msgstr "(al menos %(repo_password_min_length)s caracteres)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Repetir contraseña"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
-msgstr ""
+msgstr "Nombre requerido"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
-msgstr ""
+msgstr "Descripción requerida"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
-msgstr "Por favor, suministre una contraseña"
+msgstr "Ingresa una contraseña"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
-msgstr ""
+msgstr "Contraseña demasiado corta"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
-msgstr ""
+msgstr "Contraseña demasiado larga (máximo 35 caracteres)"
 
 #: seahub/templates/snippets/repo_del_js.html:44
 msgid "Delete succeeded."
-msgstr ""
+msgstr "Borrado con éxito."
 
 #: seahub/templates/snippets/repo_del_popup.html:3
 #, python-format
 msgid "Really want to delete %(lib_name)s ?"
-msgstr ""
+msgstr "¿Seguro que deseas borrar %(lib_name)s?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
-msgstr "Subir archivo..."
+msgstr "Subir archivo"
 
 #: seahub/templates/snippets/repo_dirents.html:18
 #: seahub/templates/snippets/repo_dirents.html:71
 msgid "Fetch failed"
-msgstr "No se pudo obtener"
+msgstr "Fallo al obtener archivo"
 
 #: seahub/templates/snippets/repo_dirents.html:28
 msgid "Sync"
-msgstr ""
+msgstr "Sincronizar"
 
 #: seahub/templates/snippets/repo_dirents.html:33
 msgid "More operations"
@@ -4817,30 +5175,30 @@ msgstr "Más operaciones"
 
 #: seahub/templates/snippets/repo_dirents.html:87
 msgid "More Operations"
-msgstr "Más operaciones"
+msgstr "Más Operaciones"
 
 #: seahub/templates/snippets/repo_share_form.html:3
 #, python-format
 msgid "Share %(lib_name)s"
-msgstr ""
+msgstr "Compartir %(lib_name)s"
 
 #: seahub/templates/snippets/repo_share_form.html:11
 msgid "Emails or Groups, Seperated by ','"
-msgstr "Contraseñas o grupos separados por ','"
+msgstr "Correos o grupos separados por ','"
 
 #: seahub/templates/snippets/repo_share_form.html:14
 msgid ""
 "Tip: must be organization members or organization groups, enter \"all\" to "
 "share to public library."
-msgstr "Consejo: debe ser miembro de esta organización para poder compartir biblioteca públicas utilizando la opción  \"todo\" "
+msgstr "Tip: deben ser miembros de la organización o de algún grupo, escribe \"all\" para convertirla en pública."
 
 #: seahub/templates/snippets/repo_share_form.html:17
 msgid "Tip: enter \"all\" to share to public library."
-msgstr "Consejo: Seleccione \"Todos\" para compartir la biblioteca pública."
+msgstr "Tip: Ingresa \"all\" para convertir en biblioteca pública."
 
 #: seahub/templates/snippets/search_form.html:4
 msgid "Search files in this wiki"
-msgstr "Buscar archivos en este Wiki"
+msgstr "Buscar archivos en el wiki"
 
 #: seahub/templates/snippets/search_form.html:4
 msgid "Search files in this library"
@@ -4849,7 +5207,7 @@ msgstr "Buscar archivos en esta biblioteca"
 #: seahub/templates/snippets/search_form.html:7
 #: seahub/templates/snippets/search_form.html:13
 msgid "Search Files"
-msgstr "Buscar archivos"
+msgstr "Buscar Archivos"
 
 #: seahub/templates/snippets/search_form.html:9
 msgid "advanced"
@@ -4872,7 +5230,7 @@ msgstr "En esta biblioteca"
 #: seahub/templates/snippets/search_form.html:22
 #, python-format
 msgid "in %(name)s"
-msgstr "En %(name)s"
+msgstr "en %(name)s"
 
 #: seahub/templates/snippets/search_form.html:30
 #: seahub/templates/snippets/search_form.html:33
@@ -4882,15 +5240,15 @@ msgstr "Todos los tipos"
 #: seahub/templates/snippets/search_form.html:31
 #: seahub/templates/snippets/search_form.html:34
 msgid "Custom file types"
-msgstr "Tipos de archivos personalizados"
+msgstr "Tipos de archivo personalizados"
 
 #: seahub/templates/snippets/search_form.html:43
 msgid "Text files"
-msgstr "Archivos texto"
+msgstr "Archivos de texto"
 
 #: seahub/templates/snippets/search_form.html:45
 msgid "Images"
-msgstr "Imagenes"
+msgstr "Imágenes"
 
 #: seahub/templates/snippets/search_form.html:46
 msgid "Video"
@@ -4914,130 +5272,154 @@ msgstr "seaf"
 
 #: seahub/templates/snippets/search_form.html:51
 msgid "markdown"
-msgstr ""
+msgstr "markdown"
 
 #: seahub/templates/snippets/search_form.html:53
 msgid "Input file extensions here, separate with ','"
-msgstr ""
+msgstr "Ingresa extensiones de archivo, separadas con ','"
 
 #: seahub/templates/snippets/search_form.html:54
 msgid ""
 "Please select at least one file type or input at least one file extension"
-msgstr ""
+msgstr "Selecciona al menos un tipo de archivo o ingresa al menos una extensión de archivo"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
-msgstr ""
+msgstr "Selecciona contactos"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
-msgstr "Por favor, introduzca al menos, una dirección de correo."
+msgstr "Ingresa al menos un correo."
+
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Ingresa cantidad de días"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Ingresa cantidad válida de días"
 
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
-msgstr ""
+msgstr "Utilizado:"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
 msgid "Self"
-msgstr ""
+msgstr "Propio"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
-msgstr ""
+msgstr "Compartiendo"
 
 #: seahub/templates/snippets/space_and_traffic.html:20
 msgid "Traffic this month:"
-msgstr ""
+msgstr "Tráfico de este mes:"
 
 #: seahub/templates/snippets/space_and_traffic.html:24
 msgid "Payment"
-msgstr ""
+msgstr "Pago"
+
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Usuarios"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Tráfico"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Registros"
 
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
-msgstr ""
+msgstr "Transferir Biblioteca"
 
 #: seahub/templates/sysadmin/repo_transfer_form.html:4
 #, python-format
 msgid "Transfer %(lib_name)s to:"
-msgstr ""
+msgstr "Transferir %(lib_name)s a:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Propietario"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Todos los grupos"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Creador"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Creado el"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Borrar grupo"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Buscar usuarios..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
-msgstr ""
+msgstr "Base de datos"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr ""
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
-msgstr ""
+msgstr "Creado / Último incio"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Espacio utilizado"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Buscar bibliotecas por nombre..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
-msgstr ""
+msgstr "Todas"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
-msgstr ""
+msgstr "Huérfanas"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 #: seahub/templates/sysadmin/sys_org_admin.html:7
 msgid "All Organizations"
@@ -5051,98 +5433,119 @@ msgstr "Prefijo URL"
 msgid "Delete Organization"
 msgstr "Borrar organización"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
-msgstr ""
+msgstr "Enlaces Públicos"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
-msgstr ""
+msgstr "Cuenta"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
-msgstr ""
+msgstr "Buscar Biblioteca"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
-msgstr ""
+msgstr "Tip: puedes buscar por nombre, propietario o ambas."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
-msgstr ""
+msgstr "Resultado"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
-msgstr ""
+msgstr "No hay resultados"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Tráfico del usuario"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Mes:"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Usuario"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Uso total"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr "Agregar usuario"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
 #: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Agregar nuevo usuario"
+msgid "Add admin"
+msgstr "Agregar admin"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Agregar admins"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr "Consejo: los emails deberían ser los usuarios ya agregados"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
-msgstr ""
+msgstr "Activando..., por favor espera"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
-msgstr ""
+msgstr "Las contraseñas no concuerdan"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "Tu cuanta %(username)s en %(site_name)s ha sido activada."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Estas recibiendo este archivo porque %(user)s te agregó a su organización: \"%(org.org_name)s\" en el sitio: %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s te ha invitado a unirte a la organización  \"%(org_name)s\" en %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Estas recibiendo este correo porque %(user)s te agregó a %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s te ha invitado a unirte a %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "La siguiente es la información de tu cuenta:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr "Esta es la información de tu cuenta:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Correo electrónico: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Contraseña:  %(password)s"
+msgid "Password: %(password)s"
+msgstr "Contraseña: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Por favor, visita la siguiente página e inicia sesión:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Estás recibiendo este mensaje porque un miembro del equipo de administración restauró tu contraseña para el sitio %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "Tu contraseña en %(site_name)s ha sido reestablecida. Ahora es %(password)s. Modifícala lo antes posible."
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Tu nueva contraseña es  %(password)s, por favor, modifícala tan pronto como sea posible."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
-msgstr ""
+msgstr "Buscar Usuario"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
-msgstr ""
+msgstr "Tip: Utiliza * como carácter comodín."
 
 #: seahub/templates/sysadmin/useradmin_js.html:3
 msgid "Delete User"
@@ -5151,517 +5554,551 @@ msgstr "Borrar usuario"
 #: seahub/templates/sysadmin/useradmin_js.html:8
 #, python-format
 msgid "Are you sure you want to reset the password of %s ?"
-msgstr ""
+msgstr "¿Estás seguro que deseas restablecer la contraseña de %s?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
-msgstr ""
+msgstr "Revocar Privilegios"
 
 #: seahub/templates/sysadmin/useradmin_js.html:12
 #, python-format
 msgid "Are you sure you want to revoke the admin permission of %s ?"
-msgstr ""
+msgstr "¿Seguro que deseas revocar los privilegios de administración de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
-msgstr ""
+msgstr "Establecer Administrador"
 
 #: seahub/templates/sysadmin/useradmin_js.html:16
 #, python-format
 msgid "Are you sure you want to set %s as admin?"
-msgstr ""
+msgstr "¿Seguro que deseas establecer a %s como administrador?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:55
 msgid "Edit succeeded, an email has been sent."
-msgstr ""
+msgstr "Editado con éxito, se envió un email."
 
 #: seahub/templates/sysadmin/useradmin_js.html:59
 msgid ""
 "Edit succeeded, but failed to send email, please check your email "
 "configuration."
-msgstr ""
+msgstr "Edición exitosa, pero hubo un fallo al enviar el correo, revisa la configuración de email."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Estado"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Activo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
-msgstr ""
+msgstr "Inactivo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Restaurar contraseña"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Atrás a la lista de usuarios"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
-msgstr ""
+msgstr "Usado"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Fijar quota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
-msgstr "Especificar límite de almacenamiento de usuario"
+msgstr "Especificar límite de espacio"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
-msgstr "Consejo: 0 significa límite por defecto"
+msgstr "Tip: con 0 se mantiene el límite predeterminado"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
-msgstr "Propiedad de"
+msgstr "Propias"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
-msgstr ""
+msgstr "No tienes un wiki personal"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
-msgstr ""
+msgstr "wiki-personal"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
-msgstr ""
+msgstr "Paginas de Wiki Personales"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
-msgstr ""
+msgstr "error de permiso"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
-msgstr "Incapaz de ver la página de reciclaje"
+msgstr "Error al ver la papelera"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
-msgstr ""
+msgstr "La biblioteca no existe."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
-msgstr ""
+msgstr "Ni tienes permiso suficiente para realizar la acción."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
-msgstr ""
+msgstr "Fallo al editar la información de la biblioteca."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
-msgstr "Hubo un error al guardar las configuraciones en el servidor"
+msgstr "Fallo al guardar la configuración en el servidor"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
-msgstr "Configuraciones almacenadas"
+msgstr "Configuración guardada."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
-msgstr ""
+msgstr "Nombre de usuario %s invalido."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
-msgstr ""
+msgstr "Usuario %s no encontrado."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
-msgstr ""
+msgstr "La biblioteca %(repo_name)s se transfirió a %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Actualizado exitosamente la contraseña de la biblioteca %(repo_name)s."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "El nombre de archivo contiene caracteres inválidos"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Nombre de archivo duplicado"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "El tamaño del archivo sobrepasa el límite"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
-msgstr "El propietario no posee suficiente espacio para almacenamiento, no se pudo subir el archivo"
+msgstr "El espacio del propietario se agotó, no se pudo subir el archivo"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Ocurrió un error durante la transferencia del archivo"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "URL inválido"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
-msgstr "Incapaz de ver las modificaciones de la biblioteca"
+msgstr "Fallo al ver las modificaciones de la biblioteca"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
-msgstr "Incapaz de ver la instántanea de la biblioteca"
+msgstr "Fallo al ver instantáneas de biblioteca"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
-msgstr "No posee los permisos adecuados para restaurar la biblioteca"
+msgstr "No tienes permisos para restaurar la biblioteca"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
-msgstr "Por favor, especifique el ID de la historia"
+msgstr "Por favor, especifica el ID del historial"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "La biblioteca no existe"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
-msgstr ""
+msgstr "El historial especificado no existe"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "No hubo conflictos al unir."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
-msgstr ""
+msgstr "Mi Biblioteca"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
-msgstr ""
+msgstr "Fallo al dejar de compartir biblioteca, no existe."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
-msgstr ""
+msgstr "Se dejó de compartir \"%s\" con éxito."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
-msgstr ""
+msgstr "Fallo al dejar de compartir \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
-msgstr "No se pudo borrar el archivo"
+msgstr "Fallo al borrar el archivo."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
-msgstr "%s borrado satisfactoriamente"
+msgstr "%s borrado con éxito."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Error interno. No se pudo borrar: %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
-msgstr "Incapaz de acceder al archivo"
+msgstr "Imposible acceder al archivo"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
-msgstr "No se pudo bajar la biblioteca pues no se encontró el servidor"
+msgstr "Fallo al descargar biblioteca, servidor no encontrado"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
-msgstr "Configuración del servidor inválida."
+msgstr "Configuración de servidor inválida."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
-msgstr "Se restableció satisfactoriamnte %(path)s al            directorio raíz."
+msgstr "Restablecido con éxito %(path)s al  directorio raíz."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
-msgstr "Se restableció satisfactoriamente %(path)s"
+msgstr "%(path)s restablecido con éxito"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
-msgstr "Se restableció satisfactorimente %(path)s al  directorio raíz."
+msgstr "Restablecido con éxito %(path)s al directorio raíz."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
-msgstr ""
+msgstr "Imposible descargar carpeta \"%s\": tamaño excedido."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
-msgstr "Incapaz de descargar \"%s\""
+msgstr "Imposible descargar \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
-msgstr ""
+msgstr "\"Wiki Personal\" activado con éxito."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
-msgstr ""
+msgstr "\"Wiki Personal\" desactivado con éxito"
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
-msgstr ""
+msgstr "No tienes permiso para acceder a la biblioteca."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
-msgstr ""
+msgstr "No hay ruta."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
-msgstr ""
+msgstr "El grupo no existe"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
-msgstr ""
+msgstr "Persmiso denegado."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
-msgstr ""
+msgstr "Biblioteca encriptada."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
-msgstr ""
+msgstr "Error: no head commit id"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
-msgstr ""
+msgstr "Argumento faltante."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
-msgstr "La ruta de destino es muy extensa"
+msgstr "La ruta de destino es demasiado larga."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
-msgstr ""
+msgstr "%(name)s movido con éxito ver"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
-msgstr ""
+msgstr "%(name)s copiado con éxito ver"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
-msgstr ""
+msgstr "No se pudo mover la carpeta %(src)s a la subcarpeta %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
-msgstr ""
+msgstr "No se pudo copiar la carpeta %(src)s a la subcarpeta %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
-msgstr ""
+msgstr "La ruta de destino de %s es demasiado larga."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
-msgstr ""
+msgstr "Falllo al conseguir lista de bloques"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
-msgstr ""
+msgstr "repo id incorrecto"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "La bibilioteca del sistema no puede ser eliminada."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Error HTTP: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Error URL: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
-msgstr ""
+msgstr "La codificación elegida no es correcta."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codificación de archivo desconocida"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
-msgstr ""
+msgstr "El tamaño del archivo sobrepasa %s, no se puede abrir en línea."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
-msgstr "Incapaz de visualizar el archivo"
+msgstr "Imposible visualizar el archivo"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
-msgstr ""
+msgstr "Formato de archivo inválido."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "La biblioteca no existe."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "La biblioteca está encriptada."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
-msgstr "Incapaz de editar el archivo"
+msgstr "Imposible editar el archivo"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
-msgstr "El archivo no existe"
+msgstr "El archivo no existe."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
-msgstr "No se puede ofrecer la edición para este tipo de archivo en línea."
+msgstr "Este tipo de archivo no se puede editar en línea."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
-msgstr "No se pudo fijar la quota: error interno"
+msgstr "Fallo al definir cuota: error interno"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
-msgstr ""
+msgstr "Borrado con éxito %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
-msgstr ""
+msgstr "Fallo al borrar: no existe el usuario"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
-msgstr ""
+msgstr "%s asignado como administrador"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
-msgstr ""
+msgstr "Fallo al definir administrador: el usuario no existe"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
-msgstr ""
+msgstr "Los permisos de administrador de %s fueron revocados"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
-msgstr ""
+msgstr "Fallo al revocar admin: el usuario no existe"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
-msgstr ""
+msgstr "\"%s\" activado con éxito."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
-msgstr ""
+msgstr "Fallo al activar: el usuario no existe."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
-msgstr ""
+msgstr "\"%s\" desctivado con éxito."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
-msgstr ""
+msgstr "Fallo al desactivar: el usuario no existe"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Tu cuenta en %s está activada."
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "La contraseña ha sido reestablecida en %s"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
-msgstr ""
+msgstr "Contraseña restablecida con éxito a %(passwd)s, un correo fue enviado a %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
-msgstr ""
+msgstr "Contraseña restablecida a %(passwd)s, pero hubo un fallo al enviar el correo a %(user)s, revise su configuracion de email."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
-msgstr ""
+msgstr "Contraseña de %(user)s restablecida a %(passwd)s con éxito."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
 "notification can not be sent, because Email service is not properly "
 "configured."
-msgstr ""
+msgstr "Contraseña de %(user)s restablecida a %(passwd)s. Pero el correo de notificación no pudo ser enviado, porque el servicio de correo no está configurado correctamente."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
-msgstr "No se pudo cambiar la contraseña ya que el usuario no existe."
+msgstr "Fallo al restablecer la contraseña: el usuario no existe."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Información de registro de Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Estás invitado a unirte a %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
-msgstr "El usuario %s fue agregado satisfactoriamente. Una notificación de correo  ha sido enviada."
+msgstr "El usuario %s fue agregado con éxito. Se ha enviado un correo de aviso."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
-msgstr "El usuario %s fue agregado satisfactoriamente sin embargo hubo un error al  enviar la notificación; por favor, chequee la configuración del correo."
+msgstr "El usuario %s fue agregado con éxito. Pero hubo un error al  enviar la notificación; por favor, revisa la configuración del correo."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
-msgstr "El usuario %s fue agregado satisfactoriamente."
+msgstr "El usuario %s fue agregado con éxito."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
-msgstr "El usuario %s fue agregado satisfactoriamente sin embargo, la notificación de correo electrónico no pudo ser envíada ya que el servicio de correo no se encuentra configurado  adecuadamente"
+msgstr "El usuario %s fue agregado con éxito. Pero el correo de aviso no pudo ser enviado, el servicio de correo no esta configurado."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
-msgstr ""
+msgstr "Transferida con éxito."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
-msgstr ""
+msgstr "Fallo al transferir, usuario %s no encontrado"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
-msgstr ""
+msgstr "Fallo al transferir, argumentos inválidos."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "Falló establecer %s como admin"
diff --git a/locale/es_AR/LC_MESSAGES/django.po b/locale/es_AR/LC_MESSAGES/django.po
index ff9e3f9c65..1b4823f099 100644
--- a/locale/es_AR/LC_MESSAGES/django.po
+++ b/locale/es_AR/LC_MESSAGES/django.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-08 01:17+0000\n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-17 16:31+0000\n"
 "Last-Translator: rcoss \n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/seahub/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,175 +21,207 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Ya existe un usuario con este correo"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
-msgstr "Las contraseñas no concuerdan"
+msgstr "Las contraseñas no coinciden"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
-msgstr "Los nombres no pueden estar vacíos"
+msgstr "El nombre no puede estar vacío"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "El nombre es demasiado extenso (máximo 255 caracteres)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "La descripción no puede estar vacía"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
-msgstr "La descripión es demasiado extensa (máximo 100 carateres)"
+msgstr "La descripión es demasiado extensa (máximo 100 caracteres)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "El nombre %s no es válido"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
-msgstr "Argumento Faltante"
+msgstr "Argumento faltante"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Se requiere el nombre"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Es demasiado largo."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Se requiere."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "El nombre \"%s\" no es válido."
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "El id del repositorio es requerido"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "El nombre del usuario es requerido"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "La contraseña no puede estar vacía"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Formato de URL no válido"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Error interno del servidor"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Error en el desencriptado de la biblioteca"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Dirección de correo requerida"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "La cuota no puede estar vacía"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "La cuota es muy pequeña (el valor mínimo es 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "El nombre de la biblioteca es obligatorio."
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "La descripción de la biblioteca es obligatoria."
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Por favor, ingresa un número"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Ingrese la contraseña correcta"
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "Català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Español Argentina"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Español México"
 
-#: seahub/settings.py:137
-msgid "Français"
+#: seahub/settings.py:139
+msgid "français"
 msgstr "Français"
 
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
 
-#: seahub/settings.py:139
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Português, Brasil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -198,8 +230,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Organización de equipo de colaboraores"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Discusión"
 
@@ -211,16 +244,17 @@ msgstr "Discusión"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -230,13 +264,13 @@ msgstr "Archivo"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -245,9 +279,9 @@ msgstr "Icono de la carpeta"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s respuestas"
@@ -258,43 +292,48 @@ msgstr "No hay discusiones."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Cargando..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Fallo. Por favor, verifica la red."
 
@@ -343,6 +382,25 @@ msgstr "Por favor verifique la red."
 msgid "New Replies"
 msgstr "Nuevas Respuestas"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Mensajes"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Mensajes con %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "No hay mensajes"
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Información personal"
@@ -356,10 +414,11 @@ msgid "Important dates"
 msgstr "Fechas importantes"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Grupos"
 
@@ -372,72 +431,74 @@ msgstr "Contraseña cambiada con éxito."
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Contraseña "
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Por favor, ingresa un nombre de usuario y contraseña correctas. Notar que ambos datos son sensibles a mayúsculas y minúsculas."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Esta cuenta está inactiva."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Tu navegador no tiene habilitados las cookies. Las cookies son requeridas para autenticarse en el sitio."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "No se pudo enviar el correo, el servicio no está configurado adecuadamente, por favor, contacta al administrador."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Esa dirección de correo no está asociada a ninguna cuenta de usuario. ¿Está seguro de que está registrado en el sistema?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Contraseña reestablecida en %s"
+msgid "Reset Password on %s"
+msgstr "Reestablecer contraseña en %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Confirmación de nueva contraseña"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Contraseña anterior"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "La contraseña anterior ingresada es incorrecta. Por favor, ingrésela nuevamente."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
@@ -475,7 +536,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Actualmente tienes %(nb_avatars)d avatares, y el máximo permitido es%(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar de %s"
@@ -543,57 +604,62 @@ msgstr "Avatar actual:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Enviar"
@@ -610,7 +676,7 @@ msgstr "%(avatar_creator)s actualizó su avatar %(avatar)s."
 msgstr "Has actualizado tu avatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Avatar predeterminado"
 
@@ -642,7 +708,7 @@ msgstr "teléfono"
 msgid "note"
 msgstr "nota"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Los archivos de esta biblioteca no se pueden ver en línea."
 
@@ -699,7 +765,7 @@ msgstr "Archivo \"%(file)s\" revertido a las %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Carpeta borrada recuperada"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Descripción o nombre de la biblioteca modificados."
 
@@ -709,9 +775,9 @@ msgstr "Auto fusionar por sistema seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Ahora"
 
@@ -747,42 +813,48 @@ msgstr[1] "Hace %(seconds)d segundos"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Lectura / Escritura"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Sólo lectura"
 
@@ -791,33 +863,33 @@ msgstr "Sólo lectura"
 msgid "Email is required."
 msgstr "Se requiere correo."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s no es un correo válido."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s ya está en sus contactos."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Se agregó con éxito %s a los contactos."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Fallo al agregar %s a los contactos."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Editado con éxito %s"
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Borrado con éxito %s"
@@ -842,10 +914,10 @@ msgstr "E-Mail"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -853,45 +925,46 @@ msgstr "E-Mail"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nombre"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Nota"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -900,56 +973,64 @@ msgstr "Nota"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Operaciones"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Editar"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Borrar"
 
@@ -965,17 +1046,19 @@ msgstr "Agrega contactos para compartir bibliotecas y enviar enlaces de descarga
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Email"
 
@@ -1000,8 +1083,8 @@ msgid "Delete Contact"
 msgstr "Borrar Contacto"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1077,400 +1160,415 @@ msgstr "El mensaje de verificación es muy largo (máximo 255 caracteres)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" no es un nombre válido"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
-msgstr "Solo puede crear %d grupos.Actualizar cuenta."
+msgstr "Sólo puede crear %d grupos.Actualizar cuenta."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Grupo renombrado con éxito a \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Fallo al renombrar el grupo, el nombre del grupo sólo puede contener letras, números y guión bajo"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Email %s es inválido."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Sólo los administradores pueden hacer público el grupo"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "El mensaje no existe"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "No tienes los permisos adecuados"
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Sólo puedes invitar %d miembros. Actualizar cuenta."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Te han agregado a un grupo en Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Has sido invitado a unirte a un grupo en %s"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Fallo al agregar a %s, no está registrado."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Agregado con éxito. Se envió un correo"
 msgstr[1] "Agregado con éxito. Se enviaron %(count)s correos."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Agregado con éxito."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Fallo al agregar, %s no es un correo válido."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Fallo al agregar, %s no está registrado."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Operación exitosa."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Fallo: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Fallo al dejar de compartir: el grupo no existe."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Operación fallida: sólo administradores y el propietario de una biblioteca pueden dejar de compartirla."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Fallo al dejar de compartir: error interno."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Error: id de grupo erróneo"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Error: el grupo no existe."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Posteado con éxito en %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Error: no estás en el grupo %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Error: la biblioteca no existe."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Error: sin ruta"
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "No se pudo crear: el grupo no existe."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "No se pudo crear: no estás en el grupo."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "No se pudo crear"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "No se pudo crear: error interno."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Ya estás en el grupo."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Petición enviada con éxito al administrador."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr "Se requiere discusión"
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"Wiki\" activado con éxito"
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"Wiki\" desactivado con éxito"
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Fallo al crear la página wiki. Intenta más tarde."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "No existe la wiki"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Fallo al crear página de inicio. Intenta más tarde."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Fallo al establecer biblioteca de wiki."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki no encontrado"
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "La página \"%s\" ya existe."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s te invitó a unirse al grupo %(group.group_name)s. Por favor dirígete a la siguiente página para inscribirte."
+msgid "Successfully deleted \"%s\"."
+msgstr "Borrado con éxito \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Gracias por usar nuestro sitio!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "El equipo de %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Fallo al eliminar \"%s\".  Intenta más tarde."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Hola,"
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr "%(email)s te ha invitado a unirte al grupo %(grp_name)s en %(site_name)s: "
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Ocultar respuestas"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Responder"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Agregar respuesta..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "No puede estar en blanco ni ser mayor a 2048 caracteres."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Este grupo es público."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Habilitar Módulos"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Salir"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Este grupo es público."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Archivos"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Miembros"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
-msgstr "Administrador"
-
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Salir del grupo"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "¿Estás seguro que deseas abandonar el grupo?"
+msgstr "Administrar"
 
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Agregar discusión..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Agregar archivos"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr "Elije uno o mas archivos:"
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Despues de iniciar sesión, puedes agregar discusiones y respuestas."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Anterior"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Próximo"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Arriba"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "¿Seguro que deseas eliminar esta discusión?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Sí"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "No"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Eliminado con éxito"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Fallo al eliminar:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Falló."
 
@@ -1479,6 +1577,7 @@ msgid "Recent Changes"
 msgstr "Cambios recientes"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1487,77 +1586,58 @@ msgstr "Nueva biblioteca"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Descripción"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Última actualización"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Compartida por"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "icono de carpeta"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Descargar y Sincronizar"
 
@@ -1573,7 +1653,7 @@ msgstr "Descargar y Sincronizar"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
@@ -1610,15 +1690,16 @@ msgid "Modified at"
 msgstr "Modificado el"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Modificó"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1627,23 +1708,23 @@ msgid "Details"
 msgstr "Detalles"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Ninguna"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1662,15 +1743,43 @@ msgstr "Contraseña:"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "La contraseña será almacenada en el servidor por 1 hora."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Dejar de compartir biblioteca"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "¿Seguro que quieres dejar de compartir %s?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "icono de carpeta"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "No hay bibliotecas públicas en este grupo"
@@ -1687,14 +1796,25 @@ msgid ""
 "message: "
 msgstr "%(user)s desea unirse al Grupo \"%(group_name)s\", mensaje de verificación: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Gracias por usar nuestro sitio!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "El equipo de %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Administradores"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Configuración"
 
@@ -1702,7 +1822,7 @@ msgstr "Configuración"
 msgid "Add Members"
 msgstr "Agregar miembros"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Agregar Administradores"
 
@@ -1711,7 +1831,7 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Cambiar"
 
@@ -1730,7 +1850,7 @@ msgid "Make Public"
 msgstr "Hacer Público"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Transferir"
 
@@ -1754,29 +1874,41 @@ msgstr "Tip: el correo ya debe estar registrado."
 msgid "Rename Group To"
 msgstr "Renombrar Grupo a"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Descartar Gupo"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "¿Seguro que deseas descartar este grupo?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Borrar miembro"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "¿Seguro que deseas borrar %s?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Salir"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Agregar a los contactos"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Salir del grupo"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "¿Estás seguro que deseas abandonar el grupo?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Unirse al grupo"
@@ -1803,12 +1935,29 @@ msgstr "Miembros:"
 msgid "Verification Message"
 msgstr "Mensaje de verificación"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Índice del wiki"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Actualmente no hay índice"
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Crear"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Este grupo no tiene wiki actualmente"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1816,82 +1965,105 @@ msgid ""
 "back to the server."
 msgstr "El Wiki permite organizar el conocimiento de una manera sencilla. Los contenidos del wiki se almacenan en una biblioteca normal con una estructura de archivo/carpeta predefinida. Ésto permite editar el wiki desde el escritorio y luego sincronizar con el servidor."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Crear Wiki ahora"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Elegir una biblioteca como wiki"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Crear Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Páginas Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Elije una biblioteca como wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Haz click y elije una biblioteca."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Inicio"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Páginas"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Historial del Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Página Nueva"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Borrar Página"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Editar Página"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Historial de página"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Última modificación %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "¿Seguro que deseas borrar esta página?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Se requiere nombre."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Se requiere descripción."
 
@@ -1938,10 +2110,12 @@ msgstr "Agregar miembros"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Aceptar"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "correos electrónicos separados por ','"
 
@@ -1957,7 +2131,8 @@ msgstr "Tip: los correos deben estar registrados"
 msgid "Add administrators"
 msgstr "Agregar administradores"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Ingresa o selecciona los correos."
 
@@ -2020,7 +2195,7 @@ msgid ""
 "\n"
 "    Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep your version unchanged, while save your friends' versions as \"conflict files\". A conflict file's name ends with its author's email address, plus the current time, e.g. test.txt (name@example.com 2013-10-01-00-12-24).\n"
 "\t"
-msgstr "\n  Cuando varias personas editan el mismo archivo al mismo tiempo, los cambios pueden provocar conflictos entre sí. En este caso, Seafile mantiene tu versión sin cambios, mientras que las versiones ajenas son almacenadas como \"archivos de conflicto\". El nombre del archivo de conflicto tiene al final el email del autor mas la hora actual. Ej. prueba.txt (name@example.com 2013-10-01-00-12-24).\n\t"
+msgstr "\n  Cuando varias personas editan el mismo archivo simultáneamente, los cambios pueden provocar conflictos entre sí. En este caso, Seafile mantiene tu versión sin cambios, mientras que las versiones ajenas son almacenadas como \"archivos de conflicto\". El nombre del archivo de conflicto tiene al final el email del autor mas la hora actual. Ej. prueba.txt (name@example.com 2013-10-01-00-12-24).\n\t"
 
 #: seahub/help/templates/help/help_delete.html:7
 msgid "Deleting a file library"
@@ -2080,7 +2255,7 @@ msgstr "Una línea en blanco, equivale a ningún archivo."
 
 #: seahub/help/templates/help/help_ignore.html:14
 msgid "A line starting with # serves as a comment."
-msgstr "Una linea que comienza con # sirve como comentario."
+msgstr "Una línea que comienza con # sirve como comentario."
 
 #: seahub/help/templates/help/help_ignore.html:15
 msgid ""
@@ -2215,7 +2390,7 @@ msgstr "Para descargar y sincronizar una biblioteca encriptada a la computadora,
 
 #: seahub/help/templates/help/help_security.html:13
 msgid "The password can only be set when you create the library."
-msgstr "La contraseña solo se puede definir cuando se crea la biblioteca."
+msgstr "La contraseña sólo se puede definir cuando se crea la biblioteca."
 
 #: seahub/help/templates/help/help_security.html:13
 msgid "It cannot be changed since then."
@@ -2236,135 +2411,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Los servidores Seafile no almacenan la contraseña para un biblioteca encriptada. Para ver una biblioteca compartida en línea necesita ingresar la contraseña de la biblioteca. Esta contraseña se almacena en la memoria encriptada del servidor, de donde se borrará al cabo de una hora. Luego, para ver la biblioteca, debe ingresar la contraseña nuevamente."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "se requiere mensaje"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "se requiere contacto"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "No puedes enviarte un mensaje a ti mismo."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Fallo el enviar mensaje a %s, usuario no encontrado."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Mensajes"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nuevo Mensaje"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Mensaje"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Fecha"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "mensaje..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Agregar archivos"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "enviar a: click para seleccionar contactos"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "agrega contactos primero"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Fallo en la búsqueda de contactos para el mensaje."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Actualmente no tienes niguna biblioteca"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Mensajes con %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Enviar un mensaje..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Un archivo nombrado %(file_name)s se ha guardado en la carpeta %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s ha compartido la biblioteca %(repo_name)s contigo."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s ha compartido el archivo %(file_name)s contigo."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr "Has recibido un nuevo mensaje de %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Error interno"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s tiene una nueva discusión"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s agregó una nueva discusión en %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "La discusión grupal tiene una nueva respuesta"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s respondió en la discusión grupal "
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s solicitó unirse
 msgid "Successfully cleared all notices."
 msgstr "Todos los avisos eliminados."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Agregar nueva notificación"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr "Hola %(name)s,"
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] "\nTienes una nueva notificación en %(site_name)s.\n"
+msgstr[1] "\nTienes %(num)s nuevas notificaciones en %(site_name)s.\n"
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr "Verificar en la siguiente página:"
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Todas las notificaciones"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Agregar nueva notificación"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Detalles de notificaciones"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(notificación actual)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Establecer actual"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Vacío"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Borrar notificación"
 
@@ -2427,27 +2606,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Selecciona como deseas ver las bibliotecas encriptadas en línea:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Enviar contraseñas al servidor."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Los archivos se desencriptarán en el servidor antes de enviártelos."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Guardar contraseñas en el navegador."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Los archivos serán desencriptados en tu navegador cuando se descarguen."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2479,81 +2658,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "\"%s\" definida con éxito como biblioteca predeterminada."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Configuración del perfil"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Perfil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Idioma"
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Bibliotecas Encriptadas"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Sub-Biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Biblioteca predeterminada."
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Eliminar Cuenta"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Avatar:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Actualizar"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Nombre:"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Mi información:"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Departamento:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Teléfono:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Configuración de idioma"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Configuracion de Bibliotecas Encriptadas"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Como ver bibliotecas encriptadas en línea."
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Configuración de Sub-biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Activar sub-biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2562,7 +2748,7 @@ msgid ""
 "library."
 msgstr "Esta función permite sincronizar selectivamente una carpeta dentro de una biblioteca. Una sub-biblioteca puede ser creada a partir de cualquier carpeta. Después de ser creada, se listará en el cliente de escritorio y puede descargarse como una biblioteca normal. Se mantendrá sincronizada automáticamente con su biblioteca original."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2570,37 +2756,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Las sub-bibliotecas también se usan cuando se comparte una carpeta con un usuario o un grupo. Sin esta opción habilitada, se crea automáticamente una sub-biblioteca oculta. Con la opción habilitada, estas sub-bibliotecas también se listarán, lo que permite administrarlas."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Configuración predeterminada de biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Tu biblioteca predeterminada:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "La biblioteca predeterminada es el lugar donde se almacenarán tus documentos e imágenes."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Elegir Biblioteca Predeterminada"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Esta operación no se puede revertir. ¿Estás seguro?"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Elegir biblioteca predeterminada:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Haz click y elije una biblioteca."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "¿Seguro que deseas eliminar tu cuenta?"
 
@@ -2613,25 +2795,25 @@ msgid "Info"
 msgstr "Info"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Nombre"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Auto-descripción"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Departamento"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Teléfono"
 
@@ -2639,169 +2821,171 @@ msgstr "Teléfono"
 msgid "Email is not longer than 512 characters"
 msgstr "La dirección de correo no debe superar los 512 caracteres"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Fallo al compartir con los miembros, intenta más tarde."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Compartido con éxito con todos los miembros, verifica en Compartidos"
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" ya se encuentra en el grupo %(group)s. Ver"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Fallo al compartir %(repo)s con %(group)s, intenta más tarde."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Compartido con éxito con %(group)s, verifica en Compartidos"
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "No puedes compartir bibliotecas contigo mismo."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Fallo al compartir con %s, intenta más tarde."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Compartido con éxito con %(email)s, verifica en Compartidos"
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "No se pudo compartir %s, el correo no está registrado."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Sólo el propietario de la biblioteca puede compartirla."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Fallo al compartir \"%s\", cuota insuficiente. Actualizar cuenta"
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Argumento inválido"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Fallo al remover compartido"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "id de grupo inválido"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Compartido removido con éxito"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "todos los miembros"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "No puedes compartir la biblioteca usando ese método."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Fallo al obtener el enlace, intenta más tarde."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Removido con éxito"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "El enlace no existe"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Fallo al enviar el enlace compartido. El servicio de correo electrónico no está adecuadamente configurado, por favor, contacta al administrador"
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Un contacto compartió un archivo en Seafile contigo."
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr "Un  archivo ha sido compartido contigo en %s"
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Error interno del servidor: no se pudo enviar"
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Enviado con éxito."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Elije una carpeta."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Guardado con éxito."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Fallo al compartir con \"%s\", usuario no encontrado."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Compartido con éxito %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Se dejó de compartir \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "No tienes permiso para dejar de compartir %s."
+msgid "You don't have permission to unshare %s."
+msgstr "No tienes permiso para dejar de compartir %s"
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "No tienes permiso suficiente para guardar %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Fallo al obtener el enlace, intenta más tarde."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "El envío del enlace de subida falló. El servicio de Email no está configurado adecuadamente, contacta al administrador."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Un contacto compartió un enlace de subida en Seafile contigo"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr "Un enlace de subida ha sido compartido contigo en %s"
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2822,14 +3006,15 @@ msgstr "Visitas"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Ver"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Remover"
 
@@ -2858,7 +3043,7 @@ msgid "Folders - Share"
 msgstr "Carpetas - Compartir"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -2883,13 +3068,13 @@ msgid ""
 msgstr "Puedes compartir solamente una carpeta con un usuario registrado si no quieres compartir toda la biblioteca."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Editado con éxito"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Fallo al editar."
@@ -2956,7 +3141,7 @@ msgstr "Compartidos"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Información básica"
 
@@ -2969,7 +3154,8 @@ msgid "Add to contacts"
 msgstr "Agregar a los contactos"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Dejar de compartir"
 
@@ -2990,56 +3176,24 @@ msgstr "Actividades"
 msgid "Exit System Admin"
 msgstr "Salir de Administrador"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Usuarios"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Enlaces"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Administración del Sistema"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "notas sin leer"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Ingresar"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Registrarse"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Desconectarse"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Versión del servidor:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Administración del Sistema"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Contáctenos"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Todos los grupos"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Clientes"
 
@@ -3047,7 +3201,7 @@ msgstr "Clientes"
 msgid "Client Name"
 msgstr "Nombre del Cliente"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3088,28 +3242,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Esta biblioteca está encriptada. Ingresa la contraseña para verla en línea. La contraseña se almacenará en el servidor durante 1 hora."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Puedes cambiar la forma de ver las bibliotecas compartidas en línea aquí."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Por favor ingresa la contraseña."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Plataforma"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Nombre de dispositivo"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Último acceso"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Bibliotecas"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Operación"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Desvincular"
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "¿Realmente deseas desvincular %s?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "Dejará de sincronizarse inmediatamente."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "No tienes dispositivos conectados"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "Tus clientes (Desktop/Android/iOS) serán listados aquí."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Desvinculado exitosamente."
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3119,8 +3325,7 @@ msgstr "Descargar"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Ruta actual:"
 
@@ -3435,9 +3640,9 @@ msgid "Password is required."
 msgstr "Contraseña requerida"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Historial"
@@ -3456,16 +3661,11 @@ msgstr "Consejo: una nueva versión será generada después de cada modificació
 msgid "Current Path:"
 msgstr "Ruta actual:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Última modificación"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Tamaño"
 
@@ -3473,38 +3673,55 @@ msgstr "Tamaño"
 msgid "(current version)"
 msgstr "(versión actual)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Renombrados o movidos desde %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Restaurar"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Diff"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Documentos"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introducción"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Ayuda"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Cliente"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile para Windows, Mac y Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Versión del servidor:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Contáctenos"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3533,12 +3750,13 @@ msgstr " papelera"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Regresar a la biblioteca"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3553,36 +3771,57 @@ msgstr "Personal"
 msgid "Starred"
 msgstr "Marcado"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Wiki Personal"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Admin de Compartidos"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Enlaces"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupo"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "No hay bibliotecas compartidas con tus grupos"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "No hay bibliotecas compartidas contigo"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Bienvenido a Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile organiza los archivos en bibliotecas. Cada biblioteca se puede sincronizar y compartir por separado. Se ha creado una biblioteca personal. Puedes crear más después."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Cerrar"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Inicio"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organización"
@@ -3593,11 +3832,11 @@ msgid ""
 "current account."
 msgstr "La funcion de \"Organizacion\" será removida en la siguiente version, los datos se fusionarán con la cuenta actual."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3619,420 +3858,452 @@ msgstr "Aún no se ha creado ningún grupo "
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Puedes hacer click en el botón \"Agregar Grupo\" en \"Grupo\" para crear un grupo"
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Compartir desde"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "No hay bibliotecas públicas"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Puedes crear una biblioteca pública dando click en el enlace \"Nueva biblioteca\" . A partir de ese momento, otros usuarios podrán ver y descargarla"
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Papelera"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Buscar miembros..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Tamaño:"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Papelera"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Mover"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copiar"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Subir archivos"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "El dueño de esta biblioteca se quedó sin espacio."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Seleciona un archivo primero."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Agregar Archivos"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Iniciar Todo"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Cancelar Todo"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "La función de Arrastrar y Soltar sólo está disponible en Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "El tamaño del archivo debe ser menor a %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Actualizar %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Elegir un archivo"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Más pequeños que %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nueva carpeta"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nombre de la carpeta"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nuevo archivo"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "tipo de archivo destacado"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Click para seleccionar"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Formato de Texto Enriquecido"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "Formateo sencillo."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nombre de Archivo"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Biblioteca actual"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Otras bibliotecas"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Por favor, selecciona una carpeta con un click."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Renombrar %(name)s como:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Sincronizar %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Una sub-biblioteca será creada a partir de esta carpeta. Se listará en el cliente de escritorio, puedes descargarla como una biblioteca normal."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Crear"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Esta biblioteca está encriptada. Ingresa la contraseña para consultarla en línea. La contraseña se guardará durante 1 hora en el navegador."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Archivo demasiado grande"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Archivo demasiado pequeño"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Tipo de archivo no permitido"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Número máximo de archivos excedido"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Bytes actuales exceden el tamaño máximo"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Resultado de subida incompleto"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Error"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Inicio"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Eliminar elementos"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "¿Seguro que deseas eliminar los elementos selecionados?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Procesando…"
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos borrados con éxito."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "%(name)s eliminado con éxito."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al borrar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Error interno. Fallo al borrar %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Mover carpetas/archivos selecionados a:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Copiar carpetas/archivos selecionados a:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Ruta de destino inválida"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos movidos con éxito."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s movido con éxito."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos copiados con éxito."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s copiados con éxito."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al mover %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Error interno. Fallo al mover %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al copiar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Error interno. Fallo al copiar %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Moviendo..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Copiando..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "Movido con éxito %(s_num)s items."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "Fallo al mover %(f_num)s items."
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "Copiado con éxito %(s_num)s items."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Falló"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Encriptando archivo..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Error al encriptar."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Encriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Subiendo archivo..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Terminado!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Descargando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Desencriptando..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Desencriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Eliminados con éxito %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Renombrar Archivo"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Renombrar Carpeta"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Copiar Archivo"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Mover Archivo"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Copiar Carpeta"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Mover Carpeta"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Copiar %(name)s a:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Mover %(name)s a:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "La descarga de la carpeta no está permitida en esta biblioteca."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "desmarcado"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "marcado"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Sub-biblioteca creada."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Es requerido."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Define un nombre, no solamente la extensión."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Creando..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "No se ha renombrado."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s renombrados a %(new_name)s con éxito"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Cancelado."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Selecciona al menos un contacto."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Ingresa o selecciona correos/grupos."
 
@@ -4054,11 +4325,12 @@ msgstr "Consejo: Una instantánea será generada después de cada modificación,
 msgid "View Snapshot"
 msgstr "Ver instántanea"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Por página:"
@@ -4099,34 +4371,78 @@ msgstr "todos"
 msgid "Delete Time"
 msgstr "Borrar fecha"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Configuración de la biblioteca"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Mantener historial completo"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "No mantener historial"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Sólo mantener el historial por:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "días"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Transferir Propiedad"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Tranferir esta biblioteca a otro usuario:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Cambiar la contraseña de esta biblioteca:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Contraseña anterior"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Nueva contraseña (al menos 6 caracteres)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Nueva contraseña otra vez"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Ingrese la contraseña anterior"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Ingrese la nueva contraseña"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "La nueva contraseña es demasiado corta"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "La nueva contraseña es demasiado larga (el máximo es 35 caracteres)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Ingrese la nueva contraseña otra vez"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Las contraseñas no coinciden"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Regresar al historial de modificaciones"
@@ -4135,6 +4451,10 @@ msgstr "Regresar al historial de modificaciones"
 msgid "Create Time"
 msgstr "Fecha de creación"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Última modificación"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4177,8 +4497,14 @@ msgstr "Tu cliente Seafile está desactualizado, por favor, actualízalo con la
 msgid "Click to download."
 msgstr "Click para descargar."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Ingresa la contraseña si deseas visitar el archivo/carpeta compartido. Ésta será guardada en el servidor por una hora solamente."
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Compartido por:"
 
@@ -4190,25 +4516,26 @@ msgstr "Guardar en..."
 msgid "Save To:"
 msgstr "Guardar en:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Hola,"
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Has recibido este e-mail porque %(email)s compartió un archivo contigo en %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s ha compartido un archivo contigo en %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Por favor, visita la siguiente página para ver el archivo:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Has recibido este e-mail porque %(email)s compartió un enlace de subida contigo en %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s ha compartido un enlace de subida contigo en %(site_name)s:"
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Puedes ir a la siguiente página para subir los archivos:"
 
@@ -4220,8 +4547,8 @@ msgstr "Marcado"
 msgid "icon"
 msgstr "icono"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Desmarcar"
 
@@ -4276,49 +4603,49 @@ msgstr "para"
 msgid "Sorry, this user is not registered yet."
 msgstr "Este usuario no está registrado aún."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Marcar"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "actualizó este archivo"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "Único contribuyente"
 msgstr[1] " %(counter)s colaboradores"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Desmarcado con éxito"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Marcado con éxito"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "también puedes presionar ←"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "previo"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "también puedes presionar → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "siguiente"
 
@@ -4337,7 +4664,7 @@ msgid "auto detect"
 msgstr "auto detectar"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "cargando..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Puedes usar IE 10, firefox o chrome para visualizar el archivo en línea."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Para ver este documento en línea puedes usar firefox, chrome o IE9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Este tipo de archivo no se puede ver en línea."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4384,41 +4711,55 @@ msgstr "Subir archivos a %(dir_name)s"
 msgid "shared by:"
 msgstr "compartido por:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Ingresar"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(recuperar contraseña)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "No legible? Refrescar."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Correo electrónico o contraseña incorrecta"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Recordarme por %(remember_days)s días"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Registrarse"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Fallo al refrescar el CAPTCHA. Intenta más tarde."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "El correo no puede estar en blanco"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "La contraseña no puede estar en blanco"
 
@@ -4472,13 +4813,13 @@ msgstr "Contraseña restablecida con éxito."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Reestablecer Contraseña"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Ingrese nueva contraseña"
+msgid "Reset Password"
+msgstr "Reestablecer contraseña"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4489,23 +4830,19 @@ msgid "Password Reset Successfully"
 msgstr "Contraseña restaurada con éxito"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Hemos envíado a tu cuenta de correo las instrucciones para restaurar contraseña."
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Hemos enviado un email de reestablecer contraseña a tu casilla."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Estás recibiendo este correo porque solicitaste restaurar la contraseña para tu cuenta de usuario en el sitio %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "Para reestablecer la contraseña de tu cuenta %(account)s en %(site_name)s, dale click en el siguiente enlace:"
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Visita la siguiente página para asignar una nueva contraseña:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Tu nombre de usuario, en caso de que lo hayas olvidado:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Si no lo has solicitado, ignóralo."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4535,25 +4872,33 @@ msgstr "Registro completo, espera a que el administrador active tu cuenta."
 msgid "Register"
 msgstr "Registrar"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Bienvenido otra vez, sesión iniciada."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Confirmar contraseña"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "Registrarse"
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Ingresa la contraseña nuevamente"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
-msgstr "Las contraseñas no concuerdan"
+msgstr "Las contraseñas no coinciden"
 
 #: seahub/templates/snippets/avatar_upload_js.html:40
 msgid " is not supported. Please choose an image file."
@@ -4571,12 +4916,6 @@ msgstr "es demasiado extenso. Tamaño máximo permitido es 1 MB."
 msgid "Discuss"
 msgstr "Comentar"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Grupo"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Selecciona al menos 1 grupo."
@@ -4585,10 +4924,6 @@ msgstr "Selecciona al menos 1 grupo."
 msgid "Please input a discussion."
 msgstr "Ingresa un tópico"
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Generado por el sistema"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4607,42 +4942,66 @@ msgstr "Link de subida"
 msgid "Private Share"
 msgstr "Compartido Privado"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Utilizar contraseña"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(al menos 6 caracteres)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Repetir contraseña"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Establecer vencimiento"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Días"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Generar"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Enlace:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Enviar"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Enviar a:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Correos separados por ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Enviando…"
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Puedes compartir el enlace generado con otros para que puedan subir archivos a esta carpeta."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Link de Subida:"
 
@@ -4695,7 +5054,7 @@ msgid "Sub-libraries"
 msgstr "Sub-bibliotecas"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Compartidas"
 
@@ -4726,29 +5085,23 @@ msgid ""
 " library."
 msgstr "Puedes crear una sub-biblioteca a partir de una carpeta de una biblioteca existente. Una sub-biblioteca puede ser sincronizada y compartida independientemente. Los archivos de la sub-bibilioteca se mantendrán sincronizados automáticamente con el directorio de origen de la biblioteca."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "No hay bibliotecas compartidas contigo"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "No hay bibliotecas compartidas con tus grupos"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "El archivo se está procesando, espera..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "ocultar esquema"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "mostrar esquema"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Falló la conversión del documento "
 
@@ -4765,27 +5118,29 @@ msgstr "Encriptar"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(al menos %(repo_password_min_length)s caracteres)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Repetir contraseña"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Nombre requerido"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Descripción requerida"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Ingresa una contraseña"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Contraseña demasiado corta"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Contraseña demasiado larga (máximo 35 caracteres)"
 
@@ -4798,7 +5153,7 @@ msgstr "Borrado con éxito."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "¿Seguro que deseas borrar %(lib_name)s?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Subir archivo"
 
@@ -4925,15 +5280,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Selecciona al menos un tipo de archivo o ingresa al menos una extensión de archivo"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Selecciona contactos"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Ingresa al menos un correo."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Ingresa cantidad de días"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Ingresa cantidad válida de días"
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4946,7 +5309,7 @@ msgstr "Propio"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Compartiendo"
 
@@ -4958,6 +5321,22 @@ msgstr "Tráfico de este mes:"
 msgid "Payment"
 msgstr "Pago"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Usuarios"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Tráfico"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Registros"
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Transferir Biblioteca"
@@ -4968,74 +5347,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Transferir %(lib_name)s a:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Propietario"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Todos los grupos"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Creador"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Creado el"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Borrar grupo"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Buscar usuarios..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Base de datos"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Buscar"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Creado / Último incio"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Espacio utilizado"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Buscar bibliotecas por nombre..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Todas"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Huérfanas"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Sistema"
 
@@ -5051,96 +5430,117 @@ msgstr "Prefijo URL"
 msgid "Delete Organization"
 msgstr "Borrar organización"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Enlaces Públicos"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Cuenta"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Buscar Biblioteca"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Tip: puedes buscar por nombre, propietario o ambas."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Resultado"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "No hay resultados"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Agregar nuevo usuario"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Tráfico del usuario"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Mes:"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Usuario"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Uso total"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr "Agregar usuario"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr "Agregar admin"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Agregar admins"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr "Consejo: los emails deberían ser los usuarios ya agregados"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Activando..., por favor espera"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Las contraseñas no concuerdan"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "Tu cuanta %(username)s en %(site_name)s ha sido activada."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Estás recibiendo este mensaje porque %(user)s te agregó a su organización: \"%(org.org_name)s\" en el sitio: %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s te ha invitado a unirte a la organización  \"%(org_name)s\" en %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Estás recibiendo este mensaje porque %(user)s te agregó a %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s te ha invitado a unirte a %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "A continuación están los detalles de tu cuenta:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr "Esta es la información de tu cuenta:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Correo electrónico: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Contraseña:  %(password)s"
+msgid "Password: %(password)s"
+msgstr "Contraseña: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Visita a la siguiente página para iniciar sesión:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Estás recibiendo este mensaje porque un miembro del equipo de administración restauró tu contraseña para el sitio %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "Tu contraseña en %(site_name)s ha sido reestablecida. Ahora es %(password)s. Modifícala lo antes posible."
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "La nueva contraseña es  %(password)s, por favor, modifícala tan pronto como sea posible."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Buscar Usuario"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Tip: Utiliza * como carácter comodín."
 
@@ -5154,7 +5554,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "¿Estás seguro que deseas restablecer la contraseña de %s?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Revocar Privilegios"
 
@@ -5164,7 +5564,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "¿Seguro que deseas revocar los privilegios de administración de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Establecer Administrador"
 
@@ -5183,437 +5582,466 @@ msgid ""
 "configuration."
 msgstr "Edición exitosa, pero hubo un fallo al enviar el correo, revisa la configuración de email."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Estado"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Activo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Restaurar contraseña"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Atrás a la lista de usuarios"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Usado"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Fijar quota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Especificar límite de espacio"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Tip: con 0 se mantiene el límite predeterminado"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Propias"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "No tienes un wiki personal"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "wiki-personal"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Paginas de Wiki Personales"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "error de permiso"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Error al ver la papelera"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "La biblioteca no existe."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Ni tienes permiso suficiente para realizar la acción."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Fallo al editar la información de la biblioteca."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Fallo al guardar la configuración en el servidor"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Configuración guardada."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Nombre de usuario %s invalido."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Usuario %s no encontrado."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "La biblioteca %(repo_name)s se transfirió a %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Actualizado exitosamente la contraseña de la biblioteca %(repo_name)s."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "El nombre de archivo contiene caracteres inválidos"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Nombre de archivo duplicado"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "El tamaño del archivo sobrepasa el límite"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "El espacio del propietario se agotó, no se pudo subir el archivo"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Ocurrió un error durante la transferencia del archivo"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "URL inválido"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Fallo al ver las modificaciones de la biblioteca"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Fallo al ver instantáneas de biblioteca"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "No tienes permisos para restaurar la biblioteca"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Por favor, especifica el ID del historial"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "La biblioteca no existe"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "El historial especificado no existe"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "No hubo conflictos al unir."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Mi Biblioteca"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Fallo al dejar de compartir biblioteca, no existe."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Se dejó de compartir \"%s\" con éxito."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Fallo al dejar de compartir \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Fallo al borrar el archivo."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s borrado con éxito."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Error interno. No se pudo borrar: %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Imposible acceder al archivo"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Fallo al descargar biblioteca, servidor no encontrado"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Configuración de servidor inválida."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Restablecido con éxito %(path)s al  directorio raíz."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "%(path)s restablecido con éxito"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Restablecido con éxito %(path)s al directorio raíz."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Imposible descargar carpeta \"%s\": tamaño excedido."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Imposible descargar \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "\"Wiki Personal\" activado con éxito."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "\"Wiki Personal\" desactivado con éxito"
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "No tienes permiso para acceder a la biblioteca."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "No hay ruta."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "El grupo no existe"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Persmiso denegado."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Biblioteca encriptada."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Error: no head commit id"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Argumento faltante."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "La ruta de destino es demasiado larga."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "%(name)s movido con éxito ver"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "%(name)s copiado con éxito ver"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "No se pudo mover la carpeta %(src)s a la subcarpeta %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "No se pudo copiar la carpeta %(src)s a la subcarpeta %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "La ruta de destino de %s es demasiado larga."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Falllo al conseguir lista de bloques"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "repo id incorrecto"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "La bibilioteca del sistema no puede ser eliminada."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Error HTTP: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Error URL: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "La codificación elegida no es correcta."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codificación de archivo desconocida"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "El tamaño del archivo sobrepasa %s, no se puede abrir en línea."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Imposible visualizar el archivo"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Formato de archivo inválido."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "La biblioteca no existe."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "La biblioteca está encriptada."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Imposible editar el archivo"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "El archivo no existe."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Este tipo de archivo no se puede editar en línea."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Fallo al definir cuota: error interno"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Borrado con éxito %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Fallo al borrar: no existe el usuario"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s asignado como administrador"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Fallo al definir administrador: el usuario no existe"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Los permisos de administrador de %s fueron revocados"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Fallo al revocar admin: el usuario no existe"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "\"%s\" activado con éxito."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Fallo al activar: el usuario no existe."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "\"%s\" desctivado con éxito."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Fallo al desactivar: el usuario no existe"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Tu cuenta en %s está activada."
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "La contraseña ha sido reestablecida en %s"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Contraseña restablecida con éxito a %(passwd)s, un correo fue enviado a %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Contraseña restablecida a %(passwd)s, pero hubo un fallo al enviar el correo a %(user)s, revise su configuracion de email."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Contraseña de %(user)s restablecida a %(passwd)s con éxito."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5621,47 +6049,53 @@ msgid ""
 "configured."
 msgstr "Contraseña de %(user)s restablecida a %(passwd)s. Pero el correo de notificación no pudo ser enviado, porque el servicio de correo no está configurado correctamente."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Fallo al restablecer la contraseña: el usuario no existe."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Información de registro de Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Estás invitado a unirte a %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "El usuario %s fue agregado con éxito. Se ha enviado un correo de aviso."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "El usuario %s fue agregado con éxito. Pero hubo un error al  enviar la notificación; por favor, revisa la configuración del correo."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "El usuario %s fue agregado con éxito."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "El usuario %s fue agregado con éxito. Pero el correo de aviso no pudo ser enviado, el servicio de correo no esta configurado."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Transferida con éxito."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Fallo al transferir, usuario %s no encontrado"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Fallo al transferir, argumentos inválidos."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "Falló establecer %s como admin"
diff --git a/locale/es_MX/LC_MESSAGES/django.po b/locale/es_MX/LC_MESSAGES/django.po
index 9ebe8c3b4d..f50965e783 100644
--- a/locale/es_MX/LC_MESSAGES/django.po
+++ b/locale/es_MX/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-23 23:28+0000\n"
-"Last-Translator: eddelac \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/seahub/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,175 +20,207 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Ya existe un usuario con este correo"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Las contraseñas no concuerdan"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Los nombres no pueden estar vacíos"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "El nombre es demasiado extenso (máximo 255 caracteres)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "La descripción no puede estar vacía"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "La descripión es demasiado extensa (máximo 100 carateres)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "El nombre %s no es válido"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Argumento Faltante"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Se requiere el Apellido"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Es demasiado largo."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Se requiere."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "El nombre \"%s\" no es válido."
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "El id del repositorio es requerido"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "El nombre del usuario es requerido"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "La contraseña no puede estar vacía"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Formato de URL no válido"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Error interno de servidor"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Error en el desencriptado de la biblioteca"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Dirección de correo requerida"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "La cuota no puede estar vacía"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "La cuota es muy pequeña (el valor mínimo es 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "El nombre de la biblioteca es obligatorio."
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "La descripción de la Biblioteca es obligatoria."
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Por favor, escriba un número"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebreo"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Letón"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Danés"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portugués, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -197,8 +229,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Organización de equipo de colaboraores"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Discusión"
 
@@ -210,16 +243,17 @@ msgstr "Discusión"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -229,13 +263,13 @@ msgstr "Archivo"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -244,9 +278,9 @@ msgstr "Icono del directorio"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s respuestas"
@@ -257,43 +291,48 @@ msgstr "No hay discusiones."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Cargando..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Fallo. Por favor, verifique la red"
 
@@ -342,6 +381,25 @@ msgstr "Por favor verifique la red."
 msgid "New Replies"
 msgstr "Nuevas Respuestas"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Mensajes"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Mensajes con %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Información personal"
@@ -355,10 +413,11 @@ msgid "Important dates"
 msgstr "Fechas importantes"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Grupos"
 
@@ -371,72 +430,74 @@ msgstr "Contraseña cambiada correctamente."
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Contraseña "
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Por favor, ingrese un nombre de usuario y contraseña correctas. Nota: ambos datos son sensibles a mayúsculas y minúsculas."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Esta cuenta está inactiva."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Tu navegador no tiene habilitados los cookies. Las cookies son requeridas para autenticarse en el sitio."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "No se pudo enviar el correo, el servicio no está configurado adecuadamente, por favor, contacte al administrador."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Esa dirección de correo no está asociada a ninguna cuenta de usuario. ¿Está seguro de que está registrado en el sistema?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Contraseña reestablecida a %s"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Confirmación de nueva contraseña"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "La contraseña antigua ingresada es incorrecta. Por favor, corrijala."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
@@ -474,7 +535,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Actualmente tienes %(nb_avatars)d avatars, y el máximo permitido es%(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar de %s"
@@ -542,57 +603,62 @@ msgstr "Avatar actual:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Enviar"
@@ -609,7 +675,7 @@ msgstr "%(avatar_creator)s actualizó su avatar %(avatar)s."
 msgstr "Ha actualizado su avatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Avatar predeterminado"
 
@@ -641,7 +707,7 @@ msgstr "telefono"
 msgid "note"
 msgstr "nota"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Los archivos de esta biblioteca no se pueden ver en linea."
 
@@ -698,7 +764,7 @@ msgstr "Archivo \"%(file)s\" revertido a las %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Directorio borrado recuperado"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Descripción o nombre de la biblioteca modificados."
 
@@ -708,9 +774,9 @@ msgstr "Auto fusionar con sistema seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Ahora"
 
@@ -746,42 +812,48 @@ msgstr[1] "Hace %(seconds)d segundos"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Lectura-Escritura"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Sólo lectura"
 
@@ -790,33 +862,33 @@ msgstr "Sólo lectura"
 msgid "Email is required."
 msgstr "Se requiere correo."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s no es un correo válido."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s ya está en sus contactos."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Se agregó correctamente %s a contactos."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Fallo al agregar %s a contactos."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Editado correctamente %s"
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Borrado correctamente %s"
@@ -841,10 +913,10 @@ msgstr "E-Mail"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -852,45 +924,46 @@ msgstr "E-Mail"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nombre"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Nota"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -899,56 +972,64 @@ msgstr "Nota"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Operaciones"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Editar"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Borrar"
 
@@ -964,17 +1045,19 @@ msgstr "Agrege contactos para compartir bibliotecas y enviar enlaces de descarga
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -999,8 +1082,8 @@ msgid "Delete Contact"
 msgstr "Borrar Contacto"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1076,400 +1159,415 @@ msgstr "El mensaje de verificación es muy largo (máximo 255 caracteres)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" no es un nombre válido"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Solo puede crear %d grupos.Actualizar cuenta."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Grupo renombrado correctamente a \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Fallo al renombrar el grupo, el nombre del grupo sólo puede contener letras, números y guión bajo"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Email %s es invalido."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Sólo los administradores pueden hacer público el grupo"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "El mensaje no existe"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Usted no tiene los permisos adecuados"
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Sólo puedes invitar %d miembros. Actualizar cuenta."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Te han agregado a un grupo en Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Fallo al agregar a %s, no está registrado."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Agregado correctamente. Se envió un correo"
 msgstr[1] "Agregado correctamente. Se enviaron %(count)s correos."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Agregado correctamente."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Fallo al agregar, %s no es un correo válido."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Fallo al agregar, %s no está registrado."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Operación correcta."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Falló: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Fallo al dejar de compartir: el grupo no existe."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Operación fallida: sólo administradores y propietarios de una biblioteca pueden dejar de compartirla."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Fallo al dejar de compartir: error interno."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Error: id de grupo erróneo"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Error: el grupo no existe."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Posteado exitosamente en %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Error: no estás en el grupo %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Error: la biblioteca no existe."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Error: sin ruta"
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "No se pudo crear: el grupo no existe."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "No se pudo crear: no estás en ningún grupo."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "No se pudo crear"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "No se pudo crear: error interno."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Ya estás en el grupo."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Petición enviada correctamente al administrador."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"Wiki\" Activado correctamente"
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"Wiki\" Desactivado correctamente"
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Fallo al crear la pagina wiki. Intente más tarde."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "No existe la wiki"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Fallo al crear pagina de inicio. Intente más tarde."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr ""
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki no encontrado"
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "La página \"%s\" ya existe."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s lo invitpo a unirse al grupo %(group.group_name)s. Por favor vaya a la siguiente página para inscribirse."
+msgid "Successfully deleted \"%s\"."
+msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Gracias por usar nuestro sitio!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "El equipo de %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Ocultar respuestas"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Responder"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Agregar respuesta..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "No puede estar en blanco ni ser mayor a 2048 caracteres."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Este grupo es público."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Habilitar Modulo"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Salir"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Este grupo es público."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Archivos"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Miembros"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Administrador"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Salir del grupo"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Está seguro que desea abandonar el grupo?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Agregar discusión..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Agregar archivos"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Despues de iniciar sesión, puede agregar discusiones y respuestas."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Anterior"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Próximo"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Arriba"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Seguro que desea eliminar esta discusión?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Sí"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "No"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Eliminado satisfactoriamente"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Fallo al eliminar:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Falló."
 
@@ -1478,6 +1576,7 @@ msgid "Recent Changes"
 msgstr "Cambios recientes"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1486,77 +1585,58 @@ msgstr "Nueva biblioteca"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Descripción"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Última actualización"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Compartida por"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "icono del directorio"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Descargar y Sincronizar"
 
@@ -1572,7 +1652,7 @@ msgstr "Descargar y Sincronizar"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
@@ -1609,15 +1689,16 @@ msgid "Modified at"
 msgstr "Modificado el"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Modifico"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1626,23 +1707,23 @@ msgid "Details"
 msgstr "Detalles"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Ninguno"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1661,15 +1742,43 @@ msgstr "Contraseña:"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "El password será almacenado en el servidor por 1 hora."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Dejar de compartir biblioteca"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Seguro que quiere dejar de compartir %s?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "icono del directorio"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "No hay bibliotecas compartidas en este grupo"
@@ -1686,14 +1795,25 @@ msgid ""
 "message: "
 msgstr "%(user)s desea unirse al Grupo \"%(group_name)s\", mensaje de verificación: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Gracias por usar nuestro sitio!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "El equipo de %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Administradores"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Configuraciones"
 
@@ -1701,7 +1821,7 @@ msgstr "Configuraciones"
 msgid "Add Members"
 msgstr "Agregar miembros"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Agregar Admins"
 
@@ -1710,7 +1830,7 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Cambiar"
 
@@ -1729,7 +1849,7 @@ msgid "Make Public"
 msgstr "Hacer Público"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Transferir"
 
@@ -1753,29 +1873,41 @@ msgstr "Tip: el correo ya debe estar registrado."
 msgid "Rename Group To"
 msgstr "Renombrar Grupo a"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Descartar Gupo"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Seguro que desea descartar este grupo?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Borrar miembro"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Seguro que quiere borrar %s?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Salir"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Agregar a contactos"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Salir del grupo"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Está seguro que desea abandonar el grupo?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Unirse al grupo"
@@ -1802,12 +1934,29 @@ msgstr "Miembros:"
 msgid "Verification Message"
 msgstr "Mensaje de verificación"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Crear"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Este grupo no tiene wiki actualmente"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1815,82 +1964,105 @@ msgid ""
 "back to the server."
 msgstr "El Wiki permite organizar conocimiento de una manera sencilla. Los contenidos del wiki se almacenan en una biblioteca normal con una estructura predefinida de archivo/carpeta. Esto permite editar el wiki desde el escritorio y despues sincronizar con el servidor."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Crear Wiki ahora"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Crear Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Paginas Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Haga click y escoja una biblioteca."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Inicio"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Páginas"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Historia del Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Página Nueva"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Borrar Página"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Editar Página"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Historial de página"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Ultima modificacion %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Se requiere nombre."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Se requiere descripción."
 
@@ -1937,10 +2109,12 @@ msgstr "Agregar miembros"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Aceptar"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "correos electrónicos separados por ','"
 
@@ -1956,7 +2130,8 @@ msgstr "Tip: los correos deben estar registrados"
 msgid "Add administrators"
 msgstr "Agregar administradores"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Ingrese o selecciones los correos."
 
@@ -2235,135 +2410,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Los servidores Seafile no almacenan la contraseña para un biblioteca encriptada. Para ver la biblioteca compartida en linea necesita ingresar la contraseña de la biblioteca. Esta contraseña se almacena en la memoria encriptada del servidor, de donde se borrará en una hora. Después, para ver la librería, debe ingresar la contraseña de nuevo."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "se requiere mensaje"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "se requiere contacto"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "No puede enviarse un mensaje a si mismo."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Fallo el enviar mensaje al usuario %s, usuario no encontrado."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Mensajes"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nuevo Mensaje"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Mensaje"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Tiempo"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "mensaje..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Agregar archivos"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "enviar a: click para seleccionar contactos"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "agregue contactos primero"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Fallo en la busqueda de contactos para el mensaje."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Actualmente no tiene niguna biblioteca"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Mensajes con %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Enviar un mensaje..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Un archivo nombrado %(file_name)s se ha guardado en la carpeta %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s compartio la biblioteca %(repo_name)s contigo."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s compartió el archivo %(file_name)s con usted."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "Ha recibido un nuevo mensaje de %(user)s."
+msgid "You have received a new message from %(user)s."
+msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Error interno"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s tiene una nueva discusión"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s agrego una nueva discusión en %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "Ona discusión grupal tiene una nueva respuesta"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s contesto en la discusión grupal "
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s solicitó unirse
 msgid "Successfully cleared all notices."
 msgstr "Todos los avisos eliminados."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Agregar nueva notificación"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr ""
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr ""
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Todas las notificaciones"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Agregar nueva notificación"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Detalles de notificaciones"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(notificaciones actuales)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Ajustar a los valores actuales"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Vacio"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Borrar notificación"
 
@@ -2426,27 +2605,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Seleccione como desea ver las bibliotecas encriptadas en linea:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Enviar contraseñas al servidor."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Los archivos se desencriptan en el servidor antes de enviarselos."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Guardar contraseñas en el navegador."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Los archivos serán desencriptados cuando se descargen."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2478,81 +2657,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "\"%s\" definida correctamente como biblioteca predeterminada."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Configuración del perfil"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Perfil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Bibliotecas Encriptadas"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Sub-Biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Biblioteca predeterminada."
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Eliminar Cuenta"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Avatar:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Actualizar"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Nombre:"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Mi información:"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Departamento:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Telefono:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Configuracion de Bibliotecas Encriptadas"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Como ver bibliotecas encriptadas en linea."
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Configurar Sub-biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Activar sub-biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2561,7 +2747,7 @@ msgid ""
 "library."
 msgstr "Esta función permite sincronizar selectivamente una carpeta dentro de una biblioteca. Una sub-biblioteca puede ser creada a partir de cualquier carpeta. Después de ser creada, se listará en el cliente de escritorio y puede descargarse como una biblioteca normal. Se mantendrá sincronizado automaticamente con su biblioteca original."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2569,37 +2755,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Las sub-bibliotecas también se usan cuando se comparte una carpeta con un usuario o un grupo. Sin esta opción habilitada, se crea automaticamente una sub-biblioteca oculta. Con la opción habilitada, estas sub-bibliotecas también se listaran, lo que permite administrarlas."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Configuración predeterminada de biblioteca"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Su biblioteca predeterminada:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "La biblioteca predeterminada es el lugar donde se almacenarán sus documentos e imagenes personales."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Escoja Biblioteca Predeterminada"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Esta operacion no se puede revertir. Está seguro?"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Escoja biblioteca predeterminada:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Haga click y escoja una biblioteca."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Seguro que desea eliminar su cuenta?"
 
@@ -2612,25 +2794,25 @@ msgid "Info"
 msgstr "Info"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Nombre"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Auto-descripción"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Departamento"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Telefono"
 
@@ -2638,169 +2820,171 @@ msgstr "Telefono"
 msgid "Email is not longer than 512 characters"
 msgstr "La dirección de correo no debe superar los 512 caracteres"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Fallo al compartir con los miembros, intente más tarde."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Compartido correctamente con todos los miembros, verifique en Compartidos"
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" ya se encuentra en el grupo %(group)s. Ver"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Fallo al compartir %(repo)s con %(group)s, intente más tarde."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Compartido correctamente con %(group)s, verifique en Compartidos"
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "No puede compartir bibliotecas consigo mismo."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Fallo al compartir con %s, intente más tarde."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Compartido correctamente con%(email)s, verifique en Compartidos"
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "No se pudo compartir %s, el correo no está registrado."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Sólo el propietario de la biblioteca puede compartirla."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Fallo al compartir \"%s\", cuota insuficiente. Actualizar cuenta"
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Argumento inválido"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Fallo al remover compartido"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "id de grupo no válido"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Compartido removido correctamente"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "Todos los miembros"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "No puede compartir la librería usando ese método."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Fallo al obtener el enlace, intente más tarde."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Removido correctamente"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "El enlace no existe"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Fallo al enviar el enlace compartido. El servicio de correo electrónico no está adecuadamente configurado, por favor, contacte al administrador"
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Un contacto compartió un archivo en Seafile con usted."
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Error interno del servidor: no se pudo enviar"
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Envíado correctamente."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Elija un directorio."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Guardado correctamente."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Fallo al compartir con \"%s\", usuario no encontrado."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Compartido correctamente %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Se dejó de compartir \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "No tiene permiso para dejar de compartir %s."
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "No tiene permiso suficiente para guardar %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Fallo al obtener el enlace, intente más tarde."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "El envío del enlace de subida falló. El servicio de Email no está configurado apropiadamente, contacte al administrador."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Un contacto compartió un enlace de subida en Seafile con usted"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr ""
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2821,14 +3005,15 @@ msgstr "Visitas"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Ver"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Remover"
 
@@ -2857,7 +3042,7 @@ msgid "Folders - Share"
 msgstr "Carpetas - Compartir"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -2882,13 +3067,13 @@ msgid ""
 msgstr "Puede compartir solamente una carpeta con un usuario registrado si no quiere compartir toda la biblioteca."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Editado correctamente"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Fallo al editar."
@@ -2955,7 +3140,7 @@ msgstr "Compartidos"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Información básica"
 
@@ -2968,7 +3153,8 @@ msgid "Add to contacts"
 msgstr "Agregar a contactos"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Dejar de compartir"
 
@@ -2989,56 +3175,24 @@ msgstr "Actividades"
 msgid "Exit System Admin"
 msgstr "Salir de Administrador"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Usuarios"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Enlaces"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Administración del Sistema"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "notas sin leer"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Ingresar"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Registrarse"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Desconectarse"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Versión del servidor:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Administración del Sistema"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Contáctenos"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Todos los grupos"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Clientes"
 
@@ -3046,7 +3200,7 @@ msgstr "Clientes"
 msgid "Client Name"
 msgstr "Nombre del Cliente"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3087,28 +3241,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Esta biblioteca está encriptada. Ingrese la contraseña para verla en línea. La contraseña se almacenará en el navegador durante 1 hora."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Puede cambiar la forma de ver las bibliotecas compartidas en linea aqui."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Por favor ingrese contraseña."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3118,8 +3324,7 @@ msgstr "Descargar"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Ruta actual:"
 
@@ -3434,9 +3639,9 @@ msgid "Password is required."
 msgstr "Contraseña requerida"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Histórico"
@@ -3455,16 +3660,11 @@ msgstr "Consejo: una nueva versión será generada después de cada modificació
 msgid "Current Path:"
 msgstr "Ruta actual:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Última modificación"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Tamaño"
 
@@ -3472,38 +3672,55 @@ msgstr "Tamaño"
 msgid "(current version)"
 msgstr "(versión actual)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Restaurar"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Diff"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Documentos"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introducción"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Ayuda"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Cliente"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile para Windows, Mac y Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Versión del servidor:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Contáctenos"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3532,12 +3749,13 @@ msgstr " papelera"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Regresar a la biblioteca"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3552,36 +3770,57 @@ msgstr "Personal"
 msgid "Starred"
 msgstr "Marcado"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Wiki Personal"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Admin de Compartidos"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Enlaces"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupo"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "No hay bibliotecas compartidas con sus grupos"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "No tiene bibliotecas compartidas"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Bienvenido a Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile organiza los archivos en bibliotecas. Cada biblioteca se puede sincronizar y compartir por separado. Se creo una biblioteca personal. Puedes crear más despúes."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Cerrar"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Inicio"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organización"
@@ -3592,11 +3831,11 @@ msgid ""
 "current account."
 msgstr "La funcion de \"Organizacion\" será removida en la siguiente version, los datos se fusionaran con la cuenta actual."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3618,420 +3857,452 @@ msgstr "Aun no se ha creado ningún grupo "
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Puede dar click en el botón \"Agregar Grupo\" en \"Grupo\" para crear un grupo"
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Compartir desde"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "No hay bibliotecas públicas"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Puede crear una biblioteca pública dando click en el enlace \"Nueva biblioteca\" . A partir de ese momento, otros usuarios podrán ver y descargala"
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Papelera"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Tamaño:"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Papelera"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Mover"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copiar"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Subir archivos"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "El dueño de esta biblioteca se quedó sin espacio."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Selecione un archivo primero."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Agregar Archivos"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Iniciar Todo"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Cancelar Todo"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "La función de Arrastrar y Soltar solo está disponible en Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "El tamaño del archivo debe ser menor a %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Actualizar %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Escoger un archivo"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Más pequeños que %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nuevo directorio"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nombre del directorio"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nuevo archivo"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "tipo de archivo destacado"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Click para seleccionar"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Editor Texto Enriquecido"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "Formateo sencillo."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nombre de Archivo"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Biblioteca actual"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Otras bibliotecas"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Por favor, seleccione un directorio con un click."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Renombrar %(name)s como:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Sincronizar %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Una sub-biblioteca ha sido creada en este directorio. Se listará en el cliente de escritorio, puede descargarla como una biblioteca normal."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Crear"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Esta biblioteca está encriptada. Ingrese la contraseña para consultarla en linea. La contraseña se guardará durante 1 hora."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Archivo demasiado grande"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Archivo demasiado pequeño"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Tipo de archivo no permitido"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Numero máximo de archivos excedido"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Bytes actuales exceden el tamaño maximo"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Resultado de subida incompleto"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Error"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Inicio"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Eliminar elementos"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Seguro que desea eliminar los elementos selecionados?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Procesando…"
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos borrados correctamente."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "%(name)s eliminado correctamente."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al borrar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Error interno. Fallo al borrar %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Mover los directorios/archivos selecionados a:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Copiar directorios/archivos selecionados a:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Ruta de destino inválida"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos movidos correctamente."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s movido correctamente."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s y otros %(amount)s elementos copiados correctamente."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s copiados correctamente."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al mover %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Error interno. Fallo al mover %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Error interno. Fallo al copiar %(name)s y otros %(amount)s elementos."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Error interno. Fallo al copiar %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Encriptando archivo..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Error al encriptar."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Encriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Subiendo archivo..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Terminado!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Descargando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Desencriptando..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Desencriptando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Eliminados correctamente %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Renombrar Archivo"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Renombrar Directorio"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Copiar Archivo"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Mover Archivo"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Copiar Directorio"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Mover Directorio"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Copiar %(name)s a:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Mover %(name)s a:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "La descarga de directorio no está permitida en esta biblioteca."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "desmarcado"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "marcado"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Sub-biblioteca creada."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Es requerido."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Defina un nombre, no solamente la extensión."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Creando..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "No se ha renombrado."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s renombrados a %(new_name)s correctamente"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Seleccione al menos un contacto."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Ingrese o seleccione correos/grupos."
 
@@ -4053,11 +4324,12 @@ msgstr "Consejo: Una instantánea será generada después de cada modificación,
 msgid "View Snapshot"
 msgstr "Ver instántanea"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Por página:"
@@ -4098,34 +4370,78 @@ msgstr "todos"
 msgid "Delete Time"
 msgstr "Borrar fecha"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Configuraciones de la biblioteca"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Mantener historial completo"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "No mantener historial"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Sólo mantener un período del historial:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "días"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Transferer Propiedad"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Tranferir esta biblioteca a otro usuario:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Regresar al historial de modificaciones"
@@ -4134,6 +4450,10 @@ msgstr "Regresar al historial de modificaciones"
 msgid "Create Time"
 msgstr "Fecha de creación"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Última modificación"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4176,8 +4496,14 @@ msgstr "Su cliente Seafile está desactualizado, por favor, actualícelo con la
 msgid "Click to download."
 msgstr "Click para descargar."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Compartido por:"
 
@@ -4189,25 +4515,26 @@ msgstr "Guardar en..."
 msgid "Save To:"
 msgstr "Guardar en:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Está recibiendo este correo electrónico porque %(email)s compartió un archivo en %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Por favor, visite la siguiente página para ver el archivo:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Ha recibido este e-mail porque %(email)s compartio un enlace de subida contigo en %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Puede ir a la siguiente pagina para subir los archivos:"
 
@@ -4219,8 +4546,8 @@ msgstr "Marcadas"
 msgid "icon"
 msgstr "icono"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Desmarcar"
 
@@ -4275,49 +4602,49 @@ msgstr "para"
 msgid "Sorry, this user is not registered yet."
 msgstr "Este usuario no está registrado aún."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Marcar"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "actualizó este archivo"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "Único contribuyente"
 msgstr[1] " %(counter)s colaboradores"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Desmarcado correctamente"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Marcado correctamente"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "también puede presionar ←"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "previo"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "puede también presionar → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "siguiente"
 
@@ -4336,7 +4663,7 @@ msgid "auto detect"
 msgstr "auto detectar"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "Cargando..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Puedes usar IE 10, firefox o chrome para visualizar el archivo en línea."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Para ver este documento en línea use firefox, chrome o IE9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Este tipo de archivos no se pueden ver en linea."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4383,41 +4710,55 @@ msgstr "Subir archivos a %(dir_name)s"
 msgid "shared by:"
 msgstr "compartido por:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Ingresar"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(recuperar contraseña)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "No legible? Refrescar."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Correo electrónico o contraseña incorrecta"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Recordar por %(remember_days)s días"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Registrarse"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Fallo al refrescar el CAPTCHA. Intente más tarde."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "El correo no puede estar en blanco"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "La cntraseña no puede estar en blanco"
 
@@ -4471,13 +4812,13 @@ msgstr "Contraseña restablecida correctamente."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Reestablecer Contraseña"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Ingrese nueva contraseña"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4488,23 +4829,19 @@ msgid "Password Reset Successfully"
 msgstr "Contraseña restaurada satisfactoriamente"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Hemos envíado a su cuenta correo las instrucciones para restaurar contraseña."
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Está recibiendo este correo porque solicitó restaurar tu contraseña para la cuenta de usuario en el sitio %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Visite la siguiente página para asignar una nueva contraseña:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Su nombre de usuario, en caso de que lo haya olvidado:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4534,23 +4871,31 @@ msgstr "Registro completo, espere a que el administrador active su cuenta."
 msgid "Register"
 msgstr "Registrar"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Bienvenido otra vez, sesión iniciada."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Confirmar contraseña"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Escriba la contraseña nuevamente"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Las contraseñas no concuerdan"
 
@@ -4570,12 +4915,6 @@ msgstr "es demasiado extenso. Tamaño máximo permitido es 1 MB."
 msgid "Discuss"
 msgstr "Comentar"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Grupo"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Seleccione al menos 1 grupo."
@@ -4584,10 +4923,6 @@ msgstr "Seleccione al menos 1 grupo."
 msgid "Please input a discussion."
 msgstr "Ingrese un tópico"
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Generado por el sistema"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4606,42 +4941,66 @@ msgstr "Link de subida"
 msgid "Private Share"
 msgstr "Compartido Privado"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Repetir contraseña"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Generar"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Enlace:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Enviar"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Envíar a:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Correos separados por ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Enviando…"
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Puede compartir el enlace generado con otros para que puedan subir archivos a esta carpeta."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Link de Subida:"
 
@@ -4694,7 +5053,7 @@ msgid "Sub-libraries"
 msgstr "Sub-bibliotecas"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Compartidas"
 
@@ -4725,29 +5084,23 @@ msgid ""
 " library."
 msgstr "Puede crear una sub-biblioteca dentro de un directorio de una biblioteca existente. Una sub-biblioteca puede ser sincronizada y compartida independientemente. Los archivos de la sub-bibilioteca se mantendrán sincronizados automaticamente con el directorio de origen de la biblioteca."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "No tiene bibliotecas compartidas"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "No hay bibliotecas compartidas con sus grupos"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "El archivo se está procesando, espere..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "ocultar outline"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "mostrar outline"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Falló la conversión del documento "
 
@@ -4764,27 +5117,29 @@ msgstr "Encriptar"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(al menos %(repo_password_min_length)s caracteres)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Repetir contraseña"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Nombre requerido"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Descripción requerida"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Ingrese una contraseña"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Contraseña demasiado corta"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Contraseña demasiado larga (máximo 35 caracteres)"
 
@@ -4797,7 +5152,7 @@ msgstr "Borrado correctamente."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "¿Seguro que desea borrar %(lib_name)s?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Subir archivo..."
 
@@ -4924,15 +5279,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Seleccione al menos un tipo de archivo o extensión de archivo"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Seleccione contactos"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Ingrese al menos un correo."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4945,7 +5308,7 @@ msgstr "Self"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -4957,6 +5320,22 @@ msgstr "Tráfico de este mes:"
 msgid "Payment"
 msgstr "Pago"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Usuarios"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Transferir Biblioteca"
@@ -4967,74 +5346,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Transferir %(lib_name)s a:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Propietario"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Todos los grupos"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Creador"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Creado el"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Borrar grupo"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Base de datos"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Buscar"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Creado el / Último incio"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Espacio utilizado"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Todo"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Huerfanos"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Sistema"
 
@@ -5050,96 +5429,117 @@ msgstr "Prefijo URL"
 msgid "Delete Organization"
 msgstr "Borrar organización"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Enlaces Públicos"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Cuenta"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Buscar en Biblioteca"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Tip: puede buscar por palabra clave, propietario o ambas."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Resultado"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "No hay resultados"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Agregar nuevo usuario"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Activando..., por favor espere"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Las contraseñas no concuerdan"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Está recibiendo este mensaje porque %(user)s lo agregó a su organización: \"%(org.org_name)s\" en el sitio: %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Está recibiendo este mensaje porque %(user)s lo agregó a %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "A continuación están los detalles de su cuenta:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Correo electrónico: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Contraseña:  %(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Vaya a la siguiente página e inicie sesión:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Está recibiendo este mensaje porque un miembro del equipo de administración restauró su contraseña para el sitio %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "La nueva contraseña es  %(password)s, por favor, modifíquela tan pronto como sea posible."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Buscar Usuario"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Tip: Use * como caracter comodín."
 
@@ -5153,7 +5553,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "¿Está seguro que desea restablecer la contraseña de %s?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Revocar Privilegios"
 
@@ -5163,7 +5563,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Seguro que desea revocar los privilegios de administracion de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Definir Administrador"
 
@@ -5182,437 +5581,466 @@ msgid ""
 "configuration."
 msgstr "Edición exitosa, pero hubo un fallo al enviar el correo, revise la configuración de email."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Estado"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Activo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Restaurar contraseña"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Usado"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Fijar quota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Especificar límite de espacio"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Tip: con 0 se mantiene limite predeterminado"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Propiedad de"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "No tiene un wiki personal"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "wiki-personal"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Paginas de Wiki Personales"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "error de permiso"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Error al ver la papelera"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "La biblioteca no existe."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Ni tiene permiso suficiente para realizar la acción."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Fallo al editar la información de la biblioteca."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Fallo al guardar las configuraciones del servidor"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Configuraciones guardadas."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Nombre de usuario %s invalido."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Usuario %s no encontrado."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "La biblioteca %(repo_name)s se transfirió a %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr ""
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "El nombre de archivo contiene caracteres inválidos"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Nombre de archivo duplicado"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "El tamaño del archivo sobrepasa el límite"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "El espacio del propietario se agotó, no se pudo subir el archivo"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Ocurrió un error durante la transferencia del archivo"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "URL inválido"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Fallo al ver las modificaciones de la biblioteca"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Fallo al ver historial de biblioteca"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "No tiene permisos para restaurar la biblioteca"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Por favor, especifique el ID del historial"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "La biblioteca no existe"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "El historial especificado no existe"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "No hubo conflictos al unir."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Mi Biblioteca"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Fallo al dejar de compartir biblioteca, no existe."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Se dejó de compartir \"%s\" correctamente."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Fallo al dejar de compartir \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Fallo al borrar el archivo."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s borrado correctamente."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Error interno. No se pudo borrar: %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Imposible acceder al archivo"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Fallo al descargar biblioteca, servidor no encontrado"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Configuración de servidor inválida."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Restablecido correctamente %(path)s al  directorio raíz."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "%(path)s restablecido correctamente"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Restablecido correctamente %(path)s al directorio raíz."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Imposible descargar directorio \"%s\": tamaño excedido."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Imposible descargar \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "\"Wiki Personal\" activado correctamente."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "\"Wiki Personal\" Desactivado correctamente"
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "No tiene permiso para acceder a la biblioteca."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "No hay ruta."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "El grupo no existe"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Persmiso denegado."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Biblioteca encriptada."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Error: no hay head commit id"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Argumento faltante."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "La ruta de destino es demasiado larga."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "%(name)s movido correctamente ver"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "%(name)s copiado correctamente ver"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "No se pudo mover el directorio %(src)s al subdirectorio %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "No se pudo copiar el directorio %(src)s al subdirectorio %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "La ruta de destino de %s es demasiado larga."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Falllo al conseguir lista de bloques"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "repo id incorrecto"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Error HTTP: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Error URL: No se pudo abrir el archivo en línea"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "La codificación elegida no es correcta."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codificación de archivo desconocida"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "El tamaño del archivo sobrepasa %s, no se puede abrir en linea."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Imposible visualizar el archivo"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Formato de archivo invalido."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "La biblioteca no existe."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "La biblioteca está encriptada."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Imposible editar el archivo"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "El archivo no existe."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Este tipo de archivo no se puede editar en línea."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Fallo al definir cuota: error interno"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Borrado correctamente %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Fallo al borrar: no existe el usuario"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s asignado como administrador"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Fallo al definir administrador: el usuario no existe"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Los permisos de administrador de %s fueron revocados"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Fallo al revocar admin: el usuario no existe"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "\"%s\" activado correctamente."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Fallo al activar: el usuario no existe."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "\"%s\" desctivado correctamente"
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Fallo al desactivar: el usuario no existe"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Contraseña restablecida correctamente %(passwd)s, un correo fue enviado a %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Contraseña restablecida a %(passwd)s, pero hubo un fallo al enviar el correo a %(user)s, revise su configuracion de email."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Contraseña de %(user)s restablecida a %(passwd)s correctamente."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5620,47 +6048,53 @@ msgid ""
 "configured."
 msgstr "Contraseña de o %(user)s restablecida a %(passwd)s. Pero el correo de notificación no pudo ser enviado, porque el servicio de correo no está configurado correctamente."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Fallo al cambiar la contraseña: el usuario no existe."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Información de registro de Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "El usuario %s fue agregado correctamente. Se ha enviado un correo de aviso."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "El usuario %s fue agregado correctamente. Pero hubo un error al  enviar la notificación; por favor, revise la configuración del correo."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "El usuario %s fue agregado correctamente."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "El usuario %s fue agregado correctamente. Pero el correo de aviso no pudo ser envíado, el servicio de correo no esta configurado."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Transferido correctamente."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Fallo al transferir, usuario %s no encontrado"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Fallo al transferir, argumentos inválidos."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index ca39ff99ba..4871d1c762 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,6 +6,7 @@
 # EricLF44 , 2014
 # EricLF44 , 2014
 # Lhassa , 2013-2014
+# jcbeylot78 , 2014
 # Lhassa , 2013
 # Pi3R1k , 2013
 # Pi3R1k , 2013-2014
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-27 19:43+0000\n"
-"Last-Translator: jcbeylot78 \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-11 09:16+0000\n"
+"Last-Translator: Pi3R1k \n"
 "Language-Team: French (http://www.transifex.com/projects/p/seahub/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,175 +24,207 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Un utilisateur avec cette adresse email existe déjà"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Le nom ne peut être vide"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Le nom est trop long (le maximum est de 255 caractères)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "La description ne peut être vide"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "La description est trop longue (le maximum est de 100 caractères)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Le nom %s n'est pas valide"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Argument manquant"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "L'ancien nom est requis"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "C'est trop long."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "C'est requis."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Le nom \"%s\" n'est pas valide"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "L'ID du repo est requis"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Le nom d'utilisateur est requis"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "le mot de passe ne peut pas être vide"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Mauvais format de l'adresse"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Le mot de passe est erroné"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Erreur interne du serveur"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Erreur de déchiffrement de la bibliothèque"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "L'adresse email est obligatoire"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Le quota ne peut être vide"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Le quota est trop faible (la valeur minimale est 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Le nom de la bibliothèque est requis"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "La description de la bibliothèque est requise"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Veuillez entrer un numéro"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Saisissez un mot de passe correct."
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr "français"
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "РУССКИЙ"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -200,8 +233,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Organisation des fichiers de collaboration d'équipe"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Discussion"
 
@@ -213,16 +247,17 @@ msgstr "Discussion"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -232,13 +267,13 @@ msgstr "Fichier"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -247,9 +282,9 @@ msgstr "Icône du dossier"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s réponses"
@@ -260,43 +295,48 @@ msgstr "Pas de discussions."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Chargement..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Échec. Vérifiez le réseau."
 
@@ -345,6 +385,25 @@ msgstr "Veuillez vérifiez le réseau."
 msgid "New Replies"
 msgstr "Nouvelles réponses"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Messages"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Messages avec %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "Pas de messages."
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Informations personnelles"
@@ -358,10 +417,11 @@ msgid "Important dates"
 msgstr "Dates importantes"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Groupes"
 
@@ -374,72 +434,74 @@ msgstr "Mot de passe modifié avec succès."
 msgid "Change password: %s"
 msgstr "Changer mot de passe : %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Mot de passe"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Veuillez entrer un nom d'utilisateur correct et le mot de passe. Notez que les deux champs sont sensibles à la casse."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Ce compte est inactif."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Votre navigateur ne semble pas avoir les cookies activés. Les cookies sont requis pour se connecter."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "Adresse email"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Échec d'envoi de l'email, le service de courrier électronique n'est pas correctement configuré, veuillez contacter l'administrateur."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Cette adresse email n'a pas de compte d'utilisateur associé. Êtes-vous certain d'être enregistré ?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Mot de passe réinitialisé pour %s"
+msgid "Reset Password on %s"
+msgstr "Mot de passe réinitialisé sur %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Votre ancien mot de passe n'a pas été correctement saisi. Veuillez l'entrer à nouveau."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Mot de passe (encore)"
 
@@ -477,7 +539,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Vous avez déjà %(nb_avatars)d avatars et la valeur maximale autorisée est de %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar pour %s"
@@ -545,57 +607,62 @@ msgstr "Avatar actuel : "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Valider"
@@ -612,7 +679,7 @@ msgstr "%(avatar_creator)s a mis à jour son avatar
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Vous avez mis à jour votre avatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Avatar par défaut"
 
@@ -634,7 +701,7 @@ msgstr "nom"
 
 #: seahub/base/accounts.py:436
 msgid "department"
-msgstr "departement"
+msgstr "département"
 
 #: seahub/base/accounts.py:438
 msgid "telephone"
@@ -644,7 +711,7 @@ msgstr "téléphone"
 msgid "note"
 msgstr "note"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Les fichiers de cette bibliothèque ne peuvent pas être consultés en ligne."
 
@@ -701,7 +768,7 @@ msgstr "Retour du fichier \"%(file)s\" à son état du %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Récupération du dossier supprimé"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Le nom de la bibliothèque ou de la description a changé"
 
@@ -711,9 +778,9 @@ msgstr "Fusion automatique par Seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "À l'instant"
 
@@ -749,42 +816,48 @@ msgstr[1] "Il y a %(seconds)d secondes"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Lecture / Écriture"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Lecture seule"
 
@@ -793,33 +866,33 @@ msgstr "Lecture seule"
 msgid "Email is required."
 msgstr "L'adresse email est requise."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "\"%s\" n'est pas une adresse email valide"
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s est déjà dans vos contacts."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "%s ajouté avec succès aux contacts."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Échec de l'ajout de %s aux contacts."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "%s modifié avec succès."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "%s supprimé avec succès"
@@ -844,10 +917,10 @@ msgstr "Email "
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -855,45 +928,46 @@ msgstr "Email "
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nom"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Remarque"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -902,56 +976,64 @@ msgstr "Remarque"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Opérations"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Modifier"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -967,17 +1049,19 @@ msgstr "En ajoutant vos contacts, vous pourrez rapidement partager des biblioth
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Email"
 
@@ -1002,8 +1086,8 @@ msgid "Delete Contact"
 msgstr "Supprimer le contact"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1079,400 +1163,415 @@ msgstr "Le message de vérification est trop long (le maximum est de 255 caract
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" n'est pas un nom valide"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Vous pouvez seulement créer %d groupes.Mettre à niveau."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Un groupe portant ce nom existe déjà."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Groupe renommé avec succès en \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Impossible de renommer le groupe, le nom du groupe peut uniquement contenir des lettres, nombres ou souligné"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "%s n'est pas une adresse mail valide"
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Seul un administrateur peut rendre ce groupe public."
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Le message n'existe pas"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Vous n'avez pas la permission."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Vous pouvez seulement inviter %d membres.Mettre à niveau."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Une personne vous a ajouté à un groupe sur Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Vous este invité à joindre le groupe sur %s"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Impossible d'ajouter, %s n'est pas inscrit."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Ajouté avec succès. Un email a été envoyé."
 msgstr[1] "Ajouté avec succès.%(count)s emails ont été envoyés."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Ajouté avec succès."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Impossible d'ajouter, %s n'est pas une adresse mail valide"
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Impossible d'ajouter, %s n'est pas enregistré."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Opération réussie."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Échec ： %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "L'annulation du partage a échoué : le groupe n'existe pas."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "L'opération a échoué : seuls les administrateurs et le propriétaire de la bibliothèque peuvent annuler le partage."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Impossible d'annuler le partage : erreur interne."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Erreur : mauvais id de groupe"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Erreur : le groupe n'existe pas."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Posté avec succès au groupe %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Erreur : vous n'êtes pas dans le groupe %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Erreur : la bibliothèque n'existe pas."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Erreur : aucun chemin."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Impossible de créer : le groupe n'existe pas."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Impossible de créer : vous n'êtes pas dans le groupe."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Impossible de créer."
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Impossible de créer : erreur interne."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Vous êtes déjà dans le groupe."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Envoyé avec succès, le groupe admin va le traiter."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr " Une discussion est demandée. "
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"Wiki\" activé avec succès."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"Wiki\" désactivé avec succès."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Impossible de créer la page du wiki. Veuillez réessayer plus tard."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur."
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Le Wiki n'existe pas."
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Impossible de créer la page d'accueil. Veuillez réessayer plus tard."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Impossible de créer le wiki."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki introuvable."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "La page \"%s\" existe déjà."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s vous invite à rejoindre le groupe %(group.group_name)s. Rendez-vous sur la page suivante et inscrivez-vous :"
+msgid "Successfully deleted \"%s\"."
+msgstr "\"%s\" supprimé avec succès"
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Merci d'utiliser notre site !"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "L'équipe de %(site_name)s."
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Echec de la suppression de \"%s\", veuillez réessayer plus tard."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Bonjour,"
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr "%(email)s vous invite à joindre le groupe %(grp_name)s sur %(site_name)s:"
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Cacher les réponses"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Répondre"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Ajouter une réponse ..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Il ne peut pas être vide et ne doit pas faire plus de 2048 caractères."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Annuler"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Ce groupe est public."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Activer les modules"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Quitter"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Ce groupe est public."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Fichiers"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Membres"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Administration"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Quitter le groupe"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Êtes-vous certain de vouloir quitter ce groupe ?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Commencer une discussion..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Ajouter des fichiers"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr "Veuillez choisir un fichier ou des fichiers:"
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Après vous être connecté, vous pouvez poster des discussions et ajouter des réponses."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Précédent"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Suivant"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Haut"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Voulez-vous vraiment supprimer cette discussion ?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Oui"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Non"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Supprimé avec succès"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Impossible de supprimer : "
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Échec."
 
@@ -1481,6 +1580,7 @@ msgid "Recent Changes"
 msgstr "Changements récents"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1489,77 +1589,58 @@ msgstr "Nouvelle bibliothèque"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Description"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Mis à jour"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Partagé par"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "icône du dossier"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Télécharger et synchroniser"
 
@@ -1575,7 +1656,7 @@ msgstr "Télécharger et synchroniser"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Annuler le partage"
 
@@ -1612,15 +1693,16 @@ msgid "Modified at"
 msgstr "Modifié à"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Modificateur"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1629,30 +1711,30 @@ msgid "Details"
 msgstr "Détails"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Aucun"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Inconnu"
 
 #: seahub/group/templates/group/group_info.html:124
 #: seahub/templates/activities.html:19 seahub/templates/file_edit.html:240
 msgid "is encrypted"
-msgstr "est cryptée"
+msgstr "est chiffrée"
 
 #: seahub/group/templates/group/group_info.html:126
 #: seahub/templates/activities.html:21 seahub/templates/file_edit.html:241
@@ -1664,14 +1746,42 @@ msgstr "Mot de passe : "
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Le mot de passe est conservé sur le serveur pendant 1 heure."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Annuler le partage de la bibliothèque"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
-msgstr "Êtes-vous certain de vouloir de ne plus partager %s ?"
+msgstr "Êtes-vous certain de ne plus vouloir partager %s ?"
+
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "icône du dossier"
 
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
@@ -1689,14 +1799,25 @@ msgid ""
 "message: "
 msgstr "%(user)s veut se joindre au groupe \"%(group_name)s\", voici le message de vérification : "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Merci d'utiliser notre site !"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "L'équipe de %(site_name)s."
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Administrateurs"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -1704,7 +1825,7 @@ msgstr "Paramètres"
 msgid "Add Members"
 msgstr "Ajouter des membres"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Ajouter des administrateurs"
 
@@ -1713,7 +1834,7 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Changer"
 
@@ -1732,7 +1853,7 @@ msgid "Make Public"
 msgstr "Rendre public"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Transfert "
 
@@ -1756,29 +1877,41 @@ msgstr "Astuce : les emails devraient déjà être enregistrés."
 msgid "Rename Group To"
 msgstr "Renommer le Groupe en "
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Supprimer le groupe"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Voulez-vous réellement supprimer ce groupe?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Supprimer des membres"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Voulez-vous vraiment supprimer %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Quitter"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Ajouter aux contacts"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Quitter le groupe"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Êtes-vous certain de vouloir quitter ce groupe ?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Rejoindre le groupe"
@@ -1805,12 +1938,29 @@ msgstr "Membres : "
 msgid "Verification Message"
 msgstr "Message de vérification"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Index du Wiki"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Pas de page d'index."
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Créer"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Ce groupe n'a pas de wiki actuellement"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1818,82 +1968,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile Wiki vous permet d'organiser vos connaissances d'une manière simple. Le contenu du wiki est stocké dans une bibliothèque normale avec une structure de fichier/dossier prédéfinie. Cela vous permet de modifier votre wiki sur votre ordinateur, puis de le synchroniser avec le serveur."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Créer un wiki maintenant"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Choisissez une librairie comme wiki"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Créer un wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Pages du wiki"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Choisissez une librairie comme wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Veuillez cliquer puis choisissez une bibliothèque."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Home"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Pages"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Historique du wiki"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Nouvelle page"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Supprimer la page"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Éditer la page"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Historique de la page"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Dernière modification par %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Êtes-vous  sur de vouloir supprimer cette page ?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Le nom est requis."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "La description est requise."
 
@@ -1940,10 +2113,12 @@ msgstr "Ajouter des membres"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr " Ajouter"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "emails, séparés par ','"
 
@@ -1959,7 +2134,8 @@ msgstr "Astuce : les emails devraient être déjà inscrits."
 msgid "Add administrators"
 msgstr "Ajouter des administrateurs"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Veuillez entrer des adresses mails ou les sélectionner."
 
@@ -2008,7 +2184,7 @@ msgstr "Partager avec un groupe"
 #: seahub/help/templates/help/help_base.html:18
 #: seahub/help/templates/help/help_view_encrypted.html:8
 msgid "Viewing an encrypted library"
-msgstr "Voir une bibliothèque cryptée"
+msgstr "Voir une bibliothèque chiffrée"
 
 #: seahub/help/templates/help/help_colab.html:8
 msgid ""
@@ -2177,7 +2353,7 @@ msgstr "Cliquer sur le bouton \"Télécharger\" pour télécharger une biblioth
 msgid ""
 "Then you add some files into the library. They will be automatically synced "
 "with cloud platform."
-msgstr "Puis vous ajoutez des fichiers dans la bibliothèque. Ils seront automatiquement synchronisés dans le cloud."
+msgstr "Quand vous ajoutez des fichiers dans la bibliothèque. Ils seront automatiquement synchronisés dans le cloud."
 
 #: seahub/help/templates/help/help_install_v2.html:32
 msgid "4. (Optional) Create a library"
@@ -2189,14 +2365,14 @@ msgstr "Vous pouvez aussi créer une bibliothèque depuis un dossier local."
 
 #: seahub/help/templates/help/help_security.html:7
 msgid "Encrypting a file library"
-msgstr "Crypter une bibliothèque de fichier"
+msgstr "Chiffrer une bibliothèque de fichier"
 
 #: seahub/help/templates/help/help_security.html:8
 msgid ""
 "Seafile supports encryption of file libraries to strengthen your data "
 "security. To encrypt a file library, you need to set a password when you "
 "create a library."
-msgstr "Seafile supporte le cryptage de bibliothèques de fichiers pour renforcer la sécurité de vos informations. Pour crypter une bibliothèque de fichiers, vous devez mettre un mot de passe quand vous créez une bibliothèque."
+msgstr "Seafile supporte le chiffrage de bibliothèques de fichiers pour renforcer la sécurité de vos informations. Pour chiffrer une bibliothèque de fichiers, vous devez mettre un mot de passe quand vous créez une bibliothèque."
 
 #: seahub/help/templates/help/help_security.html:10
 msgid "The password won't be stored on Seafile cloud platform."
@@ -2206,14 +2382,14 @@ msgstr "Le mot de passe ne sera pas enregistré sur la plateforme de Cloud Seafi
 msgid ""
 "So even the adminastrator of the servers cannot view your encrypted data "
 "without the password."
-msgstr "Donc même les administrateurs des serveurs ne peuvent pas voir vos données cryptées sans le mot de passe."
+msgstr "Donc même les administrateurs des serveurs ne peuvent pas voir vos données chiffrées sans le mot de passe."
 
 #: seahub/help/templates/help/help_security.html:12
 msgid ""
 "To download and sync an encrypted library to your computer, you need to "
 "provide the password.  Seafile client program will download the encrypted "
 "data and decrypt it on your computer."
-msgstr "Pour télécharger et synchroniser une bibliothèque cryptée sur votre ordinateur, vous devez fournir le mot de passe. Le client Seafile téléchargera les données cryptées et les décryptera sur votre ordinateur."
+msgstr "Pour télécharger et synchroniser une bibliothèque chiffrée sur votre ordinateur, vous devez fournir le mot de passe. Le client Seafile téléchargera les données chiffrées et les déchiffrera sur votre ordinateur."
 
 #: seahub/help/templates/help/help_security.html:13
 msgid "The password can only be set when you create the library."
@@ -2236,137 +2412,121 @@ msgid ""
 "library. Your password is only stored in the server's encrypted memory. It "
 "would be cleared from the memory in an hour. After that, if you want to view"
 " the library, you'll have to enter password again."
-msgstr "Les serveurs Seafile ne stockent pas le mot de passe d'une bibliothèque cryptée. \n\nPour voir une bibliothèque cryptée en ligne, vous devez fournir le mot de passe. Votre mot de passe est seulement stocké dans la mémoire cryptée du serveur. \n\nLe mot de passe sera supprimé de la mémoire dans une heure. Après cela, si vous voulez voir la bibliothèque, vous devrez entrer le mot de passe à nouveau."
+msgstr "Les serveurs Seafile ne stockent pas le mot de passe d'une bibliothèque chiffrée. \n\nPour voir une bibliothèque chiffrée en ligne, vous devez fournir le mot de passe. Votre mot de passe est seulement stocké dans la mémoire chiffrée du serveur. \n\nLe mot de passe sera supprimé de la mémoire dans une heure. Après cela, si vous voulez voir la bibliothèque, vous devrez entrer le mot de passe à nouveau."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "un message est requis"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "Un contact est requis"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Vous ne pouvez pas envoyer de messages à vous-même."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Échec de l'envoi du message à %s, l'utilisateur n'existe pas."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Messages"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nouveau Message"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Message"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Heure"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "Message..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Ajouter des fichiers"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "Envoyer à : cliquez pour sélectionner les contacts"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "Veuillez d'abord ajouter des contacts."
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Échec de la récupération des contacts pour envoyer un message."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Vous n'avez pas encore de bibliothèques"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Messages avec %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Envoi du message..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Un fichier nommé %(file_name)s a été envoyé dans votre dossier %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s a partagé une bibliothèque nommée %(repo_name)s avec vous."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s a partagé un fichier nommé %(file_name)s avec vous."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr "Vous avez reçu un nouveau message de %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s a une nouvelle discussion"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s a posté une nouvelle discussion %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "Une discussion de groupe a une nouvelle réponse"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s a répondu à votre discussion de groupe"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s a demandé à
 msgid "Successfully cleared all notices."
 msgstr "Effacement de toutes les notifications avec succès."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Ajouter une nouvelle notification"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr "Bonjour %(name)s,"
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] "\nVous avez une nouvelle notification sur %(site_name)s.\n"
+msgstr[1] "\nVous avez %(num)s nouvelles notifications sur %(site_name)s.\n"
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr "Allez vérifier à la page suivante:"
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Toutes les notifications"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Ajouter une nouvelle notification"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Détail de la notification"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(Notification actuelle)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Activer"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Vide"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Supprimer la notification"
 
@@ -2426,30 +2606,30 @@ msgstr "Plus"
 
 #: seahub/options/templates/options/set_user_options.html:7
 msgid "Please choose how to view encrypted libraries online:"
-msgstr "Veuillez choisir comment voir les bibliothèques cryptées en ligne : "
+msgstr "Veuillez choisir comment voir les bibliothèques chiffrées en ligne : "
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Envoyer les mots de passe au serveur."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
-msgstr "Les fichiers seront décryptés sur le serveur avant de vous être envoyés."
+msgstr "Les fichiers seront déchiffrés sur le serveur avant de vous être envoyés."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Sauvegarder les mots de passe dans votre navigateur."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
-msgstr "Les fichiers seront décryptés dans votre navigateur quand vous les téléchargerez"
+msgstr "Les fichiers seront déchiffrés dans votre navigateur quand vous les téléchargerez"
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2481,81 +2661,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "%s définie comme votre bibliothèque par défaut avec succès."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Paramètre du profil"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Profil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
-msgid "Encrypted Libraries"
-msgstr "Bibliothèques cryptées"
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Langage"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:13
+msgid "Encrypted Libraries"
+msgstr "Bibliothèques chiffrées"
+
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Sous-bibliothèque"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Bibliothèque par défaut"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Supprimer le compte"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Avatar :"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Nom : "
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "À propos de moi :"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Département :"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "téléphone :"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Paramètre de langage"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
-msgstr "Paramètres de la bibliothèque cryptée"
+msgstr "Paramètres de la bibliothèque chiffrée"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
-msgstr "Comment voir les bibliothèques cryptées en ligne: "
+msgstr "Comment voir les bibliothèques chiffrée en ligne: "
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Paramètres de la sous-bibliothèque"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Activer les sous-bibliothèques"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2564,7 +2751,7 @@ msgid ""
 "library."
 msgstr "Cette fonctionnalité vous permet de sélectivement synchroniser un dossier à l'intérieur d'une bibliothèque. Une sous-bibliothèque peut être créée à partir de n'importe quel dossier. Après sa création, elle sera affichée dans votre client de bureau et vous pourrez la télécharger comme une bibliothèque normale. Les fichiers de la sous-bibliothèque seront automatiquement synchronisés avec ceux présents dans le dossier de la bibliothèque d'origine."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2572,37 +2759,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "La sous-bibliothèque est aussi utilisée pour partager un dossier avec un groupe ou un autre utilisateur. En cas de partage et sans cette option activée, une sous-bibliothèque cachée est automatiquement créée. Avec cette option activée, ces sous-bibliothèques cachées seront aussi affichées, ce qui vous permettra de les gérer."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Paramètres de la bibliothèque par défaut"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Votre bibliothèque par défaut :"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Votre bibliothèque par défaut est l'espace par défaut où sont stockés vos images et vos documents personnels"
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Choisir la bibliothèque par défaut"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Cette opération est irréversible. Veuillez y réfléchir à deux fois !"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Choisir la bibliothèque par défaut :"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Veuillez cliquer puis choisissez une bibliothèque."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Voulez-vous vraiment supprimer ce compte ?"
 
@@ -2615,25 +2798,25 @@ msgid "Info"
 msgstr "Info"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Nom"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Auto-introduction"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Département"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Téléphone"
 
@@ -2641,169 +2824,171 @@ msgstr "Téléphone"
 msgid "Email is not longer than 512 characters"
 msgstr "L'email ne peut pas dépasser 512 caractères."
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Échec de partage avec tous les membres, veuillez réessayer plus tard."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Partagé avec tous les membres avec succès, vous pouvez vérifier sur Partages."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" est déjà dans le groupe %(group)s. Voir"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Échec du partage de %(repo)s avec %(group)s, veuillez réessayer plus tard."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Partagé avec %(group)s avec succès, vous pouvez vérifier sur Partages."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Vous ne pouvez pas partager une bibliothèque avec vous-même."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Échec du partage avec %s, veuillez réessayer plus tard."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Partage avec %(email)s réussi，allez vérifier sur Partages."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Impossible de partager avec %s, car l'email n'est pas enregistré."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Seul le propriétaire de la bibliothèque a l'autorisation de la partager."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Échec du partage de \"%s\", pas assez de quota. Mettez à jour le compte."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "L'argument est invalide"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Échec de suppression du partage."
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "l'id du groupe n'est pas valide."
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Partage supprimé avec succès"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "Tous les membres"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Arguments non valides"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Vous ne pouvez pas partager la bibliothèque de cette façon."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Impossible d'obtenir le lien, veuillez réessayer plus tard."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Supprimé avec succès"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Le lien n'existe pas"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "L'envoi du lien partagé a échoué. Le service d'email n'est pas configuré correctement, veuillez contacter l'administrateur."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Une personne a partagé un fichier avec vous sur Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr "Un fichier a été partagé avec vous sur %s"
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Erreur interne du serveur. Échec d'envoi."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Envoyé avec succès."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Veuillez choisir un dossier."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Sauvegardé avec succès."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Impossible de partager avec \"%s\", utilisateur non trouvé."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Partage de %s avec succès."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Annulation du partage de \"%s\"avec succès."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "Vous n'avez pas l'autorisation d'annuler le partage %s."
+msgid "You don't have permission to unshare %s."
+msgstr "Vous n'avez pas l'autorisation d'annuler le partage %s"
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Vous n'avez pas l'autorisation de sauvegarder %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Impossible d'obtenir le lien, veuillez réessayer plus tard."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "L'envoi du lien d'envoi a échoué. Le service d'email n'est pas configuré correctement, veuillez contacter l'administrateur."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Une personne a partagé avec vous un lien d'envoi sur Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr "Un lien d'envoi a été partagé pour vous sur %s"
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2824,14 +3009,15 @@ msgstr "Visites"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Voir"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -2860,7 +3046,7 @@ msgid "Folders - Share"
 msgstr "Dossiers - Partage"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -2885,13 +3071,13 @@ msgid ""
 msgstr "Vous pouvez partager un dossier seul avec un utilisateur enregistré si vous ne voulez pas partager une bibliothèque entière."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "L\\'édition a réussi"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "L'édition a échoué."
@@ -2958,7 +3144,7 @@ msgstr "Partages"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Informations de base"
 
@@ -2971,7 +3157,8 @@ msgid "Add to contacts"
 msgstr "Ajouter aux contacts"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Quitter le partage"
 
@@ -2992,56 +3179,24 @@ msgstr "Activités"
 msgid "Exit System Admin"
 msgstr "Quitter l'administration"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Notifications"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Liens"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Administration"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "Notifications non-lues"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Connexion"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "S'enregistrer"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Déconnexion"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Version du serveur : "
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Administration"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Contactez-nous"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Tous les groupes"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Clients"
 
@@ -3049,7 +3204,7 @@ msgstr "Clients"
 msgid "Client Name"
 msgstr "Nom du client"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3088,30 +3243,82 @@ msgstr "Annulation de la synchronisation avec succès"
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept on the server for only 1 hour."
-msgstr "Cette bibliothèque est cryptée. Veuillez entrer le mot de passe si vous voulez la parcourir en ligne. Le mot de passe est conservé sur le serveur pendant 1 heure."
+msgstr "Cette bibliothèque est chiffrée. Veuillez entrer le mot de passe si vous voulez la parcourir en ligne. Le mot de passe est conservé sur le serveur pendant 1 heure."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Vous pouvez changer comment voir les bibliothèques en ligne ici."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Veuillez entrer le mot de passe."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Périphériques"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Plateforme"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Nom du périphérqiue"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Dernier accès"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Bilbliothèques"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Opération"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Annuler le lien"
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "Voulez-vous vraiment annuler le lien %s ?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "Cela arrêtera immédiatement le synchronisation."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "Vous n'avez pas de périphériques connectés"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "Vos clients (Desktop/Android/iOS) seront affichés ici."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Le lien a été annulé avec succès"
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3121,8 +3328,7 @@ msgstr "Télécharger"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Chemin d'accès actuel : "
 
@@ -3437,9 +3643,9 @@ msgid "Password is required."
 msgstr "Le mot de passe est requis."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Historique"
@@ -3458,16 +3664,11 @@ msgstr "Astuce : une nouvelle version sera générée après chaque modification
 msgid "Current Path:"
 msgstr "Chemin d'accès actuel :"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Dernier modificateur"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Taille"
 
@@ -3475,38 +3676,55 @@ msgstr "Taille"
 msgid "(current version)"
 msgstr "(version actuelle)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Renommé ou déplacé de %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Restaurer"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Diff"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Documents"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introduction"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Aide"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Client"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile pour Windows, Mac et Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Version du serveur : "
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Contactez-nous"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3535,12 +3753,13 @@ msgstr " : Corbeille"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Retour à la bibliothèque"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3555,36 +3774,57 @@ msgstr "Personnel"
 msgid "Starred"
 msgstr "Favoris"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Wiki personnel"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Mes Partages"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Liens"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Groupe"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Aucune bibliothèque n'est partagée avec votre groupe"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Aucune bibliothèque n'est partagée avec vous"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Bienvenue sur Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile organise les fichiers dans des bibliothèques. Chaque bibliothèque peut être synchronisée et partagée séparément. Nous avons créé une bibliothèque personnelle pour vous. Vous pourrez créer plus de bibliothèques plus tard."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Fermer"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Dossier personnel"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organisation"
@@ -3595,11 +3835,11 @@ msgid ""
 "current account."
 msgstr "L'organisation sera supprimée dans la prochaine version, les données seront fusionnées dans votre compte actuel."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3621,420 +3861,452 @@ msgstr "Personne n'a encore créé de groupes"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Vous pouvez cliquer sur le bouton \"Ajouter un groupe\" sous l'étiquette de \"Groupe\" pour créer un groupe. "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Partagé par"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Aucune bibliothèque publique"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Vous pouvez créer une bibliothèque publique en cliquant sur le bouton  \"Nouvelle bibliothèque \", d'autres peuvent consulter et télécharger cette bibliothèque."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Corbeille"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Chercher des membres..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Taille : "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Corbeille"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Déplacer"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copier"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Importer des fichiers"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Le propriétaire de cette bibliothèque est à court d'espace."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Veuillez d'abord sélectionner un fichier."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Ajouter des fichiers"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Démarrer tout"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Annuler tout"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Glisser et déposer est supporté par Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "La taille du fichier doit être plus petite que %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Mettre à jour %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Choisir un fichier"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Plus petit que %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nom du dossier"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nouveau fichier"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Type de fichier recommandé"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Cliquez pour choisir"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Format de texte enrichi en ligne."
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "Format de balisage simple."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nom de fichier"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Bibliothèque en cours"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Autres bibliothèques"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Veuillez cliquer puis choisir un dossier."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Renommage de %(name)s en :"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Synchroniser %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Une sous-bibliothèque sera créée depuis ce dossier. Elle sera affichée dans votre client de bureau et vous pourrez la télécharger comme une bibliothèque normale."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Créer"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
-msgstr "Cette bibliothèque est cryptée. Veuillez entrer le mot de passe si vous voulez la parcourir en ligne. Le mot de passe est conservé sur le serveur pendant 1 heure."
+msgstr "Cette bibliothèque est chiffré. Veuillez entrer le mot de passe si vous voulez la parcourir en ligne. Le mot de passe est conservé sur le serveur pendant 1 heure."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Le fichier est trop gros"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Le fichier est trop petit"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Ce type de fichier n'est pas autorisé"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Le nombre de fichiers maximum est dépassé"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Le nombre d'octets envoyés dépasse la taille du fichier"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Résultat d'envoi du fichier vide"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Erreur "
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Démarrer"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Supprimer des éléments"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Êtes-vous certain de vouloir supprimer les éléments sélectionnés ?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Traitement ..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Suppression avec succès de %(name)s et %(amount)s autres éléments."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Suppression avec succès de %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Erreur interne. Impossible de supprimer %(name)s et %(amount)s autres éléments."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Erreur interne. Impossible de supprimer  %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Déplacer les répertoires/fichiers sélectionnés vers :"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Copier les répertoires/fichiers sélectionnés vers :"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Chemin de destination invalide"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Déplacement réussi de %(name)s et %(amount)s  autres éléments."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Déplacement avec succès de %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Copie réussie de %(name)s et %(amount)s autres éléments."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Copie avec succès de %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Erreur interne. Impossible de déplacer  %(name)s et %(amount)s autres éléments."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Erreur interne. Impossible de déplacer  %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Erreur interne. Impossible de copier  %(name)s et %(amount)s autres éléments."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Erreur interne. Impossible de copier  %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Déplacement en cours ..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Copie en cours..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "%(s_num)s éléments déplacés avec succès."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "Echec du déplacement de %(f_num)s  éléments. "
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "%(s_num)s éléments copiés avec succès."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Echec"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
-msgstr "Cryptage du fichier ..."
+msgstr "Chiffrage du fichier ..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
-msgstr "Erreur lors du cryptage."
+msgstr "Erreur lors du chiffrage."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Chiffrage de %(num)s% terminé."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Envoi ..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Terminé !"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Téléchargement ..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Téléchargement de %(num)s% terminé."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
-msgstr " Décryptage ..."
+msgstr "Déchiffrage ..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Déchiffrage de %(num)s% terminé."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "%(name)s a été supprimé avec succès"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Renommer le dossier"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Copier le fichier"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Déplacer le fichier"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Copier le dossier"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Déplacer le dossier"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Copie de %(name)s vers :"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Déplacement de %(name)s vers :"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Le téléchargement de dossier n'est pas pris en charge dans cette bibliothèque."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "Retiré des favoris"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "favoris"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "La sous-bibliothèque est créée."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "C'est requis."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Seulement une extension ici, entrez un nom."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Création ..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Vous ne l'avez pas renommé."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Renommé avec succès de %(old_name)s en %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Annulé."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Veuillez sélectionner au moins un contact."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Veuillez entrer des adresses mails ou des groupes ou les sélectionner."
 
@@ -4056,11 +4328,12 @@ msgstr "Astuce : Une capture instantanée est générée après la modification.
 msgid "View Snapshot"
 msgstr "Voir instantané"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Par page : "
@@ -4101,34 +4374,78 @@ msgstr "tout"
 msgid "Delete Time"
 msgstr "Date de suppression"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Paramètres de la bibliothèque"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Conserver un historique complet"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Ne pas gardez l'historique"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Ne conserver qu'une période de l'historique :"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "jours"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Transfert de propriété"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Transférer cette bibliothèque à un autre utilisateur :"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Changement de mot de passe"
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Changement du mot de passe de la bibliothèque:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Ancien mot de passe"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Nouveau mot de passe( 6 caractères minimum)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Mot de passe à nouveau"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Veuillez entrer l'ancien mot de passe"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Veuillez entrer le nouveau mot de passe"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "Le nouveau mot de passe est trop court"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "Le nouveau mot de passe est trop long ( 35 caractères au maximum)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Veuillez entrer le mot de passe à nouveau"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Les nouveaux mots de passe ne correspondent pas"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Retour à l'historique des modifications"
@@ -4137,6 +4454,10 @@ msgstr "Retour à l'historique des modifications"
 msgid "Create Time"
 msgstr "Date de création"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Dernier modificateur"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4179,8 +4500,14 @@ msgstr "Votre client Seafile est périmé, veuillez le mettre à niveau avec la
 msgid "Click to download."
 msgstr "Cliquez ici pour télécharger."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Veuillez saisir le mot de passe si vous voulez afficher les dossiers/fichiers partagés. Le mot de passe sera conservé seulement 1 heure sur le serveur"
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Partage par : "
 
@@ -4192,25 +4519,26 @@ msgstr "Enregistrer sous ..."
 msgid "Save To:"
 msgstr "Enregistrer vers :"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Bonjour,"
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Vous recevez cet email car %(email)s partage un fichier avec vous sur %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s a partagé un fichier avec vous sur %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Rendez-vous sur la page suivante et afficher le fichier :"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Vous recevez cet email car %(email)s partage un lien d'envoi avec vous sur %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s a partagé un lien d'envoi avec vous sur %(site_name)s:"
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Rendez-vous sur la page suivante et envoyez des fichiers :"
 
@@ -4222,8 +4550,8 @@ msgstr "Favoris"
 msgid "icon"
 msgstr "icône"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Décocher"
 
@@ -4278,49 +4606,49 @@ msgstr "vers"
 msgid "Sorry, this user is not registered yet."
 msgstr "Désolé, cet utilisateur n'est pas encore enregistré."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Favoris"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "mise à jour de ce fichier"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "Un participant"
 msgstr[1] "%(counter)s participants"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Enlevé des favoris avec succès"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Ajouté aux favoris avec succès"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "Vous pouvez aussi utiliser la touche ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "Précédent"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "Vous pouvez aussi utiliser la touche → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "suivant"
 
@@ -4339,7 +4667,7 @@ msgid "auto detect"
 msgstr "détection automatique"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Plein écran"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "chargement ..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Pour la consultation en ligne, vous pouvez utiliser Internet Explorer 10 ou d\\'autres navigateurs, comme Firefox."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Pour le consulter en ligne, vous pouvez utiliser Firefox, Google Chrome ou Internet Explorer 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Ce type de fichier ne peut pas être consulté en ligne."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4386,41 +4714,55 @@ msgstr "Envoyer des fichiers vers %(dir_name)s"
 msgid "shared by:"
 msgstr "partagé par :"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Connexion"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(Mot de passe oublié)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Pas clair? Rafraîchissez-le."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Mot de passe ou email incorrect"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Se souvenir de moi pendant %(remember_days)s jours"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "S'enregistrer"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Impossible de rafraichir le CAPTCHA, veuillez essayer ultérieurement."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "L\\'adresse mail ne peut pas être vide"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Mot de passe ne peut pas être vide"
 
@@ -4474,13 +4816,13 @@ msgstr "Mot de passe réinitialisé avec succès."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Réinitialisation du mot de passe"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Introduisez un nouveau mot de passe."
+msgid "Reset Password"
+msgstr "Réinitialisation du mot de passe"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4491,23 +4833,19 @@ msgid "Password Reset Successfully"
 msgstr "Mot de passe réinitialisé avec succès"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Nous vous avons envoyé un email de réinitialisation de votre mot de passe à votre adresse mail."
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Un message de réinitialisation de mot de passe a été envoyé dans votre boites aux lettres."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Vous recevez cet email car vous avez demandé une réinitialisation de votre mot de passe sur %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "Pour réinitialiser le mot de passe de votre compte %(account)s sur %(site_name)s, cliquez sur le lien suivant:: "
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Rendez-vous sur la page suivante et choisissez un nouveau mot de passe :"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Votre nom d'utilisateur, au cas où vous l'auriez oublié :"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Si vous ne le demandez pas, passez à la suite."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4537,23 +4875,31 @@ msgstr "Enregistrement terminé, veuillez attendre qu'un administrateur active v
 msgid "Register"
 msgstr "S'inscrire"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Bienvenue, vous êtes déjà connecté."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Confirmer mot de passe"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "S'inscrire"
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Veuillez à nouveau entrer le mot de passe"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Les mots de passe ne correspondent pas"
 
@@ -4573,12 +4919,6 @@ msgstr " est trop grand. La taille maximale autorisée est de 1 Mo."
 msgid "Discuss"
 msgstr "Discuter"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Groupe"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Veuillez sélectionnez au moins 1 groupe."
@@ -4587,10 +4927,6 @@ msgstr "Veuillez sélectionnez au moins 1 groupe."
 msgid "Please input a discussion."
 msgstr "Veuillez commencer une discussion."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Généré par le système"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4609,42 +4945,66 @@ msgstr "Lien d'envoi"
 msgid "Private Share"
 msgstr "Partage privé"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Mot de passe utilisateur"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(6 caractères au minimum)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Mot de passe à nouveau"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Fixer l'expiration"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Jours"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Générer"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Lien : "
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Envoyer"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Envoyer à :"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Emails, séparés par ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Envoi ..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Vous pouvez partager le lien généré avec d'autres. Ils pourront ensuite envoyer des fichiers dans ce dossier."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Lien d'envoi :"
 
@@ -4697,7 +5057,7 @@ msgid "Sub-libraries"
 msgstr "Sous-bibliothèques"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Partagées"
 
@@ -4728,29 +5088,23 @@ msgid ""
 " library."
 msgstr "Vous pouvez créer une sous-bibliothèque à partir d'un dossier situé dans une bibliothèque. Une sous-bibliothèque peut être indépendamment synchronisée et partagée. Les fichiers de la sous-bibliothèque seront automatiquement synchronisés avec ceux du dossier de la bibliothèque d'origine."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Aucune bibliothèque n'est partagée avec vous"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Aucune bibliothèque n'est partagée avec votre groupe"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Le fichier est en cours de traitement, veuillez patienter ..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "Cacher les réponses"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "voir le plan"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Échec de conversion du document."
 
@@ -4760,34 +5114,36 @@ msgstr "Autorisation de partage"
 
 #: seahub/templates/snippets/repo_create_form.html:18
 msgid "Encrypt"
-msgstr "Crypter"
+msgstr "Chiffrer"
 
 #: seahub/templates/snippets/repo_create_form.html:20
 #, python-format
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(Au moins %(repo_password_min_length)s caractères)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Mot de passe à nouveau"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Le nom est requis."
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "La description est requise"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Veuillez entrer le mot de passe"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Le mot de passe est trop court"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Le mot de passe est trop long (le maximum est de 35 caractères)"
 
@@ -4800,7 +5156,7 @@ msgstr "Suppression avec succès."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Voulez-vous vraiment supprimer %(lib_name)s ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Importer"
 
@@ -4927,15 +5283,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Veuillez choisir au moins un type de fichier ou saisissez au moins une extension de fichier."
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Sélectionner des contacts"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Veuillez saisir au moins un email."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Veuillez entrer des jours"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Veuillez entrer des jours valides"
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4948,7 +5312,7 @@ msgstr "Par moi"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Partage"
 
@@ -4960,6 +5324,22 @@ msgstr "Bande passante de ce mois."
 msgid "Payment"
 msgstr "Paiement"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Notifications"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Trafic"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Logs"
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Transférer la bibliothèque"
@@ -4970,74 +5350,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Transférer %(lib_name)s à :"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Tous les groupes"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Créateur"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Créé le"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Supprimer le groupe"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Chercher des utilisateurs..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Base de données"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Chercher"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Créé le / Dernière connexion"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Espace utilisé"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Chercher des bibliothèques par leur nom..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Toute"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Orphelines"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Système"
 
@@ -5053,96 +5433,117 @@ msgstr "Préfixe de l'adresse"
 msgid "Delete Organization"
 msgstr "Supprimer l'organisation"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Tous les liens publics"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr " Nombre de vues"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Chercher une bibliothèque"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Astuce : vous pouvez chercher par mot clé dans le nom, par propriétaire ou les deux."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Résultat"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Aucun résultat"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Ajouter un nouvel utilisateur"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Trafic de l'utilisateur"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Mois:"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Utilisateur"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Usage total"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr "Ajouter un administrateur"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Ajouter des administrateurs"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr "Astuce: les emails doivent correspondre à des utilisateurs déjà ajoutés."
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Activation..., veuillez patienter"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "Votre compte %(username)s sur %(site_name)s a été activé."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Vous recevez cet email car %(user)s vous a ajouté à l'organisation \"%(org.org_name)s\" sur %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s vous invite à rejoindre l'organisation \"%(org_name)s\" sur %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Vous recevez cet email car %(user)s vous a ajouté sur %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s vous invite à joindre %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "Voici les informations de votre compte :"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr "Informations de votre compte:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Email : %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Mot de passe : %(password)s"
+msgid "Password: %(password)s"
+msgstr "Mot de passe: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Rendez-vous sur la page suivante et connectez-vous :"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Vous recevez cet email car votre mot de passe a été réinitialisé  sur %(site_name)s. "
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "Votre mot de passe sur %(site_name)s a été réinitialisé. votre mot de passe est maintenant %(password)s. Veuillez en changer dès que possible."
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Votre nouveau mot de passe est %(password)s, veuillez le modifier dès que possible."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Chercher un utilisateur"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Astuce : Utilisez * pour trouver n'importe quel nombre de caractères"
 
@@ -5156,7 +5557,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Êtes-vous certain de vouloir réinitialiser le mot de passe de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Révoquer les droits d'administrateur"
 
@@ -5166,7 +5567,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Êtes-vous certain de vouloir supprimer les droits d'administrateur à %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Définir en tant qu'administrateur"
 
@@ -5185,437 +5585,466 @@ msgid ""
 "configuration."
 msgstr "Édité avec succès, mais échec d\\'envoi de l'email, veuillez vérifier votre configuration."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Statut"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Actif"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Inactif"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Raz-Mdp"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Retour vers la liste des utilisateurs"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Utilisé"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Définir le quota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Définissez la limite de stockage utilisateur"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Astuce: 0 signifie aucune limite par défaut"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Utilisées"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Vous n'avez pas de wiki personnel"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "wiki personnel"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Pages du wiki personnel"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "Erreur de permission"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Impossible d'afficher la page de la corbeille"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "La bibliothèque n'existe pas."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Vous n'avez pas l'autorisation de réaliser cette action."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Échec de l'édition des informations de la bibliothèque."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Impossible d'enregistrer les paramètres sur le serveur"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Paramètres enregistrés."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Le nom d'utilisateur %s n'est pas valide."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "L'utilisateur %s est introuvable."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "La bibliothèque %(repo_name)s a été transférée à %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Le mot de passe de la bibliothèque %(repo_name)s a été mis à jour avec succès."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Le nom du fichier contient des caractères invalides"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Nom de fichier dupliqué"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "La taille du fichier dépasse la limite"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "L'espace du propriétaire est rempli, l'import a échoué"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Une erreur s'est produite pendant le transfert de fichiers"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "L'adresse n'est pas valide"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Impossible d'afficher les modifications de la bibliothèque"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Impossible d'afficher les instantanés de bibliothèque"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Vous n'avez pas l'autorisation de restaurer la bibliothèque"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Veuillez préciser l'ID de l'historique"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "La bibliothèque n'existe pas"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "L'historique que vous avez spécifié n'existe pas"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Pas de conflit dans la fusion."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Ma Bibliothèque"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Impossible de d'annuler le partage de la bibliothèque car il n'existe pas."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Partage \"%s\" annulé avec succès."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Impossible d'annuler le partage \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Impossible de supprimer le fichier."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s supprimé avec succès."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Erreur interne. Impossible de supprimer %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Impossible d'accéder au fichier"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "La bibliothèque n'a pu être téléchargée, impossible de trouver le serveur"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Paramètre de serveur invalide"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Retour en arrière réussi %(path)s vers dossier racine."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Retour en arrière réussi %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Retour en arrière réussi %(path)s vers dossier racine."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Impossible de télécharger le dossier \"%s\": la taille est trop grande."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Impossible de télécharger \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Activation de \"Wiki personnel\" avec succès."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Désactivation de \"Wiki personnel\" avec succès."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Vous n'avez pas l'autorisation d’accéder à la bibliothèque"
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Aucun chemin."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Le groupe n'existe pas"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Autorisation refusée"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Autorisation refusée"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
-msgstr "La bibliothèque est cryptée."
+msgstr "La bibliothèque est chiffrée."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Erreur : pas d'ID de commit de tête"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Argument manquant."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Le chemin de destination est trop long."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Déplacement réussi de %(name)s voir"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Copie réussie de %(name)s voir"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Impossible de déplacer le dossier %(src)s vers son sous-dossier %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Impossible de copier le dossier %(src)s vers son sous-dossier %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Le chemin de destination est trop long pour %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Impossible de récupérer la liste des blocs du fichier"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Mauvais id de repo"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "La librairie système ne peux pas être supprimée."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTPError: impossible d'ouvrir le fichier en ligne"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URLError: impossible d'ouvrir le fichier en ligne"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "L'encodage que vous avez choisi n'est pas approprié."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codage de fichier inconnu"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "La taille du fichier dépasse %s, il ne peut donc pas être visionné en ligne."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Impossible d'afficher le fichier"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Format de fichier invalide."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "La bibliothèque n'existe pas."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
-msgstr "La bibliothèque est cryptée."
+msgstr "La bibliothèque est chiffrée."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Impossible de modifier le fichier"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Le fichier n'existe pas."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "L'édition en ligne n'est pas possible pour ce type de fichier."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Impossible de définir le quota : erreur interne"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "%s a été correctement supprimé."
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Impossible de supprimer : l'utilisateur n'existe pas"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s ajouté comme administrateur avec succès"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Impossible de définir en tant qu'administrateur : l'utilisateur n'existe pas"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Permissions administrateur de %s supprimées avec succès"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Impossible de supprimer les droits administrateur : l'utilisateur n'existe pas"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Activation de \"%s\"avec succès."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Impossible d'activer : l'utilisateur n'existe pas."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Désactivation de \"%s\" avec succès."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Impossible de désactiver : l'utilisateur n'existe pas."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Votre compte sur %s a été activé"
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "Le mot de passe a été réinitialisé sur %s"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Mot de passe remplacé par %(passwd)s avec succès, un email à été envoyé à %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Mot de passe remplacé par %(passwd)s avec succès, mais impossible d'envoyer l'email à %(user)s, veuillez vérifier la configuration de vos emails."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Mot de passe de l'utilisateur %(user)s remplacé par %(passwd)s avec succès."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5623,47 +6052,53 @@ msgid ""
 "configured."
 msgstr "Le mot de passe de l'utilisateur %(user)s a été remplacé par %(passwd)s avec succès. Malheureusement la notification par email ne peut pas être envoyée : le service de courrier électronique n'est pas configuré correctement."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Impossible de réinitialiser le mot de passe : l'utilisateur n'existe pas"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Renseignements sur l'enregistrement de Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Vous été invité à joindre %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Utilisateur %s ajouté avec succès. Une notification par email a été envoyée."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Utilisateur %s ajouté avec succès. Une erreur s'est produite lors de l'envoi de notification par email, veuillez vérifier la configuration de vos emails."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "L'utilisateur %s a été ajouté avec succès."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "L'utilisateur %s a été ajouté avec succès. La notification par email ne peut être envoyée, le service de courrier électronique n'est pas configuré correctement."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Transféré avec succès."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Impossible de transférer, l'utilisateur %s n'a pas été trouvé"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Échec du transfert, arguments invalides."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "Echec d'attribution des droits d'administrateur à %s"
diff --git a/locale/he/LC_MESSAGES/django.po b/locale/he/LC_MESSAGES/django.po
index 44c370d2db..27f2455e2f 100644
--- a/locale/he/LC_MESSAGES/django.po
+++ b/locale/he/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-25 22:53+0000\n"
-"Last-Translator: Kunda\n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/seahub/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,175 +20,207 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "משתמש עם אימייל זה כבר"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "שני שדות הסיסמה אינם תואמים."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "השם אינו יכול להיות ריק"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "שם ארוך מדי (המקסימום הוא 255 תווים)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "התיאור לא יכול להיות ריק"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "תיאור ארוך מדי (המקסימום הוא 100 תווים)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "השם %s אינו תקין"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr ""
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "דרוש שם ישן"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "זה ארוך מִדַי."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "זה דרוש"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "השם \"%s\" אינו תקין"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "דרוש זיהוי המאגר"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "דרוש שם המשתמש"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "הסיסמא אינו יכול להישאר ריק"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "פורמט URL שגויה"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "סיסמא לא נכונה"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "שגיאת שרת פנימית"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "לפענח שגיאת ספרייה"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "דרוש כתובת אימייל"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "המכסה אינו יכול להיות ריק"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "המכסה נמוכה מדי (ערך מינימאלי הוא 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "דרוש שם הספרייה"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "דרוש תיאור לספרייה"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "אנא הכנס מספר"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "אנגלית"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "ספרדית מקסיקנית"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "עברית"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "לטבית"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "הולנדי"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "פורטוגזית, ברזיל"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "סלובקית"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "אוקראינית"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -197,8 +229,9 @@ msgid "File Collaboration Team Organization"
 msgstr ""
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr ""
 
@@ -210,16 +243,17 @@ msgstr ""
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -229,13 +263,13 @@ msgstr "קובץ"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -244,9 +278,9 @@ msgstr ""
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s תגובות"
@@ -257,43 +291,48 @@ msgstr ""
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "טוען..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "נכשל. נא בדוק הרשת."
 
@@ -342,6 +381,25 @@ msgstr "נא בדוק את הרשת."
 msgid "New Replies"
 msgstr "תגובות חדשות"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "הודעה"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr ""
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "מידע אישי"
@@ -355,10 +413,11 @@ msgid "Important dates"
 msgstr "תאריכים חשובים"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "קבוצות"
 
@@ -371,72 +430,74 @@ msgstr "סיסמא הוחלפה בהצלחה."
 msgid "Change password: %s"
 msgstr ""
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "שם משתמש"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "סיסמא"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr ""
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr ""
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr ""
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr ""
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "איפוס סיסמא על %s"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "סיסמא חדשה"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "אשר סיסמא חדשה"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "סיסמא ישנה"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "סיסמא )שוב("
 
@@ -474,7 +535,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr ""
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "אווטאר בשביל %s"
@@ -542,57 +603,62 @@ msgstr "האווטאר הנוכחי:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "שלח"
@@ -609,7 +675,7 @@ msgstr ""
 msgid "You have updated your avatar %(avatar)s."
 msgstr ""
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "האווטאר הברירת מחדל"
 
@@ -641,7 +707,7 @@ msgstr "טלפון"
 msgid "note"
 msgstr ""
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr ""
 
@@ -698,7 +764,7 @@ msgstr ""
 msgid "Recovered deleted directory"
 msgstr ""
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "השתנתה שם הספרייה או תיאור"
 
@@ -708,9 +774,9 @@ msgstr ""
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "כרגע"
 
@@ -746,42 +812,48 @@ msgstr[1] ""
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "קריאה-כתיבה"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "קריאה-בלבד"
 
@@ -790,33 +862,33 @@ msgstr "קריאה-בלבד"
 msgid "Email is required."
 msgstr "דרוש כתובת אימייל."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s אינו אימייל תקין."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr ""
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "נמחק בהצלחה %s"
@@ -841,10 +913,10 @@ msgstr "אימייל"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -852,45 +924,46 @@ msgstr "אימייל"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "שם"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "הערה"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -899,56 +972,64 @@ msgstr "הערה"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "פעולות"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "לערוך"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "למחוק"
 
@@ -964,17 +1045,19 @@ msgstr ""
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "אימייל"
 
@@ -999,8 +1082,8 @@ msgid "Delete Contact"
 msgstr "מחק איש קשר"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1076,400 +1159,415 @@ msgstr ""
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" אינו שם תקין"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "קיימת כבר קבוצה בשם זה."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr ""
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr ""
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "האימייל \"%s\" אינו תקין."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr ""
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "ההודעה לא קיימת"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "אין לך הרשאות מתאימות."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
 msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr ""
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "נוסף בהצלחה."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr ""
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr ""
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "הפעולה הצליחה."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "נכשל：%s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr ""
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr ""
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr ""
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr ""
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "שגיאה: הקבוצה לא קיימת."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr ""
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "שגיאה: אתה לא בקבוצת %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "שגיאה: הספרייה לא קיימת."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "שגיאה: אין נתיב."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr ""
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr ""
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr ""
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr ""
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr ""
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr ""
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "קובץ לא קיים"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr ""
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "שגיאת שרת פנימית"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr ""
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr ""
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr ""
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr ""
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
+msgid "Successfully deleted \"%s\"."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "תודה שהשתמשתם באתר שלנו!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "הסתר תגובות"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "השב"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "הוסף תגובה..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "בטל"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "קבוצה זו ציבורית."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr ""
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr ""
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "קבוצה זו ציבורית."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "סיפריות"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "ויקי"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "קבצים"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "חברים"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "מנהל"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "עזוב קבוצה"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr ""
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "הוסף שיחה..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "הוסף קבצים"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "קודם"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "הבא"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "באמת רוצה למחוק את הדיון הזה?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "כן"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "לא"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "נמחק בהצלחה"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "מחיקה נכשלה:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "נכשל."
 
@@ -1478,6 +1576,7 @@ msgid "Recent Changes"
 msgstr "שינויים אחרונים"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1486,77 +1585,58 @@ msgstr "ספרייה חדשה"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "תיאור"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "עודכן לאחרונה"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "שותף ע\"י"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr ""
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr ""
 
@@ -1572,7 +1652,7 @@ msgstr ""
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "בטל שיתוף"
 
@@ -1609,15 +1689,16 @@ msgid "Modified at"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1626,23 +1707,23 @@ msgid "Details"
 msgstr "פרטים"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -1661,15 +1742,43 @@ msgstr "סיסמא :"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr ""
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "בטל שיתוף ספרייה"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr ""
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr ""
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "לא נמצאה ספרייה ציבורות בקבוצה זו"
@@ -1686,14 +1795,25 @@ msgid ""
 "message: "
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "תודה שהשתמשתם באתר שלנו!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "מנהלים"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -1701,7 +1821,7 @@ msgstr "הגדרות"
 msgid "Add Members"
 msgstr "הוסף חברים"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "הוסף מנהלים"
 
@@ -1710,7 +1830,7 @@ msgid "Avatar"
 msgstr "אווטאר"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr ""
 
@@ -1729,7 +1849,7 @@ msgid "Make Public"
 msgstr ""
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "העבר"
 
@@ -1753,29 +1873,41 @@ msgstr ""
 msgid "Rename Group To"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "מחק חבר"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "באמת למחוק %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr ""
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "הוסף לאנשי קשר"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "עזוב קבוצה"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr ""
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "הצטרף לקבוצה"
@@ -1802,12 +1934,29 @@ msgstr "חברים:"
 msgid "Verification Message"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "צור"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1815,82 +1964,105 @@ msgid ""
 "back to the server."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "דף חדש"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "מחק דף"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "עריכת דף"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "דרוש תיאור לספרייה"
 
@@ -1937,10 +2109,12 @@ msgstr "הוסף חברים"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr ""
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr ""
 
@@ -1956,7 +2130,8 @@ msgstr ""
 msgid "Add administrators"
 msgstr "הוסף מנהלים"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr ""
 
@@ -2235,135 +2410,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr ""
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr ""
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "נחוץ איש קשר"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "לא ניתן לשלוח את ההודעה לעצמך."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "הודעה"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "הודעה חדשה"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "הודעה"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "זמן"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "הודעה..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "הוסף קבצים"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "שלח אל: לחץ על מנת לבחור אנשי קשר"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr ""
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr ""
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "לשלוח הודעה"
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr ""
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "שגיאה פנימית"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr ""
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr ""
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group ."
 msgstr ""
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr ""
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr ""
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr ""
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "רק לבעל הספרייה יש את ההרשאה לשתף את זה."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr ""
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr ""
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr ""
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr ""
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr ""
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "כל החברים"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr ""
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr ""
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr ""
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "הוסר בהצלחה"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "הקישור לא קיים"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
 msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "שגיאת שרת פנימית. שליחה נכשלה."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "נשלח בהצלחה."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr ""
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "נשמר בהצלחה."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr ""
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr ""
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr ""
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
+msgid "You don't have permission to unshare %s."
 msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "אין לך הרשאות לשמור %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr ""
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
 msgstr ""
 
 #: seahub/share/templates/share/links.html:5
@@ -2821,14 +3005,15 @@ msgstr "ביקורים"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "הצג"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "הסר"
 
@@ -2857,7 +3042,7 @@ msgid "Folders - Share"
 msgstr "תיקיות - שיתוף"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "תיקיות"
 
@@ -2882,13 +3067,13 @@ msgid ""
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "נערך בהצלחה"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "עריכה נכשלה."
@@ -2955,7 +3140,7 @@ msgstr ""
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "מידע בסיסי"
 
@@ -2968,7 +3153,8 @@ msgid "Add to contacts"
 msgstr "הוסף לאנשי קשר"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr ""
 
@@ -2989,56 +3175,24 @@ msgstr ""
 msgid "Exit System Admin"
 msgstr ""
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "משתמשים"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr ""
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "קישורים"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "מנהל מערכת"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "הודעות שלא נקראו"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "התחבר"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "הרשם"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "התנתק"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "גרסת שרת:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "מנהל מערכת"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "צור קשר"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr ""
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr ""
 
@@ -3046,7 +3200,7 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3087,28 +3241,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "סיסמא:"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "אנא הכנס את הסיסמא."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3118,8 +3324,7 @@ msgstr "הורדה"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr ""
 
@@ -3434,9 +3639,9 @@ msgid "Password is required."
 msgstr "נדרשת סיסמה."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr ""
@@ -3455,16 +3660,11 @@ msgstr ""
 msgid "Current Path:"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr ""
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "גודל"
 
@@ -3472,38 +3672,55 @@ msgstr "גודל"
 msgid "(current version)"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "שחזור"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr ""
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "מסמכים"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr ""
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "עזרה"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr ""
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr ""
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "גרסת שרת:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "צור קשר"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3532,12 +3749,13 @@ msgstr ""
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "חזור לספרייה"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3552,36 +3770,57 @@ msgstr ""
 msgid "Starred"
 msgstr ""
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "ויקי אישי"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr ""
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "קישורים"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "קבוצה"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr ""
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr ""
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "ברוכים הבאים ל-Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr ""
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "סגור"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr ""
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr ""
@@ -3592,11 +3831,11 @@ msgid ""
 "current account."
 msgstr ""
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3618,420 +3857,452 @@ msgstr ""
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr ""
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr ""
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "אין ספרייה ציבורית"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr ""
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "אשפה"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr ""
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "אשפה"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr ""
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "העתק"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "העלאת קבצים"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr ""
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr ""
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "הוסף קבצים"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr ""
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr ""
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr ""
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "שומר..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "עדכן %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "בחר קובץ"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "תיקייה חדשה"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "שם תיקייה"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "קובץ חדש"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr ""
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr ""
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr ""
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr ""
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "שם קובץ"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "ספרייה הנוכחית"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr ""
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr ""
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr ""
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "סנכרן %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr ""
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "צור"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr ""
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "קובץ גדול מדי"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "קובץ קטן מדי"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr ""
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr ""
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr ""
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr ""
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "שגיאה"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr ""
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "מחק פריטים"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr ""
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr ""
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "נמחק בהצלחה %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "שגיאה פנימית. נכשל ניסיון מחיקת %(name)s ו- %(amount)s פריטים אחרים."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "שגיאה פנימית. נכשל ניסיון מחיקת %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr ""
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr ""
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "שגיאה בעת הצפנה."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "העלאה..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr ""
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "מוריד..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr ""
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "נמחק בהצלחה %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr ""
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "העתקת קובץ"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "להעביר קובץ"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr ""
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr ""
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr ""
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "תת ספרייה נוצר."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "זה דרוש."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr ""
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr ""
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr ""
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "נא בחר איש קשר אחד לפחות."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr ""
 
@@ -4053,11 +4324,12 @@ msgstr ""
 msgid "View Snapshot"
 msgstr ""
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr ""
@@ -4098,34 +4370,78 @@ msgstr ""
 msgid "Delete Time"
 msgstr "למחוק זמן"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "הגדרות ספרייה"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr ""
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr ""
@@ -4134,6 +4450,10 @@ msgstr ""
 msgid "Create Time"
 msgstr ""
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4176,8 +4496,14 @@ msgstr ""
 msgid "Click to download."
 msgstr ""
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "שותף ע\"י:"
 
@@ -4189,25 +4515,26 @@ msgstr ""
 msgid "Save To:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr ""
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
 msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr ""
 
@@ -4219,8 +4546,8 @@ msgstr ""
 msgid "icon"
 msgstr ""
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr ""
 
@@ -4275,49 +4602,49 @@ msgstr ""
 msgid "Sorry, this user is not registered yet."
 msgstr ""
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] ""
 msgstr[1] ""
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr ""
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr ""
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "הבא"
 
@@ -4336,7 +4663,7 @@ msgid "auto detect"
 msgstr ""
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  / root directory."
 msgstr ""
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr ""
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr ""
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "שגיאה פנימית"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr ""
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr ""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "אין לך הרשאות מתאימות כדי לגשת לספרייה."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "ללא נתיב."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "הקבוצה לא קיימת"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr ""
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr ""
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "הספרייה מוצפנת"
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr ""
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr ""
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr ""
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr ""
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr ""
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr ""
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr ""
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr ""
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr ""
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "קידוד קובץ לא ידוע"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr ""
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "לא ניתן להציג קובץ"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "פורמט קובץ לא תקין."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "הספרייה לא קיימת"
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "הספרייה מוצפנת"
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr ""
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr ""
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr ""
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr ""
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "נמחק בהצלחה %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr ""
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, 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:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5620,47 +6048,53 @@ msgid ""
 "configured."
 msgstr ""
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr ""
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr ""
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, 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:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr ""
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "נכשל ניסיון העברה, משתמש %s לא נמצא"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr ""
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/hu/LC_MESSAGES/django.po b/locale/hu/LC_MESSAGES/django.po
index 9acedef609..5eea310a96 100644
--- a/locale/hu/LC_MESSAGES/django.po
+++ b/locale/hu/LC_MESSAGES/django.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-15 20:07+0000\n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-12 16:25+0000\n"
 "Last-Translator: szimszon \n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/seahub/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -22,175 +22,207 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Már van felhasználó ezzel az e-mail címmel"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "A megadott jelszavak nem egyeznek"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "A név mező kitöltése kötelező"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Túl hosszú név (maximum hossz: 255 karakter)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "A leírás mező kitöltése kötelező"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "A leírás túl hosszú (maximum hossz: 100 karakter)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Érvénytelen név: %s"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Hiányzó paraméter"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "A régi név megadása kötelező"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Túl hosszú"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Szükséges"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "%s érvénytelen név"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "A repo-azonosító kötelező"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "A felhasználónév kötelező"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "A jelszó megadása kötelező"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Érvénytelen URL-formátum"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Hibás jelszó"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Belső hiba"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Titkosított kötet hiba"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Az e-mail megadása kötelező"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "A kvóta megadása kötelező"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "A kvóta túl alacsony (minimális érték 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Kötetnév megadása kötelező"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Kötet leírása kötelező"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Számot adjon meg"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Adja meg a helyes jelszót."
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr "français"
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -199,8 +231,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Fájlmegosztó szervezet "
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Megbeszélés"
 
@@ -212,16 +245,17 @@ msgstr "Megbeszélés"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -231,13 +265,13 @@ msgstr "Fájl"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -246,9 +280,9 @@ msgstr "Könyvtárikon"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s válasz"
@@ -259,43 +293,48 @@ msgstr "Nincs megbeszélés"
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Betöltés..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Sikertelen. Ellenőrizze a hálózatot."
 
@@ -344,6 +383,25 @@ msgstr "Ellenőrizze a hálózatot."
 msgid "New Replies"
 msgstr "Új válaszok"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Üzenetek"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Üzenetek %(name)s -tól/től"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "Nincs üzenet."
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Személyes információ"
@@ -357,10 +415,11 @@ msgid "Important dates"
 msgstr "Fontos dátumok"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -373,72 +432,74 @@ msgstr "Jelszó változtatása sikeres."
 msgid "Change password: %s"
 msgstr "Jelszó változtatása: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Jelszó"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Adjon meg helyes felhasználónevet és jelszót. Vegye figyelembe, hogy mindkét mező megkülönbözteti a kis- és nagybetűket."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Ez a fiók inaktív."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "A böngészője úgy tűnik, nem támogatja a cookiekat. A bejelentkezéshez ez feltétlenül szükséges."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Az e-mail küldése meghiúsult, az e-mail szolgáltatás nincs megfelelően beállítva. Vegye fel a kapcsolatot a rendszergazdával."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Ehhez az e-mail címhez nem tartozik fiók. Biztosan regisztrált már?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
+msgid "Reset Password on %s"
 msgstr "Jelszó átállítása: %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Új jelszó"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Új jelszó ismét"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "A régi jelszó hibás. Próbálja újra."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Jelszó (ismét)"
 
@@ -476,7 +537,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Már van %(nb_avatars)d avatarja, a maximális engedélyezett szám %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar %s részére"
@@ -544,57 +605,62 @@ msgstr "Jelenlegi avatar: "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Beküldés"
@@ -611,7 +677,7 @@ msgstr "%(avatar_creator)s frissítette %(avatar)s."
 msgstr "Frissítette %(avatar)s avatarját."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Alapértelmezett avatar"
 
@@ -643,7 +709,7 @@ msgstr "telefon"
 msgid "note"
 msgstr "megjegyzés"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Ebben a kötetben a fájlok nem nézhetők meg online."
 
@@ -700,7 +766,7 @@ msgstr "„%(file)s” fájl visszaállítva erre az állapotra: %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Törölt könyvtár visszaállítva"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Kötetnév vagy leírás módosítva"
 
@@ -710,9 +776,9 @@ msgstr "Automatikus összeolvasztás (seafile)"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Éppen most"
 
@@ -748,42 +814,48 @@ msgstr[1] "%(seconds)d másodperce"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Írás-olvasás"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Csak olvasás"
 
@@ -792,33 +864,33 @@ msgstr "Csak olvasás"
 msgid "Email is required."
 msgstr "Az e-mail kötelező."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s nem valós e-mail cím."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s már a kapcsolatai között van."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "%s sikeresen hozzáadva a kapcsolatokhoz."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Nem sikerült %s-t felvenni a kapcsolatok közé."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "%s szerkesztése sikeres."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "%s törlése sikeres"
@@ -843,10 +915,10 @@ msgstr "E-mail "
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -854,45 +926,46 @@ msgstr "E-mail "
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Név"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Megjegyzés"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -901,56 +974,64 @@ msgstr "Megjegyzés"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Műveletek"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Szerkesztés"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Törlés"
 
@@ -966,17 +1047,19 @@ msgstr "Vegyen fel kapcsolatokat, hogy gyorsan tudjon köteteket megosztani és
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "E-mail"
 
@@ -1001,8 +1084,8 @@ msgid "Delete Contact"
 msgstr "Kapcsolat törlése"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1078,400 +1161,415 @@ msgstr "A megerősítő üzenet túl hosszú (legfeljebb 255 karakter lehet)"
 msgid "\"%s\" is not a valid name"
 msgstr "„%s” érvénytelen név"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Csak %d csoport hozható létre.Fiók fejlesztése."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Van már ilyen nevű csoport."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "A csoport sikeresen át lett nevezve a következőre: \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "A csoport átnevezése nem sikerült. A csoport neve csak betűket, számokat és aláhúzásjel karaktereket tartalmazhat."
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "%s nem valós e-mail cím."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Csak adminisztrátorok tehetik nyilvánossá a csoportot"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Az üzenet nem létezik"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Nincs jogosultsága."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Csak %d tagot hívhat meg.Fiók fejlesztése."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Valaki hozzáadta egy csoporthoz a Seafile-on."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Önt meghívták a(z) %s csoportba"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Hozzáadás sikertelen: %s nincs regisztrálva."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Sikeresen hozzáadva. Az e-mail kiküldésre került."
 msgstr[1] "Sikeresen hozzáadva. %(count)s e-mail kiküldésre került."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Sikeres hozzáadás."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Mivel a(z) %s nem valós e-mail cím, így nem sikerült hozzáadni."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Hozzáadás meghiúsult: %s nincs regisztrálva."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "A művelet befejeződött."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Meghiúsult: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Megosztás visszavonása sikertelen: nincs ilyen csoport."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Művelet meghiúsult: csak adminisztrátor és a csoporttulajdonos vonhatja vissza egy kötet megosztását."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Megosztás törlése sikertelen: belső hiba."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Hiba: hibás csoportazonosító."
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Hiba: a csoport nem létezik."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Sikeresen beküldve %(groups)s csoportba."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Hiba: nem tagja a(z) %s csoportnak."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Hiba: a kötet nem létezik."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Hiba: nincs útvonal."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Létrehozás meghiúsult: a csoport nem létezik."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Létrehozás meghiúsult: nem tagja a csoportnak."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Létrehozás meghiúsult"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Létrehozás meghiúsult: belső hiba."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Már tagja a csoportnak."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "A beküldés sikeres, a csoportadminisztrátor fogja elbírálni."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr "Megbeszélés szükséges."
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "A fájl nem létezik"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"Wiki\" sikeresen bekapcsolva."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"Wiki\" sikeresen kikapcsolva."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Wikilap létrehozása meghiúsult. Próbálja újra később."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "A wiki nem létezik"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Kezdőlap létrehozása sikertelen. Próbálja később"
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "A wiki kötet beállítása sikertelen."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki nem található"
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "„%s” oldal már létezik."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s meghívta a(z) „%(group.group_name)s” csoportba. A következő oldalon tudja elfogadni:"
+msgid "Successfully deleted \"%s\"."
+msgstr "Sikeresen törölve \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Köszönjük, hogy használja rendszerünket!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s csapat"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "\"%s\" törlése sikertelen. Próbálja újra később."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Üdvözlöm "
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr "%(email)s meghívott a(z) %(grp_name)s csoportba itt: %(site_name)s: "
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Válaszok rejtése"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Válasz"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Válasz hozzáadása"
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Nem lehet üres, sem 2048 karakternél több."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "A csoport nyilvános."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Modulok engedélyezése"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Kilépés"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "A csoport nyilvános."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Kötetek"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Fájlok"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Tagok"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Adminisztrátor"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Kilépés a csoportból"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Biztosan elhagyja a csoportot?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Megbeszélés hozzáadása..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Fájlok hozzáadása"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr "Fájl(ok) kiválasztása:"
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Bejelentkezés után beküldhet megbeszélést és válaszokat."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Előző"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Következő"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Fel"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Valóban törli a megbeszélést?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Igen"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Nem"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Sikeresen törölve"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Törlés meghiúsult: "
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Sikertelen."
 
@@ -1480,6 +1578,7 @@ msgid "Recent Changes"
 msgstr "Legutóbbi változások"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1488,77 +1587,58 @@ msgstr "Új kötet"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Leírás"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Utolsó frissítés "
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Megosztó:"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "könyvtárikon"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Letöltés és szinkronizálás"
 
@@ -1574,7 +1654,7 @@ msgstr "Letöltés és szinkronizálás"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Megosztás törlése"
 
@@ -1611,15 +1691,16 @@ msgid "Modified at"
 msgstr "Módosítva:"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Módosító:"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1628,23 +1709,23 @@ msgid "Details"
 msgstr "Részletek"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Nincs"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -1663,15 +1744,43 @@ msgstr "Jelszó:"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "A jelszó egy órán át lesz tárolva a kiszolgálón."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Kötet megosztásának visszavonása"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Biztosan visszavonja %s megosztását?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "könyvtárikon"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Nincs nyilvános kötet ebben a csoportban"
@@ -1688,14 +1797,25 @@ msgid ""
 "message: "
 msgstr "%(user)s szeretne csatlakozni a(z) „%(group_name)s\" csoporthoz. Ezt az indoklást adta meg:"
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Köszönjük, hogy használja rendszerünket!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s csapat"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Adminisztrátorok"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -1703,7 +1823,7 @@ msgstr "Beállítások"
 msgid "Add Members"
 msgstr "Tagok hozzáadása"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Adminisztrátorok hozzáadása"
 
@@ -1712,7 +1832,7 @@ msgid "Avatar"
 msgstr "Embléma"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Változtatás"
 
@@ -1731,7 +1851,7 @@ msgid "Make Public"
 msgstr "Nyilvánosságra hozás"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Átad"
 
@@ -1755,29 +1875,41 @@ msgstr "Tipp: az e-mail címeknek már regisztrálva kell lenniük."
 msgid "Rename Group To"
 msgstr "Csoport átnevezése a következőre:"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Csoport eltüntetése"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Biztosan eltünteti a csoportot?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Tag eltávolítása"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Biztosan törli: %s?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Kilépés"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Hozzáadás a kapcsolatokhoz"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Kilépés a csoportból"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Biztosan elhagyja a csoportot?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Csatlakozás csoporthoz"
@@ -1804,12 +1936,29 @@ msgstr "Tagok: "
 msgid "Verification Message"
 msgstr "Indoklás"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Wiki index"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Jelenleg nincs index."
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Létrehozás"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Ennek a csoportnak nincs jelenleg wikije"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1817,82 +1966,105 @@ msgid ""
 "back to the server."
 msgstr "A Seafile Wiki lehetővé teszi az egyszerű jegyzetelést. A wiki tartalma egy rendes kötetben kerül tárolásra, egy kötött fájl/könyvtárstruktúrában.  Ez lehetővé teszi a Wiki helyi szerkesztését."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Wiki létrehozása most"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Wikinek válassza ki a kötetet"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Wiki létrehozása"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wikioldalak"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Wikinek válassza ki a kötetet:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Kérem, válasszon egy kötetet a kattintást követően."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Kezdőoldal"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Oldalak"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki naplója"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Új oldal"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Oldal törlése"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Oldal szerkesztése"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Oldal naplója"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Utoljára %(modifier)s módosította (%(modify_time)s)"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Biztos, hogy törli ezt az oldalt?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Név kötelező."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Leírás kötelező."
 
@@ -1939,10 +2111,12 @@ msgstr "Tagok hozzáadása"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Bevitel"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "e-mail címek ”,”-vel elválasztva"
 
@@ -1958,7 +2132,8 @@ msgstr "Tipp: az e-mail címeknek már regisztrálva kell lenniük."
 msgid "Add administrators"
 msgstr "Adminisztrátorok hozzáadása"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Kérem, adja meg az e-mail címeket, vagy válassza ki őket a listából."
 
@@ -2237,135 +2412,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "A Seafile szervere nem tárolja el a titkosított kötetekhez tartozó jelszavakat. Ha a webes felületen keresztül szeretne hozzáférni egy titkosított kötethez, meg kell adnia a kötethez tartozó jelszót. A jelszó átmenetileg a szerver memóriájába kerül titkosított formában és egy órán belül automatikusan törlődik, mely idő lejárta után a kötet további eléréséhez ismételten meg kell adnia a jelszót."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "üzenet kötelező"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "kötelező a kapcsolat"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Önmagának nem üzenhet."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Sikertelen üzenetküldés %s számára, a felhasználó nem található."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Üzenetek"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Új üzenet"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Üzenet"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Idő"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "üzenet..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Fájlok hozzáadása"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "címzett: kattintson a kapcsolatok kiválasztásához"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "kérem először adjon hozzá kapcsolatokat"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Az üzenetküldéshez nem sikerült megkapni a kapcsolatait"
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Jelenleg nincs egyetlen kötete sem"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Üzenetek %(name)s -tól/től"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Üzenet küldése"
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "A fájl (%(file_name)s) feltöltésre került a következő könyvtárba: %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s megosztotta a következő kötetet önnel: %(repo_name)s."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s megosztotta a következő fájlt önnel: %(file_name)s."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "Új üzenete érkezett a következő felhasználótól: %(user)s."
+msgid "You have received a new message from %(user)s."
+msgstr "%(user)s felhasználótól új üzenete érkezett ."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "Új beszélgetés indult a következő csoportban: %(group_name)s"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s új beszélgetést kezdeményezett a következő csoportban: %(group_name)s."
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "Új üzenet érkezett egy csoportos megbeszélésben."
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s válaszolt az ön csoportos megbeszélésében."
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s felkérése, hogy csatlakozz
 msgid "Successfully cleared all notices."
 msgstr "Minden üzenet sikeresen törölve."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Új értesítés hozzáadása"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr "Üdvözlöm %(name)s!"
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] "\nÖnnek 1 új üzenete van itt: %(site_name)s.\n"
+msgstr[1] "\nÖnnek %(num)s új üzenete van itt: %(site_name)s.\n"
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr "Nézze meg ezt az oldalt:"
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Összes értesítés"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Új értesítés hozzáadása"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Értesítés részletei"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(aktuális értesítés)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Beállítás aktuálisnak"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Üres"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Értesítés törlése"
 
@@ -2428,27 +2607,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Kérem, válassza ki, hogyan kívánja megtekinteni a titkosított köteteket a webes felületen:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Jelszavak elküldése a szervernek."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "A fájlok titkosítása feloldásra kerül a szerveren továbbítás előtt."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Jelszó mentése a böngészőben."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "A titkosítást a böngésző oldja fel letöltéskor"
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2480,81 +2659,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "Az alapértelmezett kötet mostantól a következő: \"%s\"."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Profilbeállítások"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Profil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Nyelv"
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Titkosított kötetek"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Al-kötet"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Alapértelmezett kötet"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Fiók törlése"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Avatar:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Frissítés"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Név: "
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Bemutatkozás:"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Osztály:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Telefon:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Nyelvi beállítások"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Titkosított kötet beállítások"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Titkosított kötet online megtekintése:"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Al-kötet beállítás"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Al-kötet engedélyezése"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2563,7 +2749,7 @@ msgid ""
 "library."
 msgstr "Ez a funkció lehetővé teszi, hogy egy köteten belül szelektíven szinkronizáljon könyvtárakat. Alkötet létrehozásához bármely könyvtár felhasználható egy adott köteten belül. A létrehozást követően az alkötet megjelenik a kliensen az elérhető kötetek listáján, és a normál kötetekhez hasonlóan letölthetővé és szinkronizálhatóvá válik."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2571,37 +2757,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Alkötetet létrehozhat akkor is, ha szeretne egy könyvtárat megosztani egy csoporttal vagy felhasználóval. Ezen opció használata nélkül egy rejtett alkötet automatikusan létrehozásra kerül a könyvtár megosztásakor. Ha bekapcsolja az opciót, ezek a rejtett alkötetek listázva lesznek a kliensen, ezáltal menedzselhetővé válnak."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Alapértelmezett kötet beállítások"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Az Ön alapértelmezett kötete"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Az alapértelmezett kötet azt a kötetet jelenti, ahová a személyes dokumentumai és képei kerülnek."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Alapértelmezett kötet kiválasztása"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Ezt a műveletet nem lehet visszavonni. Kérem gondolja meg!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Alapértelmezett kötet kiválasztása:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Kérem, válasszon egy kötetet a kattintást követően."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Biztosan törli a fiókot?"
 
@@ -2614,25 +2796,25 @@ msgid "Info"
 msgstr "Infó."
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Név"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Bemutatkozás"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Osztály"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -2640,169 +2822,171 @@ msgstr "Telefon"
 msgid "Email is not longer than 512 characters"
 msgstr "Az e-mail cím legfeljebb 512 karakter lehet"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Nem sikerült minden taggal megosztani, később próbálja újra."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "A megosztás minden taggal sikerült. Ellenőrizheti a megosztás oldalon."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" már a(z) %(group)s csoportban van. Megnéz"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "A(z) %(repo)s megosztása a(z) %(group)s csoportnak nem sikerült, később próbálja újra."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "%(group)s csoporttal sikerült a megosztás，a Megosztások oldalon ellenőrizheti."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Önmagával nem oszthatja meg a könyvtárat."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "A megosztás %s-nak/nek nem sikerült, próbálja később újra."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Sikeresen megosztva %(email)s számára. Ellenőrizheti a megosztás oldalán."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Megosztás %s számára sikertelen, mivel nincs regisztrálva."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Csak a kötet tulajdonosa jogosult megosztani."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "\"%s\" megosztása sikertelen, nincs elég kvóta. Fiók fejlesztése."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Érvénytelen paraméter"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Megosztás visszavonása sikertelen "
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "érvénytelen csoportazonosító"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Megosztás visszavonása sikeres"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "minden tag"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Érvénytelen argumentumok"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Ezen a módon nem oszthat meg kötetet."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "A hivatkozás lekérése meghiúsult, próbálja később."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Sikeresen törölve"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "A link nem létezik"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Megosztott hivatkozás küldése meghiúsult. Az e-mail szolgáltatás beállítása nem megfelelő. Vegye fel a kapcsolatot a rendszergazdával."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Valaki megosztott Önnel egy fájlt a Seafile rendszeren"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr "Fájlt osztottak meg Önnel itt: %s"
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Belső kiszolgálóhiba. A küldés meghiúsult."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "A küldés sikeres."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Válasszon könyvtárat."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Sikeresen elmentve."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Megosztás %s számára sikertelen, a felhasználó ismeretlen."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "%s sikeresen megosztva."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "\"%s\" megosztás sikeresen megszüntetve."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "Nincs joga megszüntetni a(z) %s megosztását."
+msgid "You don't have permission to unshare %s."
+msgstr "Nincs joga a(z) %s megosztását megszüntetni."
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Nincs joga a(z) %s mentésére."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "A hivatkozás lekérése meghiúsult, próbálja később."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "A feltöltési hivatkozás nem küldhető el, mert az e-mail szolgáltatás nincs megfelelően konfigurálva. Kérem, lépjen kapcsolatba a szerver adminisztrátorával."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Egy barátja feltöltési hivatkozást küldött Önnek a Seafile-on"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr "Feltöltési linket osztottak meg Önnel itt: %s"
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2823,14 +3007,15 @@ msgstr "Látogatások "
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Megtekintés"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Eltávolítás"
 
@@ -2859,7 +3044,7 @@ msgid "Folders - Share"
 msgstr "Könyvtárak - Megosztás"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Könyvtárak"
 
@@ -2884,13 +3069,13 @@ msgid ""
 msgstr "Egy egész kötet helyett regisztrált felhasználóval egy könyvtár is megosztható."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Szerkesztés sikeres."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Szerkesztés meghiúsult."
@@ -2957,7 +3142,7 @@ msgstr "Megosztások"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Alapvető adatok"
 
@@ -2970,7 +3155,8 @@ msgid "Add to contacts"
 msgstr "Hozzáadás a kapcsolatokhoz"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Megosztás elhagyása"
 
@@ -2991,56 +3177,24 @@ msgstr "Tevékenységek"
 msgid "Exit System Admin"
 msgstr "Admin kilépés"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Felhasználók"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Értesítések"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Linkek"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Rendszer-adminisztrátor"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "olvasatlan üzenetek"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Belépés"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Regisztráció"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Kijelentkezés"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Kiszolgálóverzió: "
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Rendszer-adminisztrátor"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Kapcsolat"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Minden csoport"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Kliensek"
 
@@ -3048,7 +3202,7 @@ msgstr "Kliensek"
 msgid "Client Name"
 msgstr "Kliens neve"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3089,28 +3243,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Ez a kötet titkosítva van. Adja meg jelszavát az online böngészéshez. A jelszó egy óráig kerül tárolásra a kiszolgálón."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "A titkosított kötetek webes elérésének szabályzásához kattintson ide."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Adjon meg jelszót."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Eszközök"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Platform"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Eszköz neve"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Utolsó elérés"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Kötetek"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Művelet"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Leválasztás"
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "Biztos, hogy leválasztja: %s?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "A szinkronizáció azonnal leáll."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "Nincsenek csatlakozott eszközök"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "A kliensek (asztali/Andorid/iOS) itt lesznek felsorolva."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Leválasztás sikeres."
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3120,8 +3326,7 @@ msgstr "Letöltés"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Aktuális útvonal: "
 
@@ -3436,9 +3641,9 @@ msgid "Password is required."
 msgstr "A jelszó kötelező."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Napló"
@@ -3457,16 +3662,11 @@ msgstr "Tipp: minden módosítás után új verzió keletkezik, amelyekre késő
 msgid "Current Path:"
 msgstr "Aktuális útvonal:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Utolsó módosító"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Méret"
 
@@ -3474,38 +3674,55 @@ msgstr "Méret"
 msgid "(current version)"
 msgstr "(aktuális verzió)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(%(old_path)s -ról/ről átnevezve vagy mozgatva)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Különbség"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Dokumentumok"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Bevezetés"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Segítség"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Kliens"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile Windowsra, Macre és Linuxra"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Kiszolgálóverzió: "
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Kapcsolat"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3534,12 +3751,13 @@ msgstr "kukája"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Vissza a kötethez"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3554,36 +3772,57 @@ msgstr "Személyes"
 msgid "Starred"
 msgstr "Csillagozott"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Személyes Wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Megosztások kezelése"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Linkek"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Csoport"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Nincsenek az Ön csoportjaival megosztott kötetek."
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Nincs egy kötet sem megosztva Önnel"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Üdvözli a Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "A Seafile a fájlokat kötetekbe szervezi, melyek szinkronizálhatók különféle eszközökkel, illetve megoszthatók más felhasználókkal vagy csoportokkal. Egy személyes kötet automatikusan létrejött az Ön felhasználójának. A továbbiakban lehetősége lesz más kötetek létrehozására is."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Bezárás"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Kötetek"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Szervezet"
@@ -3594,11 +3833,11 @@ msgid ""
 "current account."
 msgstr "A szervezet eltávolításra kerül a következő verzióban. Az adatok összeolvasztásra kerülnek az aktuális fiókban."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3620,420 +3859,452 @@ msgstr "Még egyetlen csoport sincs"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Kattintson az „új csoport” gombra a „csoport” címke alatt csoport létrehozásához. "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Megosztás innen"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Nincs nyilvános kötet"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Létrehozhat egy nyilvános kötetet az „Új kötet” gombra kattintva.  A kötetet mások megtekinthetik és letölthetik."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Kuka"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Tagok keresése..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Méret: "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Kuka"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Másolás"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Fájlok feltöltése"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "A kötet tulajdonosának elfogyott a tárhelye."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Kérem válasszon egy fájlt elsőként."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Fájlok hozzáadása"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Összes feltöltése"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Mindet kivesz"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "A húzd és ejtd a következő böngészőkkel támogatott: Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "A fájl mérete legyen kisebb mint %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "%(file_name)s frissítés"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Válasszon fájlt"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Kisebb mint %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Új könyvtár"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Könyvtár neve"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Új fájl"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Támogatott fájltípus"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Kattintson a választáshoz"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "online Rich Text formátum."
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "egyszerű jelölő formátum."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Fájlnév"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Aktuális kötet"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Más kötetek"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Kattintson és válasszon könyvtárat."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "%(name)s átnevezése:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "%(dir_name)s szinkronizálása"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Új alkötet lesz létrehozva a kiválasztott könyvtárból. Az alkötet létrehozás után letölthetővé válik a kliensprogramban."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Létrehozás"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Ez a kötet titkosítva van. Adja meg jelszavát az online böngészéshez. A jelszó egy óráig kerül tárolásra a kiszolgálón."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Túl nagy fájl"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Túl kicsi fájl"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Nem engedélyezett fájltípus"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "A maximális fájl szám túllépve"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "A feltöltött bájtok meghaladják a fájl méretét"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Üres fájl feltöltés"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Hiba"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Indít"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Elemek törlése"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Biztosan törli a kiválasztott elemeket?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Feldolgozás..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "%(name)s törlése és még %(amount)s másik elemé sikeres."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "%(name)s törlése sikeres."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Belső hiba. %(name)s törlése és még %(amount)s másik elemé sikertelen."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Belső hiba. %(name)s törlése sikertelen."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "A kiválasztott könyvtárak/fájlok mozgatása ide:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "A kiválasztott könyvtárak/fájlok másolása ide:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "A cél útvonal érvénytelen"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s áthelyezése és még %(amount)s másik elemé sikeres."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s sikeresen áthelyezve."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s másolása és még %(amount)s másik elemé sikeres."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s másolása sikeres."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Belső hiba. %(name)s mozgatása és még %(amount)s másik elemé sikertelen."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Belső hiba. %(name)s mozgatása sikertelen."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Belső hiba. %(name)s másolása és még %(amount)s másik elemé sikertelen."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Belső hiba. %(name)s másolása sikertelen."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Mozgatás..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Másolás..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "%(s_num)s elem sikeresen áthelyezve."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "%(f_num)s elemet nem sikerült átmozgatni. "
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "%(s_num)s elem másolása sikeres."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Sikertelen"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Fájl titkosítása"
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Hiba a titkosítás közben."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Titkosítás, %(num)s% kész."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Feltöltés ..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Kész!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Letöltés ..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Letöltés, %(num)s% kész."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Titkosítás visszafejtése..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Titkosítás feloldása, %(num)s% kész."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "%(name)s törlése sikeres"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Könyvtár átnevezése"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Fájl másolása"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Fájl mozgatása"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Könyvtár másolása"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Könyvtár mozgatása"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "%(name)s másolása ide:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "%(name)s mozgatása ide:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Ebben a kötetben a könyvtár letöltés nem támogatott."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "csillagozatlan"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "csillagozott"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Az alkötet sikeresen létrejött."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Ez kötelező."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Csak kiterjesztést adott meg."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Létrehozás..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Nem nevezte át."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s átnevezése %(new_name)s névre sikeres"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Megszakítva."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Kérem, válasszon ki legalább egy kontaktot."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Adjon meg e-mail címeket vagy csoportokat, vagy válasszon."
 
@@ -4055,11 +4326,12 @@ msgstr "Tipp: Minden módosításkor egy pillanatkép készül, így visszaáll
 msgid "View Snapshot"
 msgstr "Pillanatkép megtekintése"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Oldalanként: "
@@ -4100,34 +4372,78 @@ msgstr "összes"
 msgid "Delete Time"
 msgstr "Törlés ideje"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Kötetbeállítások"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Összes változat megtartása"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Csak az utolsó változat megtartása"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Csak egy időszak megtartása:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "nap"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Tulajdonjog átadása"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Kötet átadása másik felhasználónak:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Jelszó változtatás"
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Jelszó megváltoztatása a kötethez:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Régi jelszó"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Új jelszó (legalább 6 karakter)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Új jelszó ismét"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Kérem adja meg a régi jelszót"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Kérem adja meg az új jelszót"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "Az új jelszó rövid"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "Az új jelszó túl hosszú (maximum 35 karakter lehet)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Kérem adja meg újra az új jelszót"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Az új jelszavak nem egyeznek"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Vissza a módosítási naplóhoz"
@@ -4136,6 +4452,10 @@ msgstr "Vissza a módosítási naplóhoz"
 msgid "Create Time"
 msgstr "Létrehozás ideje"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Utolsó módosító"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4178,8 +4498,14 @@ msgstr "A Seafile kliense elévült, kérem, frissítsen a legújabb verzióra."
 msgid "Click to download."
 msgstr "Kattintson a letöltéshez."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Ha fájlt vagy könyvtárat szeretne megosztani kérem adja meg a jelszót. A jelszót 1 órán át tároljuk a szerveren."
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Megosztó: "
 
@@ -4191,25 +4517,26 @@ msgstr "Mentés másként..."
 msgid "Save To:"
 msgstr "Mentés ide:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Üdvözlöm "
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Azért kapta ezt a levelet, mert %(email)s megosztott Önnel egy fájlt a(z) %(site_name)s oldalon."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s fájlt osztott meg Önnel itt: %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Kövesse az alábbi címet és tekintse meg a fájlt:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "%(email)s feltöltési hivatkozást osztott meg Önnel a következő webhelyen: %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s feltöltési linket osztott meg Önnel itt: %(site_name)s."
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Navigáljon a következő oldalra a fájlok feltöltéséhez:"
 
@@ -4221,8 +4548,8 @@ msgstr "Csillagok"
 msgid "icon"
 msgstr "ikon"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Csillag törlése"
 
@@ -4277,49 +4604,49 @@ msgstr "ide:"
 msgid "Sorry, this user is not registered yet."
 msgstr "Elnézést, ez a felhasználó még nem regisztrált."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Csillagozás"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "feltöltötte a fájlt"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "egy hozzájáruló"
 msgstr[1] " %(counter)s hozzájáruló  "
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Csillag törlése sikeres"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Csillagozás sikeres"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "A ← gombot is használhatja"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "előző"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "A → gombot is használhatja "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "köv."
 
@@ -4338,7 +4665,7 @@ msgid "auto detect"
 msgstr "automatikus"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Teljes képernyő"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "betöltés..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Használhatja az IE 10-et, vagy más böngészőket (mint a Firefox) az online megtekintéshez."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Az online megtekintéshez használhat Firefoxot, Chrome-ot vagy IE 9-et."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Ez a fájltípus nem tekinthető meg online."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4385,41 +4712,55 @@ msgstr "Fájlok feltöltése ide: %(dir_name)s"
 msgid "shared by:"
 msgstr "megosztó:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Belépés"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(elfelejtett jelszó)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Nem tudja elolvasni? Frissítse a képet!"
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Hibás e-mail cím vagy jelszó"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "%(remember_days)s napig emlékezzen rám "
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Regisztráció"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "A captcha frissítése nem sikerült, kérem, próbálja meg később."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "Az e-mail megadása kötelező"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "A jelszó megadása kötelező"
 
@@ -4473,13 +4814,13 @@ msgstr "Jelszó átállítása sikeres."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Új jelszó beállítása"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Jelszó megadása"
+msgid "Reset Password"
+msgstr "Jelszó átállítása"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4490,23 +4831,19 @@ msgid "Password Reset Successfully"
 msgstr "A jelszó átállítása sikeres"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Küldtünk egy jelszó-átállítási e-mailt."
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Küldtünk egy jelszó-átállítási e-mailt a postafiókjába."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Azért kapta ezt a levelet, mert kérte jelszava átállítását a(z) %(site_name)s oldalon."
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "A(z) %(account)s jelszavának megváltoztatásához a(z) %(site_name)s -on/ön, kattintson az alábbi hivatkozásra:"
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Kérjük, kövesse a következő hivatkozást és válasszon új jelszót:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "A felhasználóneve:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Ha Ön ezt nem kérte, csak hagyja figyelmen kívül."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4536,23 +4873,31 @@ msgstr "A regisztráció kész, kérjük várja meg amíg az adminisztrátor akt
 msgid "Register"
 msgstr "Regisztráció"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Üdvözöljük. Már be van jelentkezve."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Jelszó megerősítése"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "Regisztráció"
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Adja meg a jelszót ismét"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "A jelszavak nem egyeznek"
 
@@ -4572,12 +4917,6 @@ msgstr " túl nagy. Maximum 1 MB-os lehet."
 msgid "Discuss"
 msgstr "Megbeszélés"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Csoport"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Válasszon legalább egy csoportot."
@@ -4586,10 +4925,6 @@ msgstr "Válasszon legalább egy csoportot."
 msgid "Please input a discussion."
 msgstr "Adjon meg egy megbeszélést."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "A rendszer generálta"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4608,42 +4943,66 @@ msgstr "Feltöltési hivatkozás"
 msgid "Private Share"
 msgstr "Magán megosztás"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Jelszó használata"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(legalább 6 karakter)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Jelszó ismét"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Lejárat beállítása"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Napok"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Generál"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Hivatkozás: "
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Küldés"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Címzett:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "E-mail címek ”,”-vel elválasztva"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Küldés..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "A hivatkozást megoszthatja ismerőseivel, akik a link használatával fájlokat tölthetnek fel a kiválasztott könyvtárba."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Feltöltési hivatkozás:"
 
@@ -4696,7 +5055,7 @@ msgid "Sub-libraries"
 msgstr "Alkötetek"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Megosztott"
 
@@ -4727,29 +5086,23 @@ msgid ""
 " library."
 msgstr "Alkötetet egy tetszőleges könyvtárból létrehozhat egy köteten belül. A létrehozott alkötet önállóan szinkronizálható, illetve letölthető. Az alkötet fájljai automatikusan szinkronizálva lesznek az forráskötetben található fájlokkal."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Nincs egy kötet sem megosztva Önnel"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Nincsenek az Ön csoportjaival megosztott kötetek."
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "A fájl feldolgozása folyamatban van, kérem várjon..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "kontúr elrejtése"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "kontúr mutatása"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Dokumentum átalakítása meghiúsult."
 
@@ -4766,27 +5119,29 @@ msgstr "Titkosítás"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(legalább %(repo_password_min_length)s karakter)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Jelszó ismét"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Név kötelező"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Leírás kötelező"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Adjon meg jelszót"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "A jelszó túl rövid"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "A jelszó túl hosszú (maximum hossz: 35 karakter)"
 
@@ -4799,7 +5154,7 @@ msgstr "Sikeres törlés"
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Biztosan törli: %(lib_name)s ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -4926,15 +5281,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Kérem, válasszon ki legalább egy fájltípust vagy adjon meg legalább egy kiterjesztést."
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Kapcsolatok kiválasztása"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Adjon meg legalább egy e-mail címet"
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Adja meg a napok számát"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Kérem érvényes nap számot adjon meg"
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4947,7 +5310,7 @@ msgstr "Saját"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Megosztás"
 
@@ -4959,6 +5322,22 @@ msgstr "E havi forgalom:"
 msgid "Payment"
 msgstr "Fizetés"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Felhasználók"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Értesítések"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Forgalom"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Naplók"
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Kötet átadása"
@@ -4969,74 +5348,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "%(lib_name)s átadása neki:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Minden csoport"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Létrehozó"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Létrehozás helye:"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Csoport törlése"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Felhasználók keresése..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Adatbázis"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Keres"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Létrehozva / Utolsó bejelentkezés"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Felhasznált terület"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Kötet keresése név alapján..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Mind"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Árva"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Rendszer"
 
@@ -5052,96 +5431,117 @@ msgstr "URL prefixum"
 msgid "Delete Organization"
 msgstr "Szervezet törlése"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Nyilvános linkek"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Számláló"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Kötet keresés"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Tipp: kulcsszóra a névben vagy a tulajdonosban lehet keresni vagy mindkettőben."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Találat"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Nincs találat"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Új felhasználó hozzáadása"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Felhasználói forgalom"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Hónap:"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Felhasználó"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Összes használat"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr "Felhasználó hozzáadása"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr "Adminisztrátor hozzáadása"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Adminisztrátorok hozzáadása"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Aktiválás, kis türelmet..."
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "A jelszavak nem egyeznek meg"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "%(username)s felhasználói fiók aktiválásra került itt: %(site_name)s."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Azért kapja ezt a levelet, mert %(user)s fölvette „%(org.org_name)s” szervezetbe a(z) %(site_name)s oldalon."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s meghívott a(z) \"%(org_name)s\" -ba/be itt: %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Azért kapja ezt a levelet, mert %(user)s regisztrálta Önt a(z) %(site_name)s oldalon."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s meghívott ide: %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
 msgstr "A felhasználói fiókjának adatai:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "E-mail: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
+msgid "Password: %(password)s"
 msgstr "Jelszó: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Kövesse az alábbi hivatkozást a bejelentkezéshez:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Azért kapja ezt a levelet, mert a(z) %(site_name)s oldal adminisztrátora új jelszót állított be Önnek."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "%(site_name)s -on/ön a jelszó megváltoztatva. Az új jelszó %(password)s. Kérem ahogy lehet változtassa meg."
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Az új jelszava: %(password)s. Kérjük, változtassa meg a lehető leghamarabb."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Felhasználó keresés"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Tipp: A * karakterrel bármennyi karakter helyettesíthető."
 
@@ -5155,7 +5555,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Biztosan új jelszót állít be %s részére?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Admin jog elvétele"
 
@@ -5165,7 +5565,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Biztosan törli %s adminisztrátori jogait?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Admin jog megadása"
 
@@ -5184,437 +5583,466 @@ msgid ""
 "configuration."
 msgstr "Szerkesztés sikeres de az e-mail küldés sikertelen. Ellenőrizze a levelezés beállításokat."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Állapot"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Aktív"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Nem aktív"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Új jelszó"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Vissza a felhasználói listába"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Összes"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Felhasznált"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Kvóta beállítása"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Felhasználó tárhely beállítása"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Tipp: a 0 az alapértelmezett korlátot jelenti"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Birtokolt"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Nincs személyes Wikije"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "személyes-wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Személyes wikioldalak"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "jogosultsághiba"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Újrahasznosítás oldal megjelenítése sikertelen"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "A kötet nem létezik."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Nincs jog a művelet végrehajtásához."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Kötet-információ szerkesztése sikertelen."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Beállítások kiszolgálóra mentése sikertelen"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Beállítások mentve."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "%s érvénytelen felhasználói név"
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "%s felhasználó nem található."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "%(repo_name)s kötet %(new_owner)s-nak/nek átadva."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "%(repo_name)s kötet jelszava sikeresen megváltoztatva."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "A fájlnév érvénytelen karaktert tartalmaz"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Ismétlődő fájlnév"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "A fájlméret meghaladja a korlátozást"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "A tulajdonos tárhelye elfogyott, a felöltés meghiúsult"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Hiba történt a fájl átvitele közben"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Érvénytelen URL"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Sikertelen a kötet módosításainak megtekintése"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Kötet-pillanatkép megtekintése sikertelen"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Nincs joga visszaállítani a kötet"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Adjon meg naplóazonosítót"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "A kötet nem létezik"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "A megadott napló nem létezik"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Nincs ütközés az összeolvasztás során."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Saját kötet"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Kötetmegosztás visszavonása sikertelen, mivel nem is létezik"
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "„%s” megosztása visszavonva."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "„%s” megosztásának visszavonása sikertelen"
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Fájl törlése sikertelen."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s sikeresen törölve."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Belső hiba. %s törlése sikertelen."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Fájl nem érhető el"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Kötet leöltése sikertelen, nem található a kiszolgáló"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Érvénytelen kiszolgálóbeállítások"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "%(path)s visszaállítása a gyökérkönyvtárra sikeres."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "%(path)s visszaállítása sikeres"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "%(path)s visszaállítása a gyökérkönyvtárra sikeres."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Belső hiba"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "„%s” könyvtár letöltése sikertelen: túl nagy."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "„%s” letöltése sikertelen"
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "\"Személyes Wiki\" engedélyezése sikeres."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "\"Személyes Wiki\" kikapcsolása sikeres."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Nincs joga a kötet eléréséhez."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Nincs útvonal."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "A csoport nem létezik"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Jogosultság megtagadva"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Jogosultság megtagadva"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "A kötet titkosítva van."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Hiba: no head commit id"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Hiányzó paraméter."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "A célútvonal túl hosszú"
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "%(name)s áthelyezése sikeres. Megtekintés."
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "%(name)s másolása sikeres. Megtekintés."
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "A(z) %(src)s könyvtárat nem lehet átmozgatni a(z) %(des)s alkönyvtárába"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "A(z) %(src)s könyvtárat nem lehet átmásolni a(z) %(des)s alkönyvtárába"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "A célútvonal túl hosszú ide: %s"
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "A fájl block listát nem lehet elérni"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Hibás tárolóazonosító"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "A rendszer kötetet nem lehet törölni."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTP hiba: fájl online megnyitása meghiúsult"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URL hiba: fájl online megnyitása meghiúsult"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "A választott kódolás nem megfelelő."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Érvénytelen fájlkódolás"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Fájlméret több mint %s, nem nyitható meg online."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Fájl megtekintése sikertelen"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Érvénytelen fájl formátum."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "A kötet nem létezik."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "A kötet titkosítva van."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "A szerkesztés sikertelen"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "A fájl nem létezik."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Az online szerkesztés nem elérhető a fájltípushoz."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Kvóta beállítása sikertelen: belső hiba"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "%s törlése sikeres"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "A felhasználó nem létezik, nem lehet törölni"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s adminisztrátornak való beállítása sikeres"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "A felhasználót nem lehet adminisztrátornak jelölni, a felhasználó nem létezik"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "%s felhasználótól az adminisztrátori jogok megvonása sikeres"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "A felhasználótól nem lehet megvonni az adminisztrátori jogokat, a felhasználó nem létezik"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "\"%s\" sikeresen aktiválva."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Aktiválás sikertelen, a felhasználó nem létezik."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "\"%s\" aktiválás sikeresen megszüntetve."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Aktiválás megszüntetése sikertelen, a felhasználó nem létezik."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Felhasználói fiókja aktiválásra került itt: %s."
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "Megváltozott jelszó itt: %s"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Jelszó sikeresen átállítva erre: %(passwd)s. Egy e-mailt küldtünk %(user)s részére."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Jelszó sikeresen átállítva erre: %(passwd)s, de a %(user)s felhasználónak nem sikerült az e-mailt elküldeni. Ellenőrizze a levelezés beállításokat."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "%(user)s jelszava sikeresen átállítva erre: %(passwd)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5622,47 +6050,53 @@ msgid ""
 "configured."
 msgstr "Jelszó sikeresen átállítva erre: %(passwd)s, de a(z) %(user)s felhasználónak nem lehet levelet küldeni mert a levél küldés nincs megfelelően beállítva."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Jelszó átállítása sikertelen: a felhasználó nem létezik"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Seafile regisztráció"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Önt meghívták ide: %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "%s hozzáadása sikeres. E-mail értesítés kiküldve."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "%s hozzáadása sikeres. E-mail értesítés kiküldése sikertelen."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "%s hozzáadása sikeres."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "%s hozzáadása sikeres. E-mail értesítés kiküldése sikertelen, mivel nincs jól beállítva."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Átadás sikeres."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Átadás sikertelen, a(z) %s felhasználó nem létezik"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Átadás sikertelen, érvénytelen paraméterek."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "%s adminisztrátornak való beállítása nem sikerült"
diff --git a/locale/is/LC_MESSAGES/django.po b/locale/is/LC_MESSAGES/django.po
index 4ce72a16c3..cfa93bed41 100644
--- a/locale/is/LC_MESSAGES/django.po
+++ b/locale/is/LC_MESSAGES/django.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-28 13:20+0000\n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-12 14:48+0000\n"
 "Last-Translator: hjolli \n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/seahub/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -19,175 +19,207 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
-msgstr "Það er nú þegar notandi með þetta netfangu"
+msgstr "Það er nú þegar notandi með þetta netfang"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Lykilorðin stemma ekki"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Nafn má ekki vanta"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Nafnið er of langt (hámark er 255 stafir)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Lýsingu má ekki vanta"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Lýsingin er of löng (hámark er 100 stafir)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Ekki má nota nafnið %s"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Vantar frumgildi"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Gamla nafnið er áskilið"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Það er of langt"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Það er áskilið"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Ekki má nota nafnið \"%s\""
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "Geymsluauðkenni er skylirði"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Notandanaf er áskilið"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "Lykilorð er má ekki vanta"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Ekki gott 'url'"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Rangt lykilorð"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Kerfisvilla"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Villa í dulkóðuðu safni"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Netfang er áskilið"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Kvóta má ekki vanta"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Kvótinn er of lítill (lágmark er 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Safnanafn er áskilið"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Safnalýsing er áskilið"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Vinsamlegast sláðu inn tölu"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Vinsamlegast sláðu inn rétt lykilorð."
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr "français"
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -196,8 +228,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Skrá Samvinna Teymi Samfélag"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Umræða"
 
@@ -209,16 +242,17 @@ msgstr "Umræða"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -228,13 +262,13 @@ msgstr "Skrá"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -243,9 +277,9 @@ msgstr "Skráarsafns smámynd"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s svör"
@@ -256,43 +290,48 @@ msgstr "Engar umræður"
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Er að sækja..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Tókst ekki, vinsamlegast athugaðu nettenginguna"
 
@@ -341,6 +380,25 @@ msgstr "Vinsamlegast athugaðu nettenginguna"
 msgid "New Replies"
 msgstr "Ný svör"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Skilaboð"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Skilaboð með %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "Engin skilaboð."
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Persónulegar upplýsingar"
@@ -354,10 +412,11 @@ msgid "Important dates"
 msgstr "Mikilvægar dagsetningar"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Hópar"
 
@@ -370,72 +429,74 @@ msgstr "Lykilorði breytt giftursamlega"
 msgid "Change password: %s"
 msgstr "Breyta lykilorði: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Notandanafn"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Lykilorð"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Vinsamlegast sláðu inn rétt notandanafn og lykilorð.  Athugaðu að há- og lágstafir skipta máli."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Þessi reikningur er óvirkur."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Ekki er búið að virkja kökur (e. cookies) í vafranum þínum.  Þær eru skilyrði til að hægt sé að skrá sig inn."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "Netfang"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Tókst ekki að senda tölvupóst, tölvupóstþjónustan er líklegast ekki rétt sett upp, vinsamlegast hafðu samband við kerfisstjóra."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Þetta netfang er ekki tengt neinum skráðum notanda.  Ertu viss um að þú sért skráður?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Lykilorð endurstillt á %s"
+msgid "Reset Password on %s"
+msgstr "Endursetja Lykilorð á %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Staðfesting nýs lykilorðs"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Gamla lykilorðið"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Þú slóst gamla lykilorðið ekki rétt inn.  Vinsamlegast sláðu það inn aftur."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Lykilorðið (aftur)"
 
@@ -473,7 +534,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Þú hefur nú þegar %(nb_avatars)d sámyndir og leyfilegur hámarksfjöldi er %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Smámynd fyrir %s"
@@ -541,57 +602,62 @@ msgstr "Núverandi smámynd:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Samþykkja"
@@ -608,7 +674,7 @@ msgstr "%(avatar_creator)s hafa uppfært smámyndir
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Þú hefur uppfært smámyndina þína %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Sjálfgefin smámynd"
 
@@ -640,7 +706,7 @@ msgstr "sími"
 msgid "note"
 msgstr "athugasemd"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Ekki er hægt að skoða skrár í þessu safni á vefnum."
 
@@ -697,7 +763,7 @@ msgstr "Endursetti skráarstöðu \"%(file)s\" á %(time)s. "
 msgid "Recovered deleted directory"
 msgstr "Endurheimti eyddu skráarsafni"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Breytti nafni á safni eða lýsingu"
 
@@ -707,9 +773,9 @@ msgstr "Steypt saman sjálfvirkt af Seafile kerfinu"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Rétt í þessu"
 
@@ -745,42 +811,48 @@ msgstr[1] "fyrir %(seconds)d sekúndum síðan"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Lesa-Skrifa"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Aðeins-Lesa"
 
@@ -789,33 +861,33 @@ msgstr "Aðeins-Lesa"
 msgid "Email is required."
 msgstr "Netfang er áskilið"
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s er ekki leyfilegt netfang."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s er nú þegar félagi þinn."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Tókst að bæta við %s í félagahópinn"
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Tókst ekki að bæta við %s í félagahópinn."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Tókst að breyta %s."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Tókst að eyða %s."
@@ -840,10 +912,10 @@ msgstr "Netfang"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -851,45 +923,46 @@ msgstr "Netfang"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nafn"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Athugasemd"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -898,56 +971,64 @@ msgstr "Athugasemd"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Aðgerðir"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Breyta"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Eyða"
 
@@ -963,17 +1044,19 @@ msgstr "Bættu félögum þínum við svo þú getir deilt með einföldum hætt
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Netfang"
 
@@ -998,8 +1081,8 @@ msgid "Delete Contact"
 msgstr "Eyða Félaga"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1075,400 +1158,415 @@ msgstr "Staðfestingarskilaboð eru of löng (hámark eru 255 stafir)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" er ekki tekið gilt sem nafn"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Þú getur aðeins búið til %d hópa. Uppfærðu reikninginn þinn."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Það er þegar til hópur með þetta nafn."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Tókst að endurnefna hópinn sem \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Tókst ekki að endurnefna hópinn, hópanafn getur aðeins innihaldið bókstafi, númer og undirlínu"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Netfangið %s er ekki leyfilegt."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Aðeins kerfisstjórar geta búið gert hópinn opinn öllum"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Skilaboðin eru ekki til"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Þú hefur ekki leyfi."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Þú getur aðeins boðið %d félögum. Uppfærðu reikninginn."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Félagi þinn bætti þér í hóp á Seafile"
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Þér hefur verið boðið í hóp á %s"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Tókst ekki að bæta við, %s er ekki í kerfinu."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Tókst að bæta við. Tölvupóstur hefur verið sendur."
 msgstr[1] "Tókst að bæta við. %(count)s netföng hafa verið send."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Tókst að bæta við."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Tókst ekki að bæta við, %s er ekki leyfilegt netfang."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Tókst ekki að bæta við, %s er ekki í kerfinu."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Aðgerð tókst."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Tókst ekki: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Tókst ekki að taka deilingu af: hópurinn er ekki til."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Aðgerð tókst ekki: aðeins kerfisstjórar og eigandi safnsins geta tekið deilingu af."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Tókst ekki að taka deilingu af: kerfisvilla."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Villa: rangt hópa auðkenni"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Villa: hópurinn er ekki til."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Tókst að senda til %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Villa: þú ert ekki í hópnum %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Villa: safnið er ekki til."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Villa: engin slóð."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Tókst ekki að búa til: hópurinn er ekki til."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Tókst ekki að búa til: þú ert ekki í hópnum."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Tókst ekki að búa til"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Tókst ekki að búa til: kerfisvilla."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Þú ert þegar í hópnum."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Tókst að senda, kerfisstjóri hópsins mun sjá um þetta."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr "Umræða er skilyrði."
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Skrá er ekki til"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "Virkja \"Wiki\"."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "Slökkva á \"Wiki\"."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Mistókst að búa til wiki síðu.  Vinsamlegast reynið aftur síðar."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Kerfisvilla"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Þetta wiki er ekki til."
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Tókst ekki að búa til heima síðuna. Vinsamlegast reynið aftur síðar"
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Mistókst að setja wiki safn"
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Fann ekki þetta wiki."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Síðan \"%s\" er þegar til."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s býður þér að ganga í hópinn %(group.group_name)s. Vinsamlegast smelltu á eftirfarandi tengil og skráðu þig í kerfið:"
+msgid "Successfully deleted \"%s\"."
+msgstr "Tókst að eyða \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Takk fyrir að nota síðuna okkar!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s teymið"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Mistókst að eyða \"%s\". Vinsamlegast reyndu síðar."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Hæ,"
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr "%(email)s bauð þér í hópinn %(grp_name)s á %(site_name)s: "
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Fela svör"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Svara"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Bæta við svari..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Það má ekki vanta og ætti ekki að vera meira en 2048 stafir."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Þessi hópur er opinn öllum."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Virkja Viðbætur"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Hætta"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Þessi hópur er opinn öllum."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Söfn"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Skrár"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Félagar"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Stjórna"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Hætta í hópi"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Ertu viss um að þú viljir hætta í þessum hópi"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Bæta við umræðu..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Bæta við skrám"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr "Veldu skrá eða skrár:"
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Eftir innskráningu, þá getur þú tekið þátt í umræðunni"
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Fyrri"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Næsta"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Efst"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Viltu virkilega eyða þessari umræðu"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Já"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Nei"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Eytt giftursamlega"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Mistókst að eyða: "
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Mistókst"
 
@@ -1477,6 +1575,7 @@ msgid "Recent Changes"
 msgstr "Nýlegar Breytingar"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1485,79 +1584,60 @@ msgstr "Nýtt Safn"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Lýsing"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Síðasta Uppfærsla"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Deilt af"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "smámynd skráarsafn"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
-msgstr "Hala niður og fasa"
+msgstr "Hala niður og samstilla"
 
 #: seahub/group/templates/group/group_info.html:55
 #: seahub/share/templates/share/list_priv_shared_folders.html:43
@@ -1571,7 +1651,7 @@ msgstr "Hala niður og fasa"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Taka deilingu af"
 
@@ -1608,15 +1688,16 @@ msgid "Modified at"
 msgstr "Breytt af"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Breytir"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1625,23 +1706,23 @@ msgid "Details"
 msgstr "Í hnotskurn"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Ekkert"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Óþekkt"
 
@@ -1660,15 +1741,43 @@ msgstr "Lykilorð: "
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Lykilorðið verður aðeins geymt í eina klukkustund"
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Hætta deilingu Safns"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Ertu viss um að þú viljir loka safninu %s ?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "smámynd skráarsafn"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Engin opin söfn í þessum hópi"
@@ -1685,14 +1794,25 @@ msgid ""
 "message: "
 msgstr "%(user)s vill ganga í Hópinn \"%(group_name)s\", hér eru staðfestingarskilaboð:"
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Takk fyrir að nota síðuna okkar!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s teymið"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Kerfisstjórar"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Stillingar"
 
@@ -1700,7 +1820,7 @@ msgstr "Stillingar"
 msgid "Add Members"
 msgstr "Bæta við Félögum"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Bæta við Kerfisstjórum"
 
@@ -1709,7 +1829,7 @@ msgid "Avatar"
 msgstr "Smámynd"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Breyta"
 
@@ -1728,7 +1848,7 @@ msgid "Make Public"
 msgstr "Gera Opinbert"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Flytja"
 
@@ -1752,29 +1872,41 @@ msgstr "Hint: netfangið ætti nú þegar að vera skráð"
 msgid "Rename Group To"
 msgstr "Endurnefna Hóp sem"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Loka Hópi"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Viltu virkilega loka þessum hópi?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Eyða Félaga"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Viltu virkilega eyða %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Hætta"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Bæta við í Félagaskrá"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Hætta í hópi"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Ertu viss um að þú viljir hætta í þessum hópi"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Ganga í Hóp"
@@ -1801,12 +1933,29 @@ msgstr "Félagar: "
 msgid "Verification Message"
 msgstr "Staðfestingarskilaboð"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Wiki yfirlit"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Ekkert yfirlit."
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Búa til"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Þessi hópur hefur enn ekkert wiki."
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1814,82 +1963,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile Wiki gerir þér kleyft að skipuleggja hugmyndir þínar á auðveldan máta.  Efnið í hverju wiki er geymt í venjulegu safni með fyrirfram skilgreindri skipan.  Þetta gerir þér kleyft að skrifa í það í þeim ritli sem þú kýst að nota og hlaða því svo upp á þjóninn."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Búa til wiki núna."
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Veldu safn sem wiki"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Búa til wiki."
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wiki síður"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Veldu safn sem wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Smelltu og veldu safn."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Heim"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Síður"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki saga"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Ný Síða"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Eyða Síðu"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Breyta Síðu"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Saga síðunnar"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Síðast breytt af %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Ertu viss um að þú viljir eyða þessari síðu?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Nafn er áskilið"
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Lýsing er áskilin"
 
@@ -1932,14 +2104,16 @@ msgstr "Nafn Hóps"
 
 #: seahub/group/templates/group/grpmember_add_form.html:3
 msgid "Add members"
-msgstr "Bæta vði félögum"
+msgstr "Bæta við félögum"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Færa inn"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "netföng, aðskilin með ','"
 
@@ -1949,13 +2123,14 @@ msgstr "Hint: boð verður sent ef netfang er ekki skráð"
 
 #: seahub/group/templates/group/grpmember_add_form.html:14
 msgid "Tip: the emails should be already registered."
-msgstr "Hiint: netföng ættu að vera skráð nú þegar"
+msgstr "Hint: netföng ættu að vera skráð nú þegar"
 
 #: seahub/group/templates/group/grpmember_add_js.html:8
 msgid "Add administrators"
 msgstr "Bæta við kerfissjórum"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Bættu við eða veldu netföng"
 
@@ -2234,135 +2409,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Seafile þjónar gyema ekki lykilorðin á dulkóðuðum söfnum.  Til að skoða dulkóðað safn þegar þú ert nettengdur því, þá þarftu að slá inn lykilorðið fyrir safnið. Lykilorðið er aðeins geymt í dulkóðuðu minni á þjóninum.  Það verður hreinsað úr minninu eftir eina klukkustund.  Ef þú vilt skoða safnið eftir þann tíma þá verðuru að slá lykilorðið aftur inn."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "skilaboð eru áskilin"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "tengiliður er áskilinn"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Þú getur ekki sent skilaboð til sjálfs þíns."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Tókst ekki að senda skilaboð til %s, notandi fannst ekki."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Skilaboð"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Ný Skilaboð"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Skilaboð"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Tími"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "skilaboð..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Bæta við skrám"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "senda til: smelltu til að velja félaga"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "bættu fyrst við félögum"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Fann ekki félaga þína þegar ég sendi skilaboðin."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Í augnablikinu áttu engin söfn"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Skilaboð með %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Senda skilaboð..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Skrá sem heitir %(file_name)s er hlaðið upp í skráarsafnið %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s hefur deilt safni með þér sem heitir %(repo_name)s."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s deildi skránni %(file_name)s með þér."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr "Þú hefur fengið ný skilaboð frá %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "kerfisvilla"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s hóf nýja umræðu"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s hóf nýja umræðu í %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "Nýtt svar í einni hópumræðunni"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s svaraði hópumræðunni þinni"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s óskar eftir því
 msgid "Successfully cleared all notices."
 msgstr "Tókst að hreinsa burt allar tilkynningar."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Bæta við athugasemd"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr "Hæ %(name)s,"
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] "\nÞú átt ein ný skilaboð á %(site_name)s.\n"
+msgstr[1] "\nÞú átt %(num)s ný skilaboð á %(site_name)s.\n"
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr "Endilega athugaðu eftirfarandi síðu:"
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Allar athugasemdir"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Bæta við athugasemd"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Athugasemdir Ítarefni"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(núverandi athugasemd)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Virkja"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Tómt"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Eyða Athugasemd"
 
@@ -2425,27 +2604,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Vinsamlegast veljið hvernig skoða skal dulkóðuð söfn á vefnum:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Senda lykilorð til þjónsins."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Skrár verða afkóðaðar á þjóni áður en þær verða sendar til þín."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Vista lykilorðið í vafranum þínum."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Skrár verða afkóðaðar í vafranum þínum þegar þú halar þeim niður."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2477,81 +2656,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "Tókst að setja \"%s\" sem sjálfgefna safnið þitt."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Stillingar Persónuupplýsinga"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Persónuupplýsingar"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Tungumál"
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Dulkóðuð söfn"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Undirsafn"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Sjálfgefið Safn"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Eyða reikningi."
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Smámynd:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Uppfæra"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Nafn"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Um Mig"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Deild"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Sími"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Tungumálastylling"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Stillingar fyrir dulkóðuð söfn"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Hvernig það á að skoða dulkóðuð söfn á vefnum:"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Undirsafnastillingar"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Virkja undirsöfn"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2560,7 +2746,7 @@ msgid ""
 "library."
 msgstr "Þessi eiginleiki gerir þér kleyft að fasa skráarsöfn í safninu.  Hægt er að búa til undirsafn í hvaða skráarsafni sem er.  Eftir að það hefur verið búið til, þá mun það sjást í Seafile forritinu þínu og þú getur hlaðið því niður eins og þú hleður niður hvaða öðru safni sem er.  Því verður haldið sjálfvirkt í fösun með móðursafninu."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2568,37 +2754,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Undirsafn er einnig notað til að deila skráarsafni með hópi eða öðrum notanda.  Ef þetta er ekki virkjað þá verður í slíkum tilfellum búið til falið undirsafn.  Ef þetta er virkjað, þá verða földu undirsöfnin einnig listuð, sem gerir þér kleyft að möndla með þau."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Sjálfgefnar Safnastillingar"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Sjálfgefna safnið þitt:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Sjálfgefna safnið er þar sem að persónuleg skjöl og myndir eru geymdar."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Veldu sjálfgefna safnið"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Það er ekki hægt að taka þessa aðgerð til baka. Vinsamlegast hugsaðu málið aftur!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Veldu skjálfgefna safnið:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Smelltu og veldu safn."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Viltu í alvörunni eyða reikningnum þínum?"
 
@@ -2611,25 +2793,25 @@ msgid "Info"
 msgstr "Upplýsingar"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Nafn"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Sjálfskynning"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Deild"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Sími"
 
@@ -2637,169 +2819,171 @@ msgstr "Sími"
 msgid "Email is not longer than 512 characters"
 msgstr "Netfang er ekki lengra en 512 stafir"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Tókst ekki að deila með öllum félögum, vinsamlegast reynið aftur síðar."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Tókst að deila til allra félaga, athugaðu það í  Deilingum."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" er þegar í hópi %(group)s.Skoða"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Tókst ekki að deila %(repo)s til %(group)s, vinsamlegast reynið aftur síðar."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Tókst að deila með %(group)s, athugaðu það í  Deilingum."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Þú getur ekki deilt safni með sjálfum þér."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Tókst ekki að deila með %s, vinsamlegast reynið aftur síðar."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Tókst að deila með %(email)s, athugaðu það í Deilingum."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Tókst ekki að deila með %s, þar sem að netfangið er ekki skráð."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Aðeins eigandi safnsins hefur leyfi til að deila því."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Tókst ekki að deila \"%s\", ekki nægur kvóti. Uppfærðu reikninginn."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Óleyfileg breyta"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Tókst ekki að taka deilingu af"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "hópauðkenni er ekki gilt"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Tókst að taka deilingu af"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "Allir félagar"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Ógild gildi"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Þú getur ekki deilt safni með þessum hætti."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Tókst ekki að sækja tengilinn, vinsamlegast reyndu aftur síðar."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Tókst að fjarlægja"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Tengillinn er ekki til"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Tókst ekki að senda tengilinn.  Tölvupóstþjónustan er ekki alveg rétt styllt, vinsamlegast hafðu samband við kerfisstjóra."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Vinur deildi skrá með þér á Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr "Skrá er deilt með þér á %s"
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Kerfisvilla. Sending mistókst."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Tókst að senda."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Veldu skáarsafn."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Tókst að vista."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Tókst ekki að deila með \"%s\", notandi finnst ekki."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Deildi %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Slökkt á deilingu á \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
+msgid "You don't have permission to unshare %s."
 msgstr "Þú hefur ekki leyfi til að taka deilingu af %s."
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Þú hefur ekki leyfi til að vista %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Tókst ekki að sækja tengilinn, vinsamlegast reyndu aftur síðar."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "Mistókst að senda tengil til að deila.  Póstþjónustan er ekki rétt stillt, vinsamlegast hafðu samband við kerfisstjóra."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Félagi þinn deildi tengli með þér á Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr "Upphleðsluslóð er deilt með þér á %s"
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2820,14 +3004,15 @@ msgstr "Heimsóknir"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Skoða"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Fjarlægja"
 
@@ -2856,7 +3041,7 @@ msgid "Folders - Share"
 msgstr "Skráarsöfn - Deilt"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Skráarsöfn"
 
@@ -2881,13 +3066,13 @@ msgid ""
 msgstr "Þú getur deilt deilt einu skráarsafni með skráðum notanda ef þú vilt ekki deila öllu safninu."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Breyting tókst"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Breyting mistókst"
@@ -2954,7 +3139,7 @@ msgstr "Deilingar"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Grunnupplýsingar"
 
@@ -2967,7 +3152,8 @@ msgid "Add to contacts"
 msgstr "Bæta við í félagatali"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Yfirgefa Deilingu"
 
@@ -2988,56 +3174,24 @@ msgstr "Virkni"
 msgid "Exit System Admin"
 msgstr "Hætta Kerfisstjórnun"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Notendur"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Athugasemdir"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Tenglar"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Kerfisstjórnun"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "ólesnar tilkynningar"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Innskrá"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Skráðu þig"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Útskrá"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Útgáfa Þjóns:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Kerfisstjórnun"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Hafðu samband"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Allir Hópar"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Tengingar"
 
@@ -3045,7 +3199,7 @@ msgstr "Tengingar"
 msgid "Client Name"
 msgstr "Nafn biðlara"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "Auðkenni"
 
@@ -3086,28 +3240,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Þetta safn er dulkóðað.  Vinsamlegast sláðu inn lykilorðið ef þú vilt skoða það. Lykilorðið verður aðeins geymt á þjóninum í eina klukkustund"
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Lykilorð:"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Þú getur breytt því hvernig dulkóðuð söfn eru skoðuð á vefnum hér."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Vinsamlegast sláðu inn lykilorð."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Tæki"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Verkvangur"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Nafn Tækis"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Seinast Skoðað"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Söfn"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Aðgerð"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Aftengja"
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "Viltu virkilega aftengja %s?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "Það mun strax hætta fösun."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "Þú hefur ekki tengt nein tæki"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "Tækin þín (Desktop/Android/iOS) verða skráð hér."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Tókst að aftengja."
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3117,8 +3323,7 @@ msgstr "Niðurhlaða"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Núverandi slóð:"
 
@@ -3433,9 +3638,9 @@ msgid "Password is required."
 msgstr "Lykilorð er áskilið."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Saga"
@@ -3454,16 +3659,11 @@ msgstr "Hint: ný útgáfa verður búin til eftir hverja breytingu og þú getu
 msgid "Current Path:"
 msgstr "Núverandi Slóð:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Breytt síðast af"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Stærð"
 
@@ -3471,38 +3671,55 @@ msgstr "Stærð"
 msgid "(current version)"
 msgstr "(núverandi útgáfa)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Endurnefnt eða fært frá %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Endurheimta"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Munur"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Lesefni"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Kynning"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Hjálp"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Biðlari"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile fyrir Windows, Mac og Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Útgáfa Þjóns:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Hafðu samband"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3531,12 +3748,13 @@ msgstr "ruslafata"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Aftur í Safn"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3551,36 +3769,57 @@ msgstr "Mitt eigið"
 msgid "Starred"
 msgstr "Stjörnumerkt"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Mitt wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Stjórnun deilinga"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Tenglar"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Hópur"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Engu safni er deilt til hópsins þíns"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Engu safni er deilt með þér"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Velkomin í Seafile"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile flokkar skrár í söfn.  Hverju safni fyrir sig er hægt að deila og fasa við önnur tæki.  Við höfum búið til eitt safn fyrir þig.  Þú getur búið til önnur söfn síðar."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Loka"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Heimasvæðið mitt"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Samfélagið"
@@ -3591,11 +3830,11 @@ msgid ""
 "current account."
 msgstr "Samfélagi verður eytt í næstu útgáfu, gögnum verður skeytt saman við núverandi reikning þinn."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3617,420 +3856,452 @@ msgstr "Enginn getur búið til neina hópa ennþá"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Þú getur smellt á \"Bæta við Hópi\" takkann undir \"Hópar\" til að búa til hóp."
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Deilt af"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Engin opin söfn"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Þú getur búið til opið safn með því að smella á \"Nýtt Safn\", aðrir geta skoðað og hlaðið því niður."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Ruslafata"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Leita að félögum..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Stærð:"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Ruslafata"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Færa"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Afrita"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Hlaða upp Skrá"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Eigandi þessa safns hefur fullnýtt plásskvótann sinn."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Vinsamlegast veljið fyrst skrá."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Bæta við Skrá"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Ræsa allt"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Hætta við allt"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Draga & Sleppa er stutt í Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "Skráarstærð ætti að vera minni en %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Vista..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Uppfæra %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Veldu skrá"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Minna en %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nýtt Skráarsafn"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nafn Skráarsafns"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Ný Skrá"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Sérstaklega studdar Skráargerðir"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Smelltu til að velja"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "RTF vef sniðmát"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "Ívafsmál."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Skráarnafn"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Núverandi Safn"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Önnur Söfn"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Smelltu og veldu skráarsafn"
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Endurnefna %(name)s sem:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Fasa %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Undirsafn verður búið til undir þessu skráarsafni.  Það mun sjást í safnalistanum í skjáborðsbiðlaranum (e. desktop client) þínum og þú getur hlaðið því niður eins og þú getur gert með önnur söfn."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Búa til"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Þetta safn er dulkóðað.  Vinsamlegast sláðu inn lykilorðið ef þú vilt skoða það. Lykilorðið verður aðeins geymt á þjóninum í eina klukkustund"
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Skrá er of stór"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Skrá er of lítil"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Skráargerð er ekki leyfð"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Hámarksfjölda skráa hefur verið náð"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Upphlaðin bæti eru yfir skráarstærð"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Tómri skrá hlaðið upp"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Villa"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Byrja"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Eyða atriðum"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Ertu viss um að þú viljir eyða þessum völdu atriðum?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Er að vinna..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Tókst að eyða %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Tókst að eyða %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Kerfisvilla.  Tókst ekki að eyða %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Kerfisvilla.  Tókst ekki að eyða %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Færa valin skráarsöfn og/eða valdar skrár til:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Afrita valin skráarsöfn og/eða valdar skrár til:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Ekki leyfileg viðtökuslóð"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Tókst að færa %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Tókst að færa %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Tókst að afrita %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Tókst að afrita %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Kerfisvilla.  Mistókst að færa %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Kerfisvilla.  Tókst ekki að færa %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Kerfisvilla.  Tókst ekki að afrita %(name)s auk %(amount)s annarra atriða."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Kerfisvilla.  Mistókst að afrita %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Færi..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Afrita..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "Tókst að færa %(s_num)s atriði."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "Mistókst að færa %(f_num)s atriði."
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "Tókst að afrita %(s_num)s atriði."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Mistókst"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Dulkóða skrána"
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Villa við dulkóðun."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Dulkóða, %(num)s% lokið."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Er að hlaða upp..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Búin!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Er að hala niður... "
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Niðurhala, $(num)s% lokið."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Er að dulkóða..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Afkóða, %(num)s% lokið."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Tókst að eyða %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Endurnefna Skrá"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Endurnefna Skráarsafn"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Afrita Skrá"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Færa Skrá"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Afrita Skráarsafn"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Færa Skráarsafn"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Afrita %(name)s sem:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Færði %(name)s til:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Niðurhal skráarsafnn er ekki stutt í þessu safni."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "Taka stjörnu af"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "stjörnumerkt"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Undirsafn er búið til"
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "þetta er áskilið."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Aðeins skráarending til staðar, vinsamlegast settu inn nafn á skránna."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Bý til..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Þú hefur ekki endurnefnt hana/það."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Tókst að endurnefna %(old_name)s til %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Hætt við."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Vinsamlegast veldu a.m.k einn félaga."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Vinsamlegast settu inn netfang eða hóp, eða veldu úr."
 
@@ -4052,11 +4323,12 @@ msgstr "Hint: eftir breytingarnar verður búin til skyndimynd af safninu, sem g
 msgid "View Snapshot"
 msgstr "Skoða Skyndimynd"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Fyrir hverja síðu:"
@@ -4097,34 +4369,78 @@ msgstr "allt"
 msgid "Delete Time"
 msgstr "Eyða Tíma"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Styllingar Safna"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Skrá alla söguna"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Ekki skrá sögu"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Skrá sögu í ákveðinn tíma"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "dagar"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Skipta um eiganda"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Gefa öðrum notanda þetta safn"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Breyta Lykilorði."
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Breyta lykilorðinu fyrir þetta safn:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Gamla Lykilorðið"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Nýja Lykilorðið (a.m.k. 6 stafir)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Endurtaktu Nýja Lykilorðið"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Vinsamlegast sláðu inn gamla lykilorðið"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Vinsamlegast sláðu inn nýja lykilorðið"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "Nýja lykilorðið er of stutt"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "Nýja lykilorðið er of langt (hámakrsfjöldi eru 35 stafir)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Vinsamlegast sláðu inn nýja lykilorðið aftur"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Nýju lykilorðin stemma ekki"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Aftur í breytingasögu"
@@ -4133,6 +4449,10 @@ msgstr "Aftur í breytingasögu"
 msgid "Create Time"
 msgstr "Búa til Tíma"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Breytt síðast af"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4175,8 +4495,14 @@ msgstr "Seafile biðlarinn þinn er of gamall, vinsamlegast uppfærðu hann í n
 msgid "Click to download."
 msgstr "Smelltu til að niðurhala"
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Vinsamlegast sláðu inn lykilorðið ef þú vilt skoða skrá/skráarsafn sem hefur verið deilt með þér.  Lykilorðið verður aðeins geymt á þjóninum í eina klukkustund."
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Deilt af:"
 
@@ -4188,25 +4514,26 @@ msgstr "Vista í..."
 msgid "Save To:"
 msgstr "Vista í:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Hæ,"
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Þú færð þennan tölvupóst vegna þess að %(email)s deildi skrá með þér á %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s deildi skrá með þér á %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Vinsamlegast farðu á eftirfarandi síðu og skoðaðu skránna:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Þú færð þennan tölvupóst vegna %(email)s deildi upphleðslutengli með þér á %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s deildi upphleðsluslóð með þér á %(site_name)s."
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Þú getur farið á eftirfarandi síðu og hlaðið upp skránum þínum:"
 
@@ -4218,8 +4545,8 @@ msgstr "Stjörnur"
 msgid "icon"
 msgstr "smámynd"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Taka stjörnu af"
 
@@ -4274,49 +4601,49 @@ msgstr "til"
 msgid "Sorry, this user is not registered yet."
 msgstr "Afsakið, en þessi notandi er ekki enn skráður."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Setja stjörnu á"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "uppfærði þessa skrá"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "einn meðhöfundur"
 msgstr[1] "%(counter)s meðhöfundar"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Tókst að taka stjörnu af"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Stjörnumerkt með glæsibrag"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "þú getur einnig smellt á ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "fyrra"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "þú getur einnig smellt á → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "næsta"
 
@@ -4325,7 +4652,7 @@ msgstr "næsta"
 #: seahub/templates/view_file_text.html:31
 #: seahub/templates/snippets/file_encoding.html:5
 msgid "Encoding:"
-msgstr "Afkóða:"
+msgstr "Stafatafla:"
 
 #: seahub/templates/view_file_markdown.html:23
 #: seahub/templates/view_file_sf.html:16
@@ -4335,7 +4662,7 @@ msgid "auto detect"
 msgstr "finna út sjálfvirkt"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Allur Skjárinn"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "er að vinna í þessu..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Þú getur notað IE 10 eða aðra vafra, t.d. firefox til að skoða það þegar þú ert nettengdur."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Til að skoða það þegar þú ert nettengdur þá geturðu notað firefox, chrome eða IE 9"
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Ekki er hægt að skoða þessa skráargerð í vafranum"
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4382,41 +4709,55 @@ msgstr "Hlaða upp skrám til %(dir_name)s"
 msgid "shared by:"
 msgstr "deilt af:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Innskrá"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(gleymdi lykilorðinu)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "Staðfestingarkóði"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Óljós? Fáðu nýjann."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Rangt netfang eða lykilorð"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Mundu mig í %(remember_days)s daga"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Skráðu þig"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Tókst ekki að gera nýjann staðfestingarkóða, vinsamlegast reyndu aftur síðar."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "Netfang má ekki vanta"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Lykilorðið má ekki vanta"
 
@@ -4470,13 +4811,13 @@ msgstr "Lykilorð endurstillt"
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Lykilorð Endurstillt"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Sláðu inn nýtt lykilorð"
+msgid "Reset Password"
+msgstr "Endursetja Lykilorð"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4487,23 +4828,19 @@ msgid "Password Reset Successfully"
 msgstr "Lykilorð endurstillt"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Við munum senda þér tölvupóst til að endurstilla lykilorðið"
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Við höfum sent þér tölvupóst til að endursetja lykilorðið."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Þú fékkst þennan tölvupóst vegna þess að þú hefur beðið um endurstillingu lykilorðsins þíns fyrir %(site_name)s."
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "Til að endursetja lykilorðið þitt fyrir %(account)s á %(site_name)s, vinsamlegast smelltu á eftirfarandi slóð: "
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Vinsamlegast farið á eftirfarandi vefsíðu og veljið nýtt lykilorð"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Notandanafnið þitt, bara svona ef þú varst búinn að gleyma því:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Ef þú baðst ekki um þetta, þá skaltu hundsa þetta."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4533,23 +4870,31 @@ msgstr "Skráningu er lokið, vinsamlegast bíddu eftir að kerfisstjóri virki
 msgid "Register"
 msgstr "Skráðu þig"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Gaman að sjá þig aftur, þú ert þegar skráð/ur inn."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Staðfestu lykilorðið"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "Nýskrá"
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Vinsamlegast sláðu lykilorðið inn aftur"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Lykilorðin stemma ekki"
 
@@ -4563,18 +4908,12 @@ msgstr "er ekki stutt.  Skráarendingar geta aðeins verið"
 
 #: seahub/templates/snippets/avatar_upload_js.html:52
 msgid " is too large. Allowed maximum size is 1MB."
-msgstr "er of stór. Hámarksstærð er 1MB"
+msgstr " er of stór. Hámarksstærð er 1MB"
 
 #: seahub/templates/snippets/bottom_bar.html:3
 msgid "Discuss"
 msgstr "Umræða"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Hópur"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Vinsamlegast veljið að minnsta kosti einn hóp."
@@ -4583,10 +4922,6 @@ msgstr "Vinsamlegast veljið að minnsta kosti einn hóp."
 msgid "Please input a discussion."
 msgstr "Vinsamlegast ræðið."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Búið tið af kerfinu"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4605,42 +4940,66 @@ msgstr "Upphleðslutengill"
 msgid "Private Share"
 msgstr "Eigin Deiling"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Nota Lykilorð"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(a.m.k. 6 stafir)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Lykilorð aftur"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Setja Gildislok"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Dagar"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Mynda"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Tengill:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Senda"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Senda til:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Netföng aðskilin með ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Sendi..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Þú getur deilt tenglinum með öðru fólki og það getur notað hann til að hlaða upp skrám í þetta skráarsafn."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Upphleðslutengill:"
 
@@ -4693,7 +5052,7 @@ msgid "Sub-libraries"
 msgstr "Undirsöfn"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Deilt"
 
@@ -4724,29 +5083,23 @@ msgid ""
 " library."
 msgstr "Þú getur búið til undirsafn í hvaða skráarsafni sem er.  Undirsafn getur verið fasað og deilt sjálfstætt.  Skrár í undirsafninu verða sjálfkrafa fasaðar með þeim sem eru í móðursafninu."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Engu safni er deilt með þér"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Engu safni er deilt til hópsins þíns"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Skráin er í vinnslu, vinsamlegast bíðið..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "fela yfirlit"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "sýna yfirlit"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Umskráning skjala mistókst."
 
@@ -4763,27 +5116,29 @@ msgstr "Dulkóða"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(að minnsta kosti %(repo_password_min_length)s stafir)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Lykilorð aftur"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Nafn er áskilið"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Lýsing er áskilin"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Vinsamlegast sláðu inn lykilorð"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Lykilorðið er of stutt"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Lykilorðið er of langt (hámarkið er 35 stafir)"
 
@@ -4796,7 +5151,7 @@ msgstr "Eyðing tókst."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Viltu virkilega eyða %(lib_name)s?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Hlaða upp"
 
@@ -4923,15 +5278,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Vinsamlegast veldu a.m.k. eina skráartegun eða settu inn a.m.k. eina skráarendingu"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Veldu félaga"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Vinsamlegast settu inn að minnsta kosti eitt netfang"
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Vinsamlegast sláðu inn daga"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Vinsamlegast sláðu inn gilda daga"
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4944,7 +5307,7 @@ msgstr "Eigin"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Deila"
 
@@ -4956,6 +5319,22 @@ msgstr "Umferð í þessum mánuði:"
 msgid "Payment"
 msgstr "Greiðsla"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Notendur"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Athugasemdir"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Umferð"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Kladdar"
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Færa safn"
@@ -4966,74 +5345,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Færa %(lib_name)s í:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Eigandi"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Allir Hópar"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Stofnandi"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Stofna Á"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Eyða Hópi"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Leita að notendum..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Gagnagrunnur"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Leita"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Búa til á / Síðasta Innskráning"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Notað Pláss"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Leita að söfnum eftir nafni..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Allt"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Munaðarlaus"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Kerfi"
 
@@ -5049,96 +5428,117 @@ msgstr "Veffangs Forskeiti"
 msgid "Delete Organization"
 msgstr "Eyða Samfélagi"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Allir Opinberir Tenglar"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Fjöldi"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Leita í Safni"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Hint: þú getur leitað eftir lykilorði í nafni eða eiganda eða bæði."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Niðurstaða"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Engin niðurstaða"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Bættu við notanda"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Notendaumferð"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Mánuður:"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Notandi"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Heildarnotkun"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr "Bæta við notanda"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr "Bæta við kerfisstjóra"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Bæta við kerfisstjórum"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr "Hint: netföngin ættu að vera notendurnir sem hafa þegar verið skráðir."
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Er að virkja..., vinsamlegast bíðið"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Lykilorð stemma ekki"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "Reikningurinn %(username)s á %(site_name)s hefur verið virkjaður."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Þú færð þennan tölvupóst vegna þess að %(user)s bætti þér við í samfélaginu \"%(org.org_name)s á %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s bauð þér í samfélagið \"%(org_name)s\" á %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Þú færð þennan tölvupóst vegna þess að %(user)s bætti þér við á %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s bauð þér í %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "Eftirfarandi eru skráningarupplýsingarnar þínar:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr "Hér eru reikningsupplýsingarnar þínar:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Netfang: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
+msgid "Password: %(password)s"
 msgstr "Lykilorð: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Vinsamlegast farðu á eftirfarandi síðu og skráðu þig inn:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Þú færð þennan tölvupóst vegna þess að kerfisstjóri hefur endurstillt lykilorðið á %(site_name)s"
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "Lykilorðið þitt á %(site_name)s hefur verið endursett. Nú er það %(password)s. Vinsamlegast breyttu því eins fjótt og þú getur. "
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Nýja lykilorðið þitt er %(password)s, vinsamlegast breyttu því eins fljótt og unnt er."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Leita að Notanda"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Hint: Notaðu * til að leita að hvaða staf sem er."
 
@@ -5152,7 +5552,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Ertu viss um að þú viljir endurstilla lykilorðið fyrir %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Taka kerfisstjóraréttindi af"
 
@@ -5162,7 +5562,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Ertu viss um að þú viljir taka kerfisstjóraréttindin af %s?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Gera að kerfisstjóra"
 
@@ -5181,437 +5580,466 @@ msgid ""
 "configuration."
 msgstr "Breyting tókst, en ekki tókst að senda tölvupóst, vinsamlegast athugið tölvupóststyllingarnar þínar."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Staða"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Virkt"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Óvirkt"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Endursetja Lykilorð"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Aftur í notendalista"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Heild"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Notað"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Setja Kvóta"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Setja kvóta á geymslurými notanda"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Hint: 0 þýðir sjálfgefinn kvóti"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Eigandi"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Þú átt ekki þitt eigið wiki."
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "Eigið wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Eigin wiki síður"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "leyfisvilla"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Get ekki skoðað endurnýjaða síðu"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Safn er ekki til"
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Þú hefur ekki leyfi til að framkvæma þessa aðgerð"
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Gat ekki breytt upplýsingum um safn"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Gat ekki vistað stillingar á þjóni"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Notandanafn %s er ekki leyfilegt."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Finn ekki notanda %s."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "Safn %(repo_name)s hefur verið flutt til %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Tókst að endursetja lykilorðið fyrir Safnið %(repo_name)s."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Skráarnafn inniheldur óleyfilega stafi"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Skráarnafn þegar til"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "Skráarstærð fór yfir stærðarmörk"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "Egiandi hefur notað allt plássið sitt, upphleðsla mistókst."
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Villa kom upp við skráarflutning"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Óleyfilegt veffang"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Getur ekki skoðað breytingar safns"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Getur ekki skoðað skyndimynd safns"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Þú hefur ekki leyfi til að endurbyggja safnið"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Vinsamlegast tilgreinið söguauðkenni"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Safn er ekki til"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "Sagan sem þú tilgreindir er ekki til"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Engir árekstrar í sameiningunni"
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Safnið mitt"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Tókst ekki að taka deilingu af safni, því það er ekki til."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Tókst að taka deilingu af \"%s\"."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Tókst ekki að taka deilingu af \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Tókst ekki að eyða skrá."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "Tókst að eyða %s."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Kerfisvilla. Tókst ekki að eyða %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Get ekki nálgast skrá"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Tókst ekki að hala niður safni, finn ekki þjón"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Röng stilling á þjóni"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Tókst að afturkalla %(path)s í rót skráarsvæðis."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Tókst að kalla fram eldri útgáfu %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Tókst að kalla fram aftur %(path)s í rót skráarsvæðis."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Kerfisvilla"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Get ekki hlaðið niður skráarsafni \"%s\": of stórt."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Get ekki hlaðið niður \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Virkja \"Eigið Wiki\"."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Slökkva á \"Eigin Wiki\""
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Þú hefur ekki aðgangsleyfi að þessu safni."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Engin slóð."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Hópurinn er ekki til."
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Aðgangi hafnað"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Aðgangur óheimill."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Safnið er dulkóðað"
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Villa: vantar staðfestingarauðkenni í hausinn"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Breytu vantar."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Viðtökuslóð er of löng."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Tókst að færa %(name)s skoða"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Tókst að afrita %(name)s  skoða"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Get ekki flutt skráarsafnið %(src)s í undirskráarsafnið %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Get ekki afritað skráarsafnið %(src)s í undirskráarsafnið %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Viðtökuslóð er of löng fyrir %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Tókst ekki að sækja hlutaskrá"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Rangt auðkenni safns"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "Ekki er hægt að eyða kerfissafni."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTP villa: tókst ekki að opna skrána"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Veffangsvilla: tókst ekki að opna skrána"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "Kóðunin sem þú valdir á ekki við."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Óþekkt skráargerð"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Skráarstærð yfir %s, ekki hægt að opna í vafra."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Getur ekki skoðað skrá"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Óleyfileg skráargerð."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "Safnið er ekki til."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "Safnið er dulkóðað"
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Ekki hægt að breyta skrá"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Skráin er ekki til."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Ekki er hægt að breyta skrá af þessari gerð í vafra"
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Mistókst að setja kvóta: kerfisvilla"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Tókst að eyða %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Tókst ekki að eyða: notandinn er ekki til"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "Tókst að gera %s að kerfisstjóra"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Tókst ekki að gera að kerfisstjóra: notandinn er ekki til"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Tókst að taka kerfisstjóraréttindi af %s"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Mistókst að taka kerfisstjóraréttindin af: notandinn er ekki til"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Tókst að virkja \"%s\"."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Tókst ekki að virkja: notandi er ekki til."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Gerði notandann \"%s\" óvirkann."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Tókst ekki að gera notandann óvirkann: hann er ekki til"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Reikningurinn þinn á %s hefur verið virkjaður"
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "Lykilorðið hefur verið endursett á %s"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Tókst að breyta lykilorðinu í %(passwd)s, tölvupóstur hefur verið sendur til %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Tókst að endurstilla lykilorðið í  %(passwd)s, en mistókst að senda tölvupóst til %(user)s, vinsamlegast athugaðu netfangs stillinguna."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Tókst að endurstilla lykilorðið í %(passwd)s fyrir notandann %(user)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5619,47 +6047,53 @@ msgid ""
 "configured."
 msgstr "Tókst að endurstilla lykilorðið í %(passwd)s fyrir notandann %(user)s. En tölvupóst er ekki hægt að senda því tölvupóststillingar eru ekki rétt stilltar."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Mistókst að endurstilla lykilorð: notandinn er ekki til"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Skráningarupplýsingar Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Þér hefur verið boðið í %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Tókst að bæta við notandanum %s.  Tilkynning hefur verið send í tölvupósti."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Tókst að bæta við notandanum %s.  Villa kom upp þegar reynt var að senda tilkynningu þess efnis í tölvupósti, vinsamlegast athugaðu tölvupóststyllingarnar."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Tókst að bæta við notandanum %s."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "Tókst að bæta við notandanum %s.  En ekki var hægt að senda tilkynningu um það í tölvupósti, því póstþjónustan er ekki rétt upp sett."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Tókst að flytja"
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Færslan tókst ekki, notandinn %s fannst ekki"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Flutningurinn tókst ekki, eitthvað vitlaust slegið inn"
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "Mistókst að setja %s sem kerfisstjóra"
diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po
index f8a8a8f920..17789c52a8 100644
--- a/locale/it/LC_MESSAGES/django.po
+++ b/locale/it/LC_MESSAGES/django.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# FerX , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-11 05:52+0000\n"
-"Last-Translator: xiez \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-19 14:27+0000\n"
+"Last-Translator: FerX \n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/seahub/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,175 +18,207 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Un utente con questo indirizzo e-mail già"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Le due password non corrispondono."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Il nome non può essere vuoto"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
-msgstr ""
+msgstr "Nome troppo lungo (massimo 255 caratteri)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "La descrizione non può essere vuota"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "La descrizione è troppo lunga (massimo 100 caratteri)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Il nome %s non è valido"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
-msgstr ""
+msgstr "Argomento mancante"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "E' richiesto il vecchio nome"
 
-#: seahub/forms.py:94 seahub/forms.py:115
-msgid "It's too long."
-msgstr ""
-
 #: seahub/forms.py:95 seahub/forms.py:116
-msgid "It's required."
-msgstr ""
+msgid "It's too long."
+msgstr "E' troppo lungo."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:96 seahub/forms.py:117
+msgid "It's required."
+msgstr "Richiesto."
+
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
-msgstr ""
+msgstr "Nome \"%s\" non valido"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "E' richiesto il Repo ID"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "E' richiesto il nome utente"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "La password non può essere vuota"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Indirizzo errato"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Password sbagliata"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr ""
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Errore nella decrittazione della libreria"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "La e-mail è richiesta"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Il campo quota non può essere vuoto"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Quota troppo bassa (valore minimo 0)"
 
-#: seahub/forms.py:171
-msgid "Library name is required"
-msgstr ""
-
 #: seahub/forms.py:172
-msgid "Library description is required"
-msgstr ""
+msgid "Library name is required"
+msgstr "Nome della libreria richiesto."
 
-#: seahub/forms.py:174
+#: seahub/forms.py:173
+msgid "Library description is required"
+msgstr "Descrizione della libreria richiesta"
+
+#: seahub/forms.py:175
 msgid "Please enter a number"
+msgstr "Prego inserisci un numero"
+
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
 msgstr ""
 
 #: seahub/settings.py:133
-msgid "Deutsch"
+msgid "català"
 msgstr ""
 
 #: seahub/settings.py:134
+msgid "Deutsch"
+msgstr "Tedesco"
+
+#: seahub/settings.py:135
 msgid "English"
 msgstr "Inglese"
 
-#: seahub/settings.py:135
-msgid "Español"
-msgstr ""
-
 #: seahub/settings.py:136
-msgid "Mexican Spanish"
-msgstr ""
+msgid "Español"
+msgstr "Spagnolo"
 
 #: seahub/settings.py:137
-msgid "Français"
+msgid "Argentinian Spanish"
 msgstr ""
 
 #: seahub/settings.py:138
-msgid "Hebrew"
+msgid "Mexican Spanish"
 msgstr ""
 
 #: seahub/settings.py:139
-msgid "Magyar"
+msgid "français"
 msgstr ""
 
 #: seahub/settings.py:140
-msgid "Italiano"
+msgid "עברית"
 msgstr ""
 
 #: seahub/settings.py:141
-msgid "Latvian"
+msgid "Magyar"
 msgstr ""
 
 #: seahub/settings.py:142
-msgid "Dutch"
+msgid "Íslenska"
 msgstr ""
 
 #: seahub/settings.py:143
-msgid "Portuguese, Brazil"
-msgstr ""
+msgid "Italiano"
+msgstr "Italiano"
 
 #: seahub/settings.py:144
-msgid "Русский"
+msgid "한국어"
 msgstr ""
 
 #: seahub/settings.py:145
-msgid "Slovak"
+msgid "Latvian"
 msgstr ""
 
 #: seahub/settings.py:146
-msgid "Ukrainian"
+msgid "Nederlands"
 msgstr ""
 
 #: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
+msgid "Portuguese, Brazil"
+msgstr ""
+
+#: seahub/settings.py:149
+msgid "Русский"
+msgstr ""
+
+#: seahub/settings.py:150
+msgid "Slovak"
+msgstr ""
+
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
+
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "Cinese"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr ""
 
@@ -194,10 +227,11 @@ msgid "File Collaboration Team Organization"
 msgstr ""
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
-msgstr ""
+msgstr "Discussione"
 
 #: seahub/api2/templates/api2/discussion.html:26
 #: seahub/api2/templates/api2/discussion.html:42
@@ -207,16 +241,17 @@ msgstr ""
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -226,13 +261,13 @@ msgstr "File"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -241,214 +276,241 @@ msgstr "Icona per la Cartella"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
-msgstr ""
+msgstr "%(amount)s risposte"
 
 #: seahub/api2/templates/api2/discussions.html:24
 msgid "No discussions."
-msgstr ""
+msgstr "Nessuna discussione."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Caricamento..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
-msgstr ""
+msgstr "Fallito. Prego controlla la rete."
 
 #: seahub/api2/templates/api2/event_details.html:8
 #: seahub/api2/templates/api2/event_details.html:40
 #, python-format
 msgid "Added %(file)s"
-msgstr ""
+msgstr "Aggiunto %(file)s"
 
 #: seahub/api2/templates/api2/event_details.html:16
 #: seahub/api2/templates/api2/event_details.html:48
 #, python-format
 msgid "Deleted %(file)s"
-msgstr ""
+msgstr "Cancellato %(file)s"
 
 #: seahub/api2/templates/api2/event_details.html:24
 #, python-format
 msgid "Renamed or Moved %(file)s"
-msgstr ""
+msgstr "Rinomina o cancella %(file)s"
 
 #: seahub/api2/templates/api2/event_details.html:32
 #, python-format
 msgid "Modified %(file)s"
-msgstr ""
+msgstr "Modficato %(file)s"
 
 #: seahub/api2/templates/api2/events.html:19
 msgid "No activity now or the function is not supported."
-msgstr ""
+msgstr "Nessuna attività o funzione non supportata."
 
 #: seahub/api2/templates/api2/events_body.html:17
 #: seahub/templates/snippets/events_body.html:29
 msgid "Created library"
-msgstr ""
+msgstr "Liberia creata"
 
 #: seahub/api2/templates/api2/events_body.html:21
 #: seahub/templates/snippets/events_body.html:33
 #, python-format
 msgid "Deleted library %(library_name)s"
-msgstr ""
+msgstr "Libreria cancellata %(library_name)s"
 
 #: seahub/api2/templates/api2/events_js.html:83
 msgid "Please check the network."
-msgstr ""
+msgstr "Prego controlla la rete."
 
 #: seahub/api2/templates/api2/new_msg_reply.html:6
 msgid "New Replies"
+msgstr "Nuova risposta"
+
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Messaggi"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr ""
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
 msgstr ""
 
 #: seahub/auth/admin.py:29
 msgid "Personal info"
-msgstr ""
+msgstr "Informazioni personali"
 
 #: seahub/auth/admin.py:30
 msgid "Permissions"
-msgstr ""
+msgstr "Permessi"
 
 #: seahub/auth/admin.py:31
 msgid "Important dates"
-msgstr ""
+msgstr "Date importanti"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Gruppi"
 
 #: seahub/auth/admin.py:114
 msgid "Password changed successfully."
-msgstr ""
+msgstr "Password cambiata con successo."
 
 #: seahub/auth/admin.py:124
 #, python-format
 msgid "Change password: %s"
-msgstr ""
+msgstr "Cambia password: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
-msgstr ""
+msgstr "Nome utente"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Password"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
-msgstr ""
+msgstr "Prego inserisci un corretto nome utente e password. Attenzione maiuscole/minuscole."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
-msgstr ""
+msgstr "L'account è inattivo."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
-msgstr ""
+msgstr "Il vostro browser sembra non abbia i cookies attivi. Sono richiesti per l'autenticazione."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
-msgstr ""
+msgstr "Invio email non riuscito, servizio email non correttamente configurato, si prega di contattare l'amministratore."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr ""
+msgstr "Questo indirizzo email non ha un profilo associato. Sei sicuro di volerlo registrare ?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
+msgid "Reset Password on %s"
 msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
-msgstr ""
+msgstr "Nuova password"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
-msgstr ""
+msgstr "Conferma nuova password"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
-msgstr ""
+msgstr "Vecchia password"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
+msgstr "La vecchia password non è corretta. Riprova."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Password (conferma)"
 
 #: seahub/auth/views.py:157
 msgid "Logged out"
-msgstr ""
+msgstr "Uscito."
 
 #: seahub/auth/views.py:205
 msgid "Failed to send email, please contact administrator."
-msgstr ""
+msgstr "Impossibile spedire l'email, si prega di contattare l'amministratore."
 
 #: seahub/auth/management/commands/createsuperuser.py:24
 #: seahub/base/management/commands/createsuperuser.py:25
 msgid "Enter a valid e-mail address."
-msgstr ""
+msgstr "Inserisci un indirizzo e-mail valido."
 
 #: seahub/avatar/forms.py:34 seahub/avatar/forms.py:57
 #, python-format
@@ -471,7 +533,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Hai già %(nb_avatars)d avatar, massimo consentito %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar per %s"
@@ -539,57 +601,62 @@ msgstr "Avatar attuale: "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Invia"
@@ -606,7 +673,7 @@ msgstr "%(avatar_creator)s ha aggiornato i loro ava
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Hai aggiornato il tuo avatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Avatar predefinito"
 
@@ -638,49 +705,49 @@ msgstr ""
 msgid "note"
 msgstr ""
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
-msgstr ""
+msgstr "Il documento nella libreria non può essere visto online."
 
 #: seahub/base/templatetags/seahub_tags.py:87
 msgid "Added"
-msgstr ""
+msgstr "Aggiunto"
 
 #: seahub/base/templatetags/seahub_tags.py:88
 msgid "Deleted"
-msgstr ""
+msgstr "Cancellato"
 
 #: seahub/base/templatetags/seahub_tags.py:89
 msgid "Removed"
-msgstr ""
+msgstr "Rimosso"
 
 #: seahub/base/templatetags/seahub_tags.py:90
 msgid "Modified"
-msgstr ""
+msgstr "Modificato"
 
 #: seahub/base/templatetags/seahub_tags.py:91
 msgid "Renamed"
-msgstr ""
+msgstr "Rinominato"
 
 #: seahub/base/templatetags/seahub_tags.py:92
 msgid "Moved"
-msgstr ""
+msgstr "Spostato"
 
 #: seahub/base/templatetags/seahub_tags.py:93
 msgid "Added directory"
-msgstr ""
+msgstr "Cartella aggiunta"
 
 #: seahub/base/templatetags/seahub_tags.py:94
 msgid "Removed directory"
-msgstr ""
+msgstr "Cartella rimossa"
 
 #: seahub/base/templatetags/seahub_tags.py:95
 msgid "Renamed directory"
-msgstr ""
+msgstr "Cartella rinominata"
 
 #: seahub/base/templatetags/seahub_tags.py:96
 msgid "Moved directory"
-msgstr ""
+msgstr "Cartella spostata"
 
 #: seahub/base/templatetags/seahub_tags.py:111
 msgid "Reverted library to status at"
@@ -693,11 +760,11 @@ msgstr ""
 
 #: seahub/base/templatetags/seahub_tags.py:118
 msgid "Recovered deleted directory"
-msgstr ""
+msgstr "Recuperata la cartella cancellata"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
-msgstr ""
+msgstr "Cambia il nome della libreria o della descrizione"
 
 #: seahub/base/templatetags/seahub_tags.py:122
 msgid "Auto merge by seafile system"
@@ -705,9 +772,9 @@ msgstr ""
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Subito"
 
@@ -743,80 +810,86 @@ msgstr[1] "%(seconds)d secondi fa"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Lettura-Scrittura"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Sola lettura"
 
 #: seahub/contacts/models.py:72
 #: seahub/contacts/templates/contacts/contact_list.html:125
 msgid "Email is required."
-msgstr ""
+msgstr "L'email è richiesta."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr ""
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
-msgstr ""
+msgstr "impossibile aggiungere %s ai contatti."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
-msgstr ""
+msgstr "%s modificato con successo."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
-msgstr ""
+msgstr "%s cancellato con successo."
 
 #: seahub/contacts/templates/contacts/contact_list.html:4
 #: seahub/contacts/templates/contacts/contact_list.html:10
@@ -838,10 +911,10 @@ msgstr "Email "
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -849,45 +922,46 @@ msgstr "Email "
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nome"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Note"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -896,56 +970,64 @@ msgstr "Note"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Operazioni"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Modifica"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Cancella"
 
@@ -961,17 +1043,19 @@ msgstr "Aggiungi contatti per condividere velocemente librerie e inviare linka f
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Email"
 
@@ -996,8 +1080,8 @@ msgid "Delete Contact"
 msgstr "Cancella contatto"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1030,7 +1114,7 @@ msgstr "Errore permessi: solo lo staff può aggiungere membri"
 
 #: seahub/group/error_msg.py:16 seahub/group/error_msg.py:22
 msgid "Group does not exist"
-msgstr ""
+msgstr "Il gruppo non essiste"
 
 #: seahub/group/error_msg.py:17
 msgid "Group is full"
@@ -1071,410 +1155,426 @@ msgstr "Il messaggio di verifica è troppo lungo (massimo 255 caratteri)"
 #: seahub/group/forms.py:67 seahub/wiki/forms.py:27
 #, python-format
 msgid "\"%s\" is not a valid name"
-msgstr ""
+msgstr "\"%s\" non è un nome valido"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Nome gruppo già esistente."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr ""
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr ""
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr ""
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
-msgstr ""
+msgstr "Solo gli amministratori possono rendere il gruppo pubblico"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Il messaggio non esiste"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Non hai i permessi."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
 msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Errore di aggiunta, %s non è registrato."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Aggiunta completata con successo. E' stata inviata una mail."
 msgstr[1] "Aggiunta completata con successo. Inviate mail a %(count)s."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Aggiunto."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr ""
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Errore in aggiunta, %s non è registrato."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Operazione conclusa con successo."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Fallito: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Errore di de-condivisione: il gruppo non esiste."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
-msgstr ""
+msgstr "Operazione fallita: solo gli amministratori e i proprietari della libreria possono annullare la condivisione."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Errore in de-condivisione: errore interno."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Errore: group id errato"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
-msgstr ""
+msgstr "Errore: il gruppo non esiste."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr ""
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Errore: non sei nel gruppo %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
-msgstr ""
+msgstr "ErrorE: la libreria non esiste."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
-msgstr ""
+msgstr "Errore: nessun percorso."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Errore di creazione: il gruppo non esiste."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Errore di creazione: non sei nel gruppo."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Errore di creazione"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Errore di creazione: errore interno."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Sei già nel gruppo."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Invio completato, il gruppo admin gestirà la richiesta."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
-msgid "File does not exist"
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
 msgstr ""
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
+msgid "File does not exist"
+msgstr "Il file non esiste."
+
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
-msgstr ""
+msgstr "Impossibile creare la pagina wiki. Prego riprovare più tardi."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
-msgstr ""
+msgstr "Il wiki non esiste."
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
+msgstr "Impossibile creare la home page. Prego riprovare più tardi."
+
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
 msgstr ""
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
-msgstr ""
+msgstr "Wiki non trovato."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
+msgstr "La pagina \"%s\" è già esistente."
+
+#: seahub/group/views.py:1570
+#, python-format
+msgid "Successfully deleted \"%s\"."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1572
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s ti ha inviato ad unirti al grouppo %(group.group_name)s.Procedi alla prossima pagina e iscriviti:"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Grazie per aver usato il nostro sito!"
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/templates/group/add_member_email.html:11
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "Il team di %(site_name)s"
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
-msgstr ""
+msgstr "nascondi risposte"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Rispondi"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
-msgstr ""
+msgstr "Aggiungi una risposta..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
-msgstr ""
+msgstr "Non può essere bianco e non può superare 2048 caratteri."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Annulla"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr ""
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
-msgstr ""
+msgstr "Attiva moduli"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr ""
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Questo gruppo è pubblico."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Librerie"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
-msgstr ""
+msgstr "Documenti"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Membri"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Amministratore"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Esci dal gruppo"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr ""
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
+msgstr "Aggiungi una discussione..."
+
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Aggiungi file"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
-msgstr ""
+msgstr "Dopo il login, puoi inviare discussioni e aggiungere risposte."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Precedente"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Successivo"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
-msgstr ""
+msgstr "↑Inizio"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
-msgstr ""
+msgstr "Veramente vuoi cancellare questa discussione?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Si"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "No"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Cancellato con successo"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Cancellazione fallita:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
-msgstr ""
+msgstr "Fallito."
 
 #: seahub/group/templates/group/group_info.html:12
 msgid "Recent Changes"
-msgstr ""
+msgstr "Cambi recenti"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1483,79 +1583,60 @@ msgstr "Nuova libreria"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Descrizione"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Condiviso da"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "icona della directory"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
-msgstr ""
+msgstr "Scarica e sincronizza"
 
 #: seahub/group/templates/group/group_info.html:55
 #: seahub/share/templates/share/list_priv_shared_folders.html:43
@@ -1569,19 +1650,19 @@ msgstr ""
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Togli condivisione"
 
 #: seahub/group/templates/group/group_info.html:63
 msgid "No library is sharing to this group"
-msgstr ""
+msgstr "Nessuna libreria è condivisa a questo gruppo"
 
 #: seahub/group/templates/group/group_info.html:64
 msgid ""
 "You can share libraries by clicking the \"New Library\" button above or the "
 "\"Share\" icon on your libraries list."
-msgstr ""
+msgstr "Puoi condividere le libreria cliccando il bottone \"Nuova Libreria\" o l'icona \"Condividi\" nella lista della libreria."
 
 #: seahub/group/templates/group/group_info.html:65
 msgid ""
@@ -1603,18 +1684,19 @@ msgstr "Libreria"
 
 #: seahub/group/templates/group/group_info.html:77
 msgid "Modified at"
-msgstr ""
+msgstr "Modificato il"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Modificatore"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1623,53 +1705,81 @@ msgid "Details"
 msgstr "Dettagli"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Niente"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
-msgstr ""
+msgstr "Sconosciuto"
 
 #: seahub/group/templates/group/group_info.html:124
 #: seahub/templates/activities.html:19 seahub/templates/file_edit.html:240
 msgid "is encrypted"
-msgstr ""
+msgstr "è criptato"
 
 #: seahub/group/templates/group/group_info.html:126
 #: seahub/templates/activities.html:21 seahub/templates/file_edit.html:241
 msgid "Password："
-msgstr ""
+msgstr "Password:"
 
 #: seahub/group/templates/group/group_info.html:128
 #: seahub/templates/activities.html:23 seahub/templates/file_edit.html:243
 msgid "The password will be kept in the server for only 1 hour."
-msgstr ""
+msgstr "La password è conservata nel server per solo 1 ora."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Togli condivisione alla libreria"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr ""
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "icona della directory"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
-msgstr ""
+msgstr "Nessuna libreria pubblica in questo gruppo"
 
 #: seahub/group/templates/group/group_info_for_pub.html:47
 msgid ""
@@ -1683,14 +1793,25 @@ msgid ""
 "message: "
 msgstr "%(user)s vuole unirsi al Gruppo \"%(group_name)s\", ecco il messaggio di verifica: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Grazie per aver usato il nostro sito!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Il team di %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr ""
 
@@ -1698,7 +1819,7 @@ msgstr ""
 msgid "Add Members"
 msgstr "Aggiungi membri"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr ""
 
@@ -1707,7 +1828,7 @@ msgid "Avatar"
 msgstr ""
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Cambia"
 
@@ -1719,16 +1840,16 @@ msgstr "Rinomina"
 
 #: seahub/group/templates/group/group_manage.html:83
 msgid "Revoke Public"
-msgstr ""
+msgstr "Revoca impostazione Pubblico"
 
 #: seahub/group/templates/group/group_manage.html:85
 msgid "Make Public"
-msgstr ""
+msgstr "Rendi Pubblico"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
-msgstr ""
+msgstr "Trasferisci"
 
 #: seahub/group/templates/group/group_manage.html:88
 msgid "Dismiss"
@@ -1736,11 +1857,11 @@ msgstr "Respingere"
 
 #: seahub/group/templates/group/group_manage.html:96
 msgid "Transfer Group To"
-msgstr ""
+msgstr "Trasferisci il gruppo a"
 
 #: seahub/group/templates/group/group_manage.html:97
 msgid "email"
-msgstr ""
+msgstr "email"
 
 #: seahub/group/templates/group/group_manage.html:98
 msgid "Tip: the email should be already registered."
@@ -1750,29 +1871,41 @@ msgstr ""
 msgid "Rename Group To"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Respingi Gruppo"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
-msgstr ""
+msgstr "Veramente vuoi cancellare questo gruppo?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Cancella il membro"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr ""
 
-#: seahub/group/templates/group/group_members.html:17
-#: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
-msgid "Add to Contacts"
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
 msgstr ""
 
+#: seahub/group/templates/group/group_members.html:22
+#: seahub/profile/templates/profile/user_profile.html:28
+#: seahub/templates/pubuser.html:27
+msgid "Add to Contacts"
+msgstr "Aggiungi ai Contatti"
+
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Esci dal gruppo"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Sei sicuro di voler uscire da questo gruppo?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Unisciti al Gruppo"
@@ -1799,12 +1932,29 @@ msgstr "Membri: "
 msgid "Verification Message"
 msgstr "Messaggio di verifica"
 
-#: seahub/group/templates/group/group_wiki.html:12
-msgid "This group currently has no wiki"
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:35
+msgid "This group currently has no wiki"
+msgstr "Questo gruppo attualmente non ha un wiki"
+
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1812,82 +1962,105 @@ msgid ""
 "back to the server."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
-msgid "Create Wiki"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:23
-msgid "Wiki Pages"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:31
-#: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
-#: seahub/templates/wiki/personal_wiki_pages.html:13
-msgid "Home"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:32
-#: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
-#: seahub/templates/wiki/personal_wiki_pages.html:14
-msgid "Pages"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:34
-#: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
-#: seahub/templates/wiki/personal_wiki_pages.html:15
-msgid "Wiki History"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
-#: seahub/group/templates/group/group_wiki_pages.html:18
-#: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
-#: seahub/templates/wiki/personal_wiki_pages.html:17
-#: seahub/templates/wiki/personal_wiki_pages.html:27
-msgid "New Page"
-msgstr ""
+msgstr "Crea un Wiki ora"
 
 #: seahub/group/templates/group/group_wiki.html:40
 #: seahub/templates/wiki/personal_wiki.html:36
-msgid "Delete Page"
+msgid "Choose a library as wiki"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
-msgid "Edit Page"
-msgstr ""
-
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
-msgid "Page History"
-msgstr ""
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
+msgid "Create Wiki"
+msgstr "Crea Wiki"
 
 #: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
-#, python-format
-msgid "Last modified by %(modifier)s, %(modify_time)s"
+msgid "Wiki Pages"
+msgstr "Wiki pagine"
+
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:68
+#: seahub/group/templates/group/group_wiki_pages.html:11
+#: seahub/templates/wiki/personal_wiki.html:63
+#: seahub/templates/wiki/personal_wiki_pages.html:13
+msgid "Home"
+msgstr "Home"
+
+#: seahub/group/templates/group/group_wiki.html:69
+#: seahub/group/templates/group/group_wiki_pages.html:12
+#: seahub/templates/wiki/personal_wiki.html:64
+#: seahub/templates/wiki/personal_wiki_pages.html:14
+msgid "Pages"
+msgstr "Pagine"
+
+#: seahub/group/templates/group/group_wiki.html:71
+#: seahub/group/templates/group/group_wiki_pages.html:14
+#: seahub/templates/wiki/personal_wiki.html:65
+#: seahub/templates/wiki/personal_wiki_pages.html:15
+msgid "Wiki History"
+msgstr "Cronologia Wiki"
+
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
+#: seahub/group/templates/group/group_wiki_pages.html:18
+#: seahub/group/templates/group/group_wiki_pages.html:29
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
+#: seahub/templates/wiki/personal_wiki_pages.html:17
+#: seahub/templates/wiki/personal_wiki_pages.html:27
+msgid "New Page"
+msgstr "Nuova Pagina"
+
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
+msgid "Delete Page"
+msgstr "Cancella Pagina"
+
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
+msgid "Edit Page"
+msgstr "Modifica Pagina"
+
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
+msgid "Page History"
+msgstr "Cronologia Pagina"
+
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
+#, python-format
+msgid "Last modified by %(modifier)s, %(modify_time)s"
+msgstr "Ultima modifica da %(modifier)s, %(modify_time)s"
+
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr ""
 
@@ -1934,12 +2107,14 @@ msgstr "Aggiungi membri"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
-msgstr ""
+msgstr "Entra"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
-msgstr ""
+msgstr "email, separate da ','"
 
 #: seahub/group/templates/group/grpmember_add_form.html:12
 msgid "Tip: an invitation will be sent if the email is not registered."
@@ -1951,9 +2126,10 @@ msgstr "Suggerimento: le mail dovrebbero già essere registrate."
 
 #: seahub/group/templates/group/grpmember_add_js.html:8
 msgid "Add administrators"
-msgstr ""
+msgstr "Aggiungi amministratori"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr ""
 
@@ -2232,135 +2408,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr ""
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr ""
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr ""
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr ""
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Messaggi"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Aggiungi file"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr ""
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr ""
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr ""
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr ""
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr ""
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr ""
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group ."
 msgstr ""
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr ""
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr ""
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr ""
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr ""
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr ""
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr ""
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr ""
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "group id non valido"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr ""
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "tutti i membri"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Argomento non valido"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr ""
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr ""
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr ""
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr ""
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
 msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr ""
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr ""
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr ""
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr ""
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr ""
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr ""
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr ""
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
+msgid "You don't have permission to unshare %s."
 msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr ""
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr ""
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
 msgstr ""
 
 #: seahub/share/templates/share/links.html:5
@@ -2818,14 +3003,15 @@ msgstr "Visite"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Vedi"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2854,7 +3040,7 @@ msgid "Folders - Share"
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr ""
 
@@ -2879,13 +3065,13 @@ msgid ""
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr ""
@@ -2952,7 +3138,7 @@ msgstr ""
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Informazioni di base"
 
@@ -2965,7 +3151,8 @@ msgid "Add to contacts"
 msgstr "Aggiungi ai contatti"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr ""
 
@@ -2986,56 +3173,24 @@ msgstr ""
 msgid "Exit System Admin"
 msgstr ""
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Utenti"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr ""
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr ""
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr ""
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr ""
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Entra"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Registrati"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Esci"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
 msgstr ""
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr ""
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr ""
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Tutti i Gruppi"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr ""
 
@@ -3043,7 +3198,7 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr ""
 
@@ -3084,28 +3239,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr ""
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3115,8 +3322,7 @@ msgstr "Scarica"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Percorso corrente:"
 
@@ -3431,9 +3637,9 @@ msgid "Password is required."
 msgstr ""
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Storia"
@@ -3452,16 +3658,11 @@ msgstr ""
 msgid "Current Path:"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Ultimo modificatore "
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Dimensione"
 
@@ -3469,38 +3670,55 @@ msgstr "Dimensione"
 msgid "(current version)"
 msgstr "(versione corrente)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr ""
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr ""
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introduzione"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr ""
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Client"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr ""
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr ""
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr ""
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr ""
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3529,12 +3747,13 @@ msgstr ""
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Torna alla Libreria"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3549,36 +3768,57 @@ msgstr ""
 msgid "Starred"
 msgstr ""
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr ""
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr ""
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr ""
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr ""
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr ""
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr ""
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr ""
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr ""
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr ""
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Mia homepage"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr ""
@@ -3589,11 +3829,11 @@ msgid ""
 "current account."
 msgstr ""
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3615,420 +3855,452 @@ msgstr ""
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr ""
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr ""
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Nessuna libreria pubblica"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr ""
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Cestino"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Dimensione: "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Cestino"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Sposta"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copia"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Carica File"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr ""
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr ""
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr ""
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr ""
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr ""
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr ""
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr ""
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr ""
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nuova Cartella"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nome Cartella"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nuovo File"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Tipo File"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Click per scegliere"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr ""
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr ""
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nome File"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Libreria Corrente"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Altre Librerie"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Fai clic e scegli una cartella."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr ""
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr ""
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr ""
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr ""
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr ""
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr ""
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr ""
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr ""
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr ""
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr ""
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr ""
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr ""
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr ""
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr ""
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr ""
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr ""
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr ""
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr ""
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr ""
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr ""
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr ""
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr ""
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr ""
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr ""
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr ""
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr ""
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr ""
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr ""
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr ""
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr ""
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr ""
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr ""
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr ""
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr ""
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr ""
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr ""
 
@@ -4050,11 +4322,12 @@ msgstr ""
 msgid "View Snapshot"
 msgstr "Visualizza Istantanea"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr ""
@@ -4095,34 +4368,78 @@ msgstr ""
 msgid "Delete Time"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr ""
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr ""
@@ -4131,6 +4448,10 @@ msgstr ""
 msgid "Create Time"
 msgstr "Ora creazione"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Ultimo modificatore "
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4173,8 +4494,14 @@ msgstr ""
 msgid "Click to download."
 msgstr "Clic per trasferire."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr ""
 
@@ -4186,25 +4513,26 @@ msgstr ""
 msgid "Save To:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr ""
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
 msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr ""
 
@@ -4216,8 +4544,8 @@ msgstr ""
 msgid "icon"
 msgstr ""
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Smarca"
 
@@ -4272,49 +4600,49 @@ msgstr "a"
 msgid "Sorry, this user is not registered yet."
 msgstr ""
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Marca"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "un contributore"
 msgstr[1] " %(counter)s contributori "
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Smarcato con successo"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Marcato con successo"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr ""
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr ""
 
@@ -4333,7 +4661,7 @@ msgid "auto detect"
 msgstr ""
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  / root directory."
 msgstr "Conversione %(path)s in directory root completa."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Conversione %(path)s completata."
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Conversione %(path)s in directory root completa."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Errore interno"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr ""
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr ""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr ""
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr ""
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr ""
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
-msgstr ""
+msgstr "Permesso negato."
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr ""
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr ""
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr ""
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr ""
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr ""
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr ""
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr ""
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr ""
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Errore HTTP: impossibile aprire il file online"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Errore URL: impossibile aprire il file online"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr ""
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codifica file sconosciuta"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr ""
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Impossibile vedere il file"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr ""
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr ""
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr ""
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Impossibile editare il file"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr ""
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr ""
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Errore interno di impostazione quota"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr ""
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, 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:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5617,47 +6046,53 @@ msgid ""
 "configured."
 msgstr ""
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Impossibile ripristinare password: utente inesistente"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Informazioni Registrazione Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr ""
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr ""
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, 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:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr ""
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr ""
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr ""
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/django.po b/locale/ko/LC_MESSAGES/django.po
index 58d4a67d1c..d352dbefb6 100644
--- a/locale/ko/LC_MESSAGES/django.po
+++ b/locale/ko/LC_MESSAGES/django.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # kim.hunsoo , 2014
+# kim.hunsoo , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-07 05:07+0000\n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 07:50+0000\n"
 "Last-Translator: kim.hunsoo \n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/seahub/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -18,175 +19,207 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr ""
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr ""
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr ""
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr ""
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr ""
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr ""
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr ""
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr ""
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr ""
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr ""
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr ""
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr ""
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr ""
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr ""
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr ""
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr ""
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "내부 서버 오류"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr ""
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr ""
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr ""
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr ""
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr ""
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr ""
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr ""
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -195,8 +228,9 @@ msgid "File Collaboration Team Organization"
 msgstr ""
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr ""
 
@@ -208,16 +242,17 @@ msgstr ""
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -227,13 +262,13 @@ msgstr "파일"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -242,9 +277,9 @@ msgstr "디렉토리 아이콘"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr ""
@@ -255,43 +290,48 @@ msgstr ""
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr ""
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr ""
 
@@ -340,6 +380,25 @@ msgstr ""
 msgid "New Replies"
 msgstr ""
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr ""
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr ""
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr ""
@@ -353,10 +412,11 @@ msgid "Important dates"
 msgstr ""
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "그룹"
 
@@ -369,72 +429,74 @@ msgstr ""
 msgid "Change password: %s"
 msgstr ""
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr ""
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
-msgstr ""
+msgstr "암호"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr ""
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr ""
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "이메일"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr ""
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
+msgid "Reset Password on %s"
 msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
-msgstr ""
+msgstr "새 암호"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
-msgstr ""
+msgstr "새 암호 확인"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
-msgstr ""
+msgstr "이전 암호"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
+msgstr "입력하신 이전 암호가 틀립니다. 다시 입력하세요."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr ""
 
@@ -472,7 +534,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr ""
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr ""
@@ -540,57 +602,62 @@ msgstr ""
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr ""
@@ -607,7 +674,7 @@ msgstr ""
 msgid "You have updated your avatar %(avatar)s."
 msgstr ""
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr ""
 
@@ -629,7 +696,7 @@ msgstr "이름"
 
 #: seahub/base/accounts.py:436
 msgid "department"
-msgstr ""
+msgstr "부서"
 
 #: seahub/base/accounts.py:438
 msgid "telephone"
@@ -639,7 +706,7 @@ msgstr "전화"
 msgid "note"
 msgstr ""
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr ""
 
@@ -696,7 +763,7 @@ msgstr ""
 msgid "Recovered deleted directory"
 msgstr ""
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr ""
 
@@ -706,9 +773,9 @@ msgstr ""
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr ""
 
@@ -740,42 +807,48 @@ msgstr[0] ""
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "읽기/쓰기"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "읽기 전용"
 
@@ -784,33 +857,33 @@ msgstr "읽기 전용"
 msgid "Email is required."
 msgstr ""
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr ""
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr ""
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr ""
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr ""
@@ -835,10 +908,10 @@ msgstr "연락처"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -846,45 +919,46 @@ msgstr "연락처"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "이름"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr ""
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -893,58 +967,66 @@ msgstr ""
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr ""
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
-msgstr ""
+msgstr "편집"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
-msgstr ""
+msgstr "삭제"
 
 #: seahub/contacts/templates/contacts/contact_list.html:37
 msgid "You don't have any contacts"
@@ -958,17 +1040,19 @@ msgstr ""
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "이메일"
 
@@ -976,7 +1060,7 @@ msgstr "이메일"
 #: seahub/contacts/templates/contacts/contact_list.html:57
 #: seahub/templates/snippets/add_to_contacts_form.html:4
 msgid "Name(optional)"
-msgstr ""
+msgstr "이름(optional)"
 
 #: seahub/contacts/templates/contacts/contact_list.html:48
 #: seahub/contacts/templates/contacts/contact_list.html:59
@@ -993,8 +1077,8 @@ msgid "Delete Contact"
 msgstr "연락처 삭제"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1070,486 +1154,483 @@ msgstr ""
 msgid "\"%s\" is not a valid name"
 msgstr ""
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr ""
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr ""
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr ""
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr ""
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr ""
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr ""
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr ""
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr ""
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
 msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr ""
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] ""
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr ""
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr ""
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr ""
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr ""
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
-msgstr ""
+msgstr "실패：%s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr ""
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr ""
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr ""
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "오류: 잘못된 그룹 아이디"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "오류: 그룹이 존재하지 않습니다."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr ""
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "오류: 당신은 %s 그룹에 속해 있지 않습니다."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "오류: 라이브러리가 존재하지 않습니다."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "오류: 존재하지 않는 경로."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr ""
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr ""
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr ""
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr ""
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr ""
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr ""
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr ""
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr ""
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr ""
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr ""
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr ""
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr ""
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr ""
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr ""
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
+msgid "Successfully deleted \"%s\"."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
+#: seahub/group/views.py:1572
+#, python-format
+msgid "Failed to delete \"%s\". Please retry later."
 msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
 #, python-format
-msgid "The %(site_name)s team"
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "취소"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr ""
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr ""
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
 msgstr ""
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "라이브러리"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "위키"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "파일"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr ""
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "관리자"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr ""
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr ""
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "파일 추가"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "이전"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "다음"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "예"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "아니오"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
-msgstr ""
+msgstr "실패."
 
 #: seahub/group/templates/group/group_info.html:12
 msgid "Recent Changes"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
-msgstr ""
+msgstr "새 라이브러리"
 
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
-msgstr ""
+msgstr "설명"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr ""
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "디렉토리 아이콘"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr ""
 
@@ -1565,7 +1646,7 @@ msgstr ""
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr ""
 
@@ -1602,15 +1683,16 @@ msgid "Modified at"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr ""
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1619,23 +1701,23 @@ msgid "Details"
 msgstr "상세"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
-msgstr ""
+msgstr "없음"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr ""
 
@@ -1647,21 +1729,49 @@ msgstr ""
 #: seahub/group/templates/group/group_info.html:126
 #: seahub/templates/activities.html:21 seahub/templates/file_edit.html:241
 msgid "Password："
-msgstr ""
+msgstr "암호:"
 
 #: seahub/group/templates/group/group_info.html:128
 #: seahub/templates/activities.html:23 seahub/templates/file_edit.html:243
 msgid "The password will be kept in the server for only 1 hour."
 msgstr ""
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
-msgstr ""
+msgstr "라이브러리 공유 해제"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
-msgstr ""
+msgstr "%s의 공유를 해제하겠습니까?"
+
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "디렉토리 아이콘"
 
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
@@ -1679,14 +1789,25 @@ msgid ""
 "message: "
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "관리자"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "설정"
 
@@ -1694,7 +1815,7 @@ msgstr "설정"
 msgid "Add Members"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "관리자 추가"
 
@@ -1703,7 +1824,7 @@ msgid "Avatar"
 msgstr "아바타"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "변경"
 
@@ -1722,7 +1843,7 @@ msgid "Make Public"
 msgstr ""
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr ""
 
@@ -1746,36 +1867,48 @@ msgstr ""
 msgid "Rename Group To"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr ""
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr ""
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr ""
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr ""
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr ""
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr ""
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr ""
 
 #: seahub/group/templates/group/group_pubinfo.html:13
 msgid "Name: "
-msgstr "이름:"
+msgstr "이름: "
 
 #: seahub/group/templates/group/group_pubinfo.html:14
 #: seahub/group/templates/group/groups_right_panel.html:13
@@ -1795,12 +1928,29 @@ msgstr ""
 msgid "Verification Message"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1808,82 +1958,105 @@ msgid ""
 "back to the server."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
+msgstr "위키 페이지"
+
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
-msgstr ""
+msgstr "페이지"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
-msgstr ""
+msgstr "페이지 삭제"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
-msgstr ""
+msgstr "페이지 편집"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr ""
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr ""
 
@@ -1908,7 +2081,7 @@ msgstr "새 그룹"
 #: seahub/group/templates/group/groups_right_panel.html:14
 #: seahub/templates/pubgrp.html:17
 msgid "Time: "
-msgstr "시간:"
+msgstr "시간: "
 
 #: seahub/group/templates/group/groups_right_panel.html:28
 msgid "You are not in any groups"
@@ -1930,10 +2103,12 @@ msgstr ""
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "입력"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr ""
 
@@ -1949,7 +2124,8 @@ msgstr ""
 msgid "Add administrators"
 msgstr "관리자 추가"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr ""
 
@@ -1959,7 +2135,7 @@ msgstr ""
 
 #: seahub/group/templates/group/new_msg_reply.html:18
 msgid "Group: "
-msgstr "그룹:"
+msgstr "그룹: "
 
 #: seahub/help/templates/help/help_base.html:7
 msgctxt "help"
@@ -2228,135 +2404,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr ""
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr ""
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr ""
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr ""
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr ""
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
-msgstr ""
+msgstr "새 메시지"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "시간"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "파일 추가"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr ""
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr ""
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr ""
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr ""
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr ""
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr ""
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr ""
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr ""
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group ."
 msgstr ""
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr ""
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr ""
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr ""
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr ""
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr ""
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr ""
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr ""
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr ""
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr ""
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr ""
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr ""
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr ""
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr ""
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr ""
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr ""
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr ""
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr ""
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
 msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr ""
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr ""
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr ""
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr ""
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr ""
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr ""
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr ""
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
+msgid "You don't have permission to unshare %s."
 msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr ""
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr ""
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
 msgstr ""
 
 #: seahub/share/templates/share/links.html:5
@@ -2814,14 +2998,15 @@ msgstr "방문"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr ""
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr ""
 
@@ -2847,12 +3032,12 @@ msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:5
 msgid "Folders - Share"
-msgstr ""
+msgstr "폴더 - 공유"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
-msgstr ""
+msgstr "폴더"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:16
 #: seahub/share/templates/share/repos.html:16
@@ -2875,20 +3060,20 @@ msgid ""
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr ""
 
 #: seahub/share/templates/share/priv_shared_files.html:5
 msgid "Files - Share"
-msgstr ""
+msgstr "파일 - 공유"
 
 #: seahub/share/templates/share/priv_shared_files.html:12
 msgid "From Others"
@@ -2928,7 +3113,7 @@ msgstr ""
 
 #: seahub/share/templates/share/repos.html:5
 msgid "Libraries - Share"
-msgstr ""
+msgstr "라이브러리 - 공유"
 
 #: seahub/share/templates/share/repos.html:65
 msgid "You have not shared any library"
@@ -2948,9 +3133,9 @@ msgstr "공유"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
-msgstr ""
+msgstr "기초 정보"
 
 #: seahub/share/templates/share/user_share_list.html:12
 msgid "No Nickname"
@@ -2961,7 +3146,8 @@ msgid "Add to contacts"
 msgstr ""
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr ""
 
@@ -2976,62 +3162,30 @@ msgstr ""
 
 #: seahub/templates/activities.html:4 seahub/templates/home_base.html:15
 msgid "Activities"
-msgstr ""
+msgstr "활동"
 
 #: seahub/templates/admin_base.html:4
 msgid "Exit System Admin"
 msgstr ""
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "사용자"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "알림"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr ""
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "시스템 관리자"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr ""
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "로그인"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "가입"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "로그아웃"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr ""
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "시스템 관리자"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "시파일"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr ""
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "모든 그룹"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "클라이언트"
 
@@ -3039,7 +3193,7 @@ msgstr "클라이언트"
 msgid "Client Name"
 msgstr "클라이언트 이름"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3080,28 +3234,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
-msgstr ""
+msgstr "암호: "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
+msgstr "암호를 입력하세요."
+
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "기기"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "플랫폼"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "기기 이름"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
 msgstr ""
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# 라이브러리"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "연결된 기기가 없습니다"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3111,10 +3317,9 @@ msgstr ""
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
-msgstr "현재 경로:"
+msgstr "현재 경로: "
 
 #: seahub/templates/file_edit.html:93
 msgid "Draft saved."
@@ -3122,7 +3327,7 @@ msgstr ""
 
 #: seahub/templates/file_edit.html:95
 msgid "Continue editing"
-msgstr ""
+msgstr "편집 계속하기"
 
 #: seahub/templates/file_edit.html:96
 msgid "Preview"
@@ -3251,7 +3456,7 @@ msgstr ""
 
 #: seahub/templates/file_edit.html:206
 msgid "Indent (Tab)"
-msgstr ""
+msgstr "들여 쓰기 (Tab)"
 
 #: seahub/templates/file_edit.html:209
 msgid "Align Left (Ctrl/Cmd+L)"
@@ -3271,7 +3476,7 @@ msgstr ""
 
 #: seahub/templates/file_edit.html:215
 msgid "Hyperlink"
-msgstr ""
+msgstr "하이퍼링크"
 
 #: seahub/templates/file_edit.html:218
 msgid "Add"
@@ -3287,11 +3492,11 @@ msgstr ""
 
 #: seahub/templates/file_edit.html:227
 msgid "Undo (Ctrl/Cmd+Z)"
-msgstr ""
+msgstr "실행 취소 (Ctrl/Cmd+Z)"
 
 #: seahub/templates/file_edit.html:228
 msgid "Redo (Ctrl/Cmd+Y)"
-msgstr ""
+msgstr "다시 실행 (Ctrl/Cmd+Y)"
 
 #: seahub/templates/file_edit.html:251
 msgid "Draft Available"
@@ -3403,15 +3608,15 @@ msgstr ""
 
 #: seahub/templates/file_edit.html:442
 msgid "Undo - Ctrl+Z"
-msgstr ""
+msgstr "실행 취소 - Ctrl+Z"
 
 #: seahub/templates/file_edit.html:443
 msgid "Redo - Ctrl+Y"
-msgstr ""
+msgstr "다시 실행 - Ctrl+Y"
 
 #: seahub/templates/file_edit.html:444
 msgid "Redo - Ctrl+Shift+Z"
-msgstr ""
+msgstr "다시 실행 - Ctrl+Shift+Z"
 
 #: seahub/templates/file_edit.html:446
 msgid "Editing Help"
@@ -3427,9 +3632,9 @@ msgid "Password is required."
 msgstr ""
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr ""
@@ -3448,16 +3653,11 @@ msgstr ""
 msgid "Current Path:"
 msgstr "현재 경로:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr ""
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "크기"
 
@@ -3465,37 +3665,54 @@ msgstr "크기"
 msgid "(current version)"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr ""
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr ""
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "문서"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
-msgstr ""
+msgstr "소개"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "도움말"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "클라이언트"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
-msgstr ""
+msgstr "윈도우, 맥, 리눅스용 시파일"
+
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "서버 버전: "
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "시파일"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "문의"
 
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
@@ -3525,56 +3742,78 @@ msgstr "의 휴지통"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr ""
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
 msgid "Current Path: "
-msgstr "현재 경로:"
+msgstr "현재 경로: "
 
 #: seahub/templates/home_base.html:8 seahub/templates/org_base.html:12
 msgid "Personal"
-msgstr ""
+msgstr "개인"
 
 #: seahub/templates/home_base.html:13 seahub/templates/starred.html:8
 msgid "Starred"
-msgstr ""
+msgstr "별표"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
-msgstr ""
+msgstr "개인 위키"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr ""
 
-#: seahub/templates/myhome.html:41
-msgid "Welcome to Seafile!"
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
 msgstr ""
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "그룹"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr ""
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr ""
+
+#: seahub/templates/myhome.html:40
+msgid "Welcome to Seafile!"
+msgstr "환영합니다! 시파일입니다."
+
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr ""
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "닫기"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr ""
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr ""
@@ -3585,11 +3824,11 @@ msgid ""
 "current account."
 msgstr ""
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3611,420 +3850,452 @@ msgstr ""
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr ""
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr ""
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr ""
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr ""
 
-#: seahub/templates/repo.html:31
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
+
+#: seahub/templates/repo.html:23
+msgid "Size: "
+msgstr "크기: "
+
+#: seahub/templates/repo.html:32
 msgid "Trash"
 msgstr "휴지통"
 
-#: seahub/templates/repo.html:38
-msgid "Size: "
-msgstr "크기:"
-
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr ""
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "복사"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr ""
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr ""
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr ""
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
-msgstr ""
+msgstr "파일 추가"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr ""
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr ""
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr ""
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
-msgstr ""
+msgstr "저장 중..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr ""
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
-msgstr ""
+msgstr "새 디렉토리"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr ""
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
-msgstr ""
+msgstr "새 파일"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr ""
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr ""
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr ""
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr ""
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
-msgstr ""
+msgstr "파일 이름"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr ""
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr ""
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr ""
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr ""
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr ""
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr ""
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr ""
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr ""
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr ""
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr ""
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr ""
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr ""
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr ""
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "오류"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "시작"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr ""
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr ""
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr ""
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr ""
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr ""
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr ""
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr ""
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr ""
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr ""
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr ""
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "완료!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr ""
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr ""
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr ""
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "파일 이름 변경"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "디렉토리 이름 변경"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "파일 복사"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "파일 이동"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "디렉토리 복사"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "디렉토리 이동"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr ""
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr ""
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
-msgstr ""
+msgstr "별표 해제"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
-msgstr ""
+msgstr "별표"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr ""
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr ""
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr ""
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr ""
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr ""
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr ""
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr ""
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr ""
 
@@ -4046,11 +4317,12 @@ msgstr ""
 msgid "View Snapshot"
 msgstr ""
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr ""
@@ -4070,7 +4342,7 @@ msgstr ""
 #: seahub/templates/repo_history_view.html:58
 #: seahub/templates/repo_recycle_view.html:61
 msgid "Directory"
-msgstr ""
+msgstr "디렉토리"
 
 #: seahub/templates/repo_recycle_view.html:32
 #: seahub/templates/repo_recycle_view.html:34
@@ -4091,34 +4363,78 @@ msgstr ""
 msgid "Delete Time"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr ""
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr ""
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "이전 암호"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "새 암호 (6글자 이상)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "이전 암호를 입력하세요."
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "새 암호를 입력하세요."
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "새 암호가 너무 짧습니다."
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "새 암호가 너무 깁니다. (35글자 이내)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "새 암호를 다시 입력하세요."
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "새 암호가 서로 맞지 않습니다."
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr ""
@@ -4127,6 +4443,10 @@ msgstr ""
 msgid "Create Time"
 msgstr ""
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4169,8 +4489,14 @@ msgstr ""
 msgid "Click to download."
 msgstr ""
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr ""
 
@@ -4182,25 +4508,26 @@ msgstr ""
 msgid "Save To:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
 msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr ""
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
 msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr ""
 
@@ -4212,8 +4539,8 @@ msgstr ""
 msgid "icon"
 msgstr "아이콘"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr ""
 
@@ -4254,11 +4581,11 @@ msgstr ""
 #: seahub/templates/update_file_error.html:14
 #: seahub/templates/upload_file_error.html:10
 msgid "error: "
-msgstr "오류:"
+msgstr "오류: "
 
 #: seahub/templates/upload_file_error.html:6
 msgid "Upload file"
-msgstr ""
+msgstr "파일 업로드"
 
 #: seahub/templates/upload_file_error.html:6
 msgid "to"
@@ -4268,48 +4595,48 @@ msgstr ""
 msgid "Sorry, this user is not registered yet."
 msgstr ""
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] ""
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr ""
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr ""
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "이전"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr ""
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "다음"
 
@@ -4325,10 +4652,10 @@ msgstr ""
 #: seahub/templates/view_file_text.html:34
 #: seahub/templates/snippets/file_encoding.html:8
 msgid "auto detect"
-msgstr ""
+msgstr "자동 인식"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  / root directory."
 msgstr ""
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr ""
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr ""
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
-msgstr ""
+msgstr "내부 오류"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr ""
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr ""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr ""
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr ""
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr ""
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr ""
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr ""
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr ""
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr ""
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr ""
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr ""
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr ""
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr ""
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr ""
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr ""
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr ""
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr ""
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr ""
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr ""
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr ""
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr ""
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr ""
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr ""
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "잘못된 파일 형식."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr ""
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr ""
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr ""
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr ""
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr ""
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr ""
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr ""
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr ""
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr ""
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, 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:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5612,47 +6040,53 @@ msgid ""
 "configured."
 msgstr ""
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr ""
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
 msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr ""
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr ""
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr ""
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, 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:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr ""
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr ""
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr ""
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po
index f2871cac9b..0ed52d442a 100644
--- a/locale/pl/LC_MESSAGES/django.po
+++ b/locale/pl/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-22 15:01+0000\n"
-"Last-Translator: fotex \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-12 11:00+0000\n"
+"Last-Translator: K.S. \n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/seahub/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,175 +21,207 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Użytkownik z podanym adresem e-mail już istnieje"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Podane hasła nie są identyczne."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Nazwa nie może być pusta"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Nazwa jest zbyt długa (maksymalnie 255 znaków)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Opis nie może być pusty"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Opis jest zbyt długi (maksymalnie 100 znaków)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Nazwa %s nie jest prawidłowa"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Brakujący parametr"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Stara nazwa jest wymagana"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Jest zbyt długie."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Jest wymagane."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Nazwa \"%s\" nie jest prawidłowa"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "Identyfikator repozytorium jest wymagany"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Nazwa użytkownika jest wymagana"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "Hasło nie może być puste"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Nieprawidłowy format odsyłacza"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Nieprawidłowe hasło"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Wewnętrzny błąd serwera"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Błąd deszyfrowania biblioteki"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Adres e-mail jest wymagany"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Przyznana przestrzeń nie może być pusta"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Przyznana przestrzeń jest zbyt niska (minimalna wartość to 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Nazwa biblioteki jest wymagana"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Opis biblioteki jest wymagany"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Proszę podać liczbę"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Proszę wpisać prawidłowe hasło."
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr "français"
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -198,8 +230,9 @@ msgid "File Collaboration Team Organization"
 msgstr "praca grupowa organizacja współpraca"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Dyskusja"
 
@@ -211,16 +244,17 @@ msgstr "Dyskusja"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -230,13 +264,13 @@ msgstr "Plik"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -245,9 +279,9 @@ msgstr "Ikona katalogu"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s odpowiedzi"
@@ -258,43 +292,48 @@ msgstr "Brak dyskusji."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Niepowodzenie. Proszę sprawdzić połączenie."
 
@@ -343,6 +382,25 @@ msgstr "Proszę sprawdzić sieć."
 msgid "New Replies"
 msgstr "Nowe odpowiedzi"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Wiadomości"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Wiadomości z %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "Brak wiadomości."
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Informacje osobiste"
@@ -356,10 +414,11 @@ msgid "Important dates"
 msgstr "Ważne daty"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Grupy"
 
@@ -372,72 +431,74 @@ msgstr "Hasło zostało zmienione"
 msgid "Change password: %s"
 msgstr "Zmień hasło: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Hasło"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Proszę podać prawidłową nazwę użytkownika i hasło. Zwróć uwagę na wielkość znaków"
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "To konto nie jest aktywne."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Wygląda na to, że Twoja przeglądarka nie obsługuje ciasteczek. Ich obsługa jest wymagana w celu logowania."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Nie udało się wysłać wiadomości e-mail. Usługa e-mail nie jest poprawnie skonfigurowana, proszę się skontaktować z administratorem."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Podany adres e-mail nie jest powiązany z żadnym kontem. Czy na pewno się rejestrowałeś?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
+msgid "Reset Password on %s"
 msgstr "Reset hasła dla %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Potwierdzenie hasła"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Twoje stare hasło jest nieprawidłowe. Proszę wprowadzić je ponownie."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Hasło (ponownie)"
 
@@ -475,7 +536,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Obecnie posiadasz %(nb_avatars)d awatarów, a dozwolone maksimum to %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Awatar dla %s"
@@ -543,57 +604,62 @@ msgstr "Obecny awatar: "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Wyślij"
@@ -610,7 +676,7 @@ msgstr "%(avatar_creator)s zaktualizował swój awa
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Zaktualizowałeś swój awatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Awatar domyślny"
 
@@ -642,7 +708,7 @@ msgstr "telefon"
 msgid "note"
 msgstr "notatka"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Pliki z tej biblioteki nie mogą być przeglądane online."
 
@@ -699,7 +765,7 @@ msgstr "Przywrócono plik \"%(file)s\" do stanu z %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Odzyskano usunięty katalog"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Zmieniona nazwa biblioteki lub opis"
 
@@ -709,9 +775,9 @@ msgstr "Automatyczne scalanie przez Seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Przed chwilą"
 
@@ -751,42 +817,48 @@ msgstr[2] "%(seconds)d sekund temu"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Do odczytu i zapisu"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Tylko do odczytu"
 
@@ -795,33 +867,33 @@ msgstr "Tylko do odczytu"
 msgid "Email is required."
 msgstr "Adres e-mail jest wymagany."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s nie jest prawidłowym adresem."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s już jest w Twoich kontaktach."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Pomyślnie dodano %s do kontaktów."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Nie udało się dodać %s do kontaktów."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Pomyślnie wyedytowano %s."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Pomyślnie usunięto %s"
@@ -846,10 +918,10 @@ msgstr "E-mail "
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -857,45 +929,46 @@ msgstr "E-mail "
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nazwa"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Notatka"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -904,56 +977,64 @@ msgstr "Notatka"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Akcje"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Edytuj"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Usuń"
 
@@ -969,17 +1050,19 @@ msgstr "Dodaj jakieś kontakty, aby móc szybko udostępniać biblioteki i przes
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "E-mail"
 
@@ -1004,8 +1087,8 @@ msgid "Delete Contact"
 msgstr "Usuń kontakt"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1081,62 +1164,63 @@ msgstr "Wiadomość potwierdzająca jest zbyt długa (maksymalnie 255 znaków)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" nie jest prawidłową nazwą"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Możesz stworzyć tylko %d grup.Rozszerz swoje konto."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Już istnieje grupa o takiej nazwie."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Pomyślnie zmieniono nazwę grupy na \"%s\""
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Nie udało się zmienić nazwy grupy. Nazwy mogą się składać wyłącznie z liter, liczb i znaków podkreślenia"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Adres e-mail %s jest nieprawidłowy."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Tylko administratorzy mogą uczynić grupę publiczną"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Wiadomość nie istnieje"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Nie masz wystarczających uprawnień."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Możesz zaprosić tylko %d członków.Rozszerz swoje konto."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Twój przyjaciel dodał Cię do grupy na Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Zostałeś zaproszony do grupy %s"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Nie udało się dodać, %s nie jest zarejestrowany."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
@@ -1144,338 +1228,352 @@ msgstr[0] "Pomyślnie dodano. Wiadomość e-mail została wysłana."
 msgstr[1] "Pomyślnie dodano. %(count)s wiadomości e-mail zostały wysłane."
 msgstr[2] "Pomyślnie dodano. %(count)s wiadomości e-mail zostało wysłanych."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Pomyślnie dodano."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Nie udało się dodać, %s nie jest poprawnym adresem e-mail."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Nie udało się dodać, %s nie jest zarejestrowany."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Operacja zakończona pomyślnie."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Niepowodzenie : %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Niepowodzenie przy wyłączaniu udostępniania: grupa nie istnieje."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Niepowodzenie operacji: tylko administratorzy i właściciel biblioteki mogą wyłączyć jej udostępnianie."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Niepowodzenie przy wyłączaniu współdzielenia: błąd wewnętrzny."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Błąd: nieprawidłowy identyfikator grupy"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Błąd: grupa nie istnieje."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Pomyślnie opublikowano w %(groups)s"
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Błąd: nie należysz do grupy %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Błąd: biblioteka nie istnieje."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Błąd: brak ścieżki."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Niepowodzenie tworzenia: grupa nie istnieje."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Niepowodzenie tworzenia: nie należysz do grupy."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Nie można utworzyć"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Nie można utworzyć: błąd wewnętrzny."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Już należysz do grupy."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Prośba wysłana, poczekaj na decyzję administratora."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr "Dyskusja jest wymagana."
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Plik nie istnieje"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "Pomyślnie aktywowano \"Wiki\"."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "Pomyślnie deaktywowano \"Wiki\"."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Nie udało się stworzyć strony wiki. Proszę spróbować później."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Wewnętrzny błąd serwera"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Wiki nie istnieje."
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Nie udało się stworzyć strony domowej. Proszę spróbować później"
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Nie udało się ustawić biblioteki wiki."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Nie znaleziono Wiki."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Strona \"%s\" już istnieje."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s zaprasza Cię do grupy %(group.group_name)s. Odwiedź tę stronę, aby dołączyć do grupy:"
+msgid "Successfully deleted \"%s\"."
+msgstr "Pomyślnie usunięto \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Dzięki za korzystanie z naszej strony!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "Załoga %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Nie udało się usunąć \"%s\". Proszę spróbować później."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Cześć,"
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr "%(email)s zaprosił Cię do grupy %(grp_name)s w %(site_name)s: "
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Ukryj odpowiedzi"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Odpowiedz"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Dodaj odpowiedź..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Nie może być pusta i nie powinna być dłuższa niż 2048 znaków."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Ta grupa jest publiczna."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Aktywuj moduły"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Wyjdź"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Ta grupa jest publiczna."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Biblioteki"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Pliki"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Członkowie"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Admin"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Opuść grupę"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Czy na pewno chcesz opuścić tę grupę?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Dodaj dyskusję..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Dodaj pliki"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr "Wybierz plik lub pliki:"
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Po zalogowaniu możesz brać udział w dyskusjach."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Następny"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑ Góra"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Czy na pewno chcesz usunąć tę dyskusję?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Tak"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Nie"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Pomyślnie usunięto"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Nie udało się usunąć: "
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Niepowodzenie."
 
@@ -1484,6 +1582,7 @@ msgid "Recent Changes"
 msgstr "Ostatnie zmiany"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1492,77 +1591,58 @@ msgstr "Nowa biblioteka"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Opis"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Ostatnia aktualizacja"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Udostępniony przez"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "ikona katalogu"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Pobierz i synchronizuj"
 
@@ -1578,7 +1658,7 @@ msgstr "Pobierz i synchronizuj"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Wyłącz udostępnianie"
 
@@ -1615,15 +1695,16 @@ msgid "Modified at"
 msgstr "Zmodyfikowano"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Zmodyfikował"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1632,23 +1713,23 @@ msgid "Details"
 msgstr "Szczegóły"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Żaden"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -1667,15 +1748,43 @@ msgstr "Hasło: "
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Hasło będzie przechowywane na serwerze wyłącznie przez 1 godzinę."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Wyłącz udostępnianie biblioteki"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Czy na pewno chcesz wyłączyć udostępnianie %s?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "ikona katalogu"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "W tej grupie nie ma żadnej publicznej biblioteki"
@@ -1692,14 +1801,25 @@ msgid ""
 "message: "
 msgstr "%(user)s chce dołączyć do grupy \"%(group_name)s\", oto wiadomość weryfikacyjna: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Dzięki za korzystanie z naszej strony!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Załoga %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Admini"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -1707,7 +1827,7 @@ msgstr "Ustawienia"
 msgid "Add Members"
 msgstr "Dodaj członków"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Dodaj administratorów"
 
@@ -1716,7 +1836,7 @@ msgid "Avatar"
 msgstr "Awatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Zmień"
 
@@ -1735,7 +1855,7 @@ msgid "Make Public"
 msgstr "Uczyń publiczną"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Przekaż"
 
@@ -1759,29 +1879,41 @@ msgstr "Porada: adres e-mail powinien być już zarejestrowany."
 msgid "Rename Group To"
 msgstr "Zmień nazwę grupy na"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Odwołaj grupę"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Czy na pewno chcesz odwołać tę grupę?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Usuń członka"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Czy na pewno chcesz usunąć %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Wyjdź"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Dodaj do kontaktów"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Opuść grupę"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Czy na pewno chcesz opuścić tę grupę?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Dołącz do grupy"
@@ -1808,12 +1940,29 @@ msgstr "Członkowie: "
 msgid "Verification Message"
 msgstr "Wiadomość weryfikacyjna"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Indeks Wiki"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Brak indeksu."
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Utwórz"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Ta grupa nie posiada Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1821,82 +1970,105 @@ msgid ""
 "back to the server."
 msgstr "Wiki Seafile umożliwia przekazanie wiedzy w prosty sposób. Treści Wiki są przechowywane w normalnej bibliotece z predefiniowaną strukturą plików i folderów. W ten sposób możliwa jest edycja Wiki na komputerze stacjonarnym, a następnie synchronizacja z serwerem."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Utwórz Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Wybierz bibliotekę jako wiki"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Utwórz Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Strony Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Wybierz bibliotekę jako wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Proszę kliknąć i wybrać bibliotekę."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Home"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Strony"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Historia Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Nowa strona"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Usuń stronę"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Edytuj stronę"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Historia strony"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Ostatnio zmieniony przez %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Czy na pewno chcesz usunąć tę stronę?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Nazwa jest wymagana."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Opis jest wymagany."
 
@@ -1943,10 +2115,12 @@ msgstr "Dodaj członków"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Wprowadź"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "adresy e-mail, oddzielone za pomocą ','"
 
@@ -1962,7 +2136,8 @@ msgstr "Porada: adresy e-mail powinny być już zarejestrowane."
 msgid "Add administrators"
 msgstr "Dodaj administratorów"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Prosze podać lub wybrać adresy e-mail."
 
@@ -2241,135 +2416,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Serwery Seafile nie przechowują haseł do zaszyfrowanych bibliotek. Aby wyświetlić online zaszyfrowaną bibliotekę, należy podać do niej hasło. Zostanie ono zapisane w zaszyfrowanej pamięci serwera, a po godzinie z niej usunięte. Po tym czasie, aby mieć dalej dostęp do biblioteki, należy hasło wprowadzić ponownie."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "wiadomość jest wymagana"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "kontakt jest wymagany"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Nie możesz wysłać wiadomości do siebie."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Nie udało się wysłać wiadomości do %s, użytkownik nie istnieje."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Wiadomości"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Wiadomość"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Czas"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "wiadomość..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Dodaj pliki"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "wyślij do: kliknij aby wybrać odbiorców"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "proszę najpierw dodać kontakty"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Nie udało się pobrać Twoich kontaktów w celu wysłania wiadomości."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Obecnie nie posiadasz żadnej biblioteki"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Wiadomości z %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Wyślij wiadomość..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Plik o nazwie %(file_name)s został przesłany do Twojego folderu %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s udostępnił Ci bibliotekę %(repo_name)s."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s udostępił Ci plik %(file_name)s."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr "Otrzymałeś nową wiadomość od %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s zawiera nową dyskusję"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s zamieścił nową dyskusję w grupie %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "Jedna grupowa dyskusja zawiera nową odpowiedź"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s odpowiedział w Twojej grupowej dyskusji"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s prosi o człon
 msgid "Successfully cleared all notices."
 msgstr "Pomyślnie wyczyszczono wszystkie powiadomienia."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Dodaj nowe powiadomienie"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr "Cześć %(name)s,"
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] "\nMasz 1 nowe powiadomienie w %(site_name)s.\n\n"
+msgstr[1] "\nMasz %(num)s nowe powiadomienia w %(site_name)s.\n"
+msgstr[2] "\nMasz %(num)s nowych powiadomień w %(site_name)s.\n"
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr "Idź zobacz na następującej stronie:"
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Wszystkie powiadomienia"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Dodaj nowe powiadomienie"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Szczegóły powiadomienia"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(obecne powiadomienie)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Ustaw na aktualne"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Pusto"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Usuń powiadomienie"
 
@@ -2432,27 +2612,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Proszę wybrać sposób wyświetlania online zaszyfrowanych bibliotek:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Wyślij hasło na serwer."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Pliki zostaną odszyfrowane na serwerze przed wysłaniem ich do Ciebie."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Zapisz hasła w przeglądarce."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Pliki zostaną odszyfrowane w przeglądarce po pobraniu."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2484,81 +2664,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "Pomyślnie ustawiono \"%s\" jako Twoją bibliotekę domyślną."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Ustawienia profilu"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Profil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Język"
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Zaszyfrowane biblioteki"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Biblioteki podrzędne"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Domyślna biblioteka"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Usuń konto"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Awatar:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Hasło:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Nazwa"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "O mnie"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Wydział:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Telefon:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Ustawienia językowe"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Ustawienia zaszyfrowanych bibliotek"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Jak przeglądać zaszyfrowane biblioteki online:"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Ustawienia bibliotek podrzędnych"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Włącz biblioteki podrzędne"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2567,7 +2754,7 @@ msgid ""
 "library."
 msgstr "Ta funkcja umożliwia wybiórczą synchronizację folderów wewnątrz biblioteki. Biblioteka podrzędna może zostać utworzona z dowolnego folderu. Po utworzeniu będzie ona widoczna w Twoim kliencie stacjonarnym, będzie można ją pobrać tak jak każdą inną bibliotekę, będzie również zsynchronizowana z biblioteką nadrzędną."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2575,37 +2762,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Biblioteki podrzędne są także wykorzystywane podczas udostępniania folderów grupie lub innym użytkownikom. W przypadku wyłączenia tej opcji, będą automatycznie tworzone ukryte biblioteki podrzędne. Przy opcji włączonej, te ukryte biblioteki będą widoczne i będzie możliwe zarządzanie nimi."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Ustawienia biblioteki domyślnej"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Twoja biblioteka domyślna:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Biblioteka domyślna jest domyślnym miejscem do przechowywania Twoich dokumentów i obrazów."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Wybierz bibliotekę domyślną"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Ta operacja jest nieodwracalna. Dobrze się zastanów!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Wybierz bibliotekę domyślną:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Proszę kliknąć i wybrać bibliotekę."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Czy na pewno chcesz usunąć swoje konto?"
 
@@ -2618,25 +2801,25 @@ msgid "Info"
 msgstr "Informacje"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Nazwa"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "O sobie"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Wydział"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -2644,169 +2827,171 @@ msgstr "Telefon"
 msgid "Email is not longer than 512 characters"
 msgstr "Adres e-mail jest nie dłuższy niż 512 znaków"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Nie udało się udostępnić wszystkim członkom, proszę później spróbować ponownie."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Pomyślnie udostępniono wszystkim członkom, sprawdź udziały."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" już jest w grupie %(group)s. Pokaż"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Niepowodzenie udostępniania %(repo)s grupie %(group)s, proszę później spróbować ponownie."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Pomyślnie udostępniono grupie %(group)s, sprawdź udziały."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Nie możesz udostępniać bibliotek sobie."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Nie udało się udostępnić %s, proszę później spróbować ponownie."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Pomyślnie udostępniono %(email)s, sprawdź udziały."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Niepowodzenie udostępniania \"%s\", ponieważ adres e-mail nie jest zarejestrowany."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Tylko właściciel biblioteki ma możliwość jej udostępnienia."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Niepowodzenie udostępniania \"%s\", brak wolnej przestrzeni. Ulepsz swoje konto."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Parametr jest nieprawidłowy"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Nie udało się usunąć udziału"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "identyfikator grupy nie jest prawidłowy"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Pomyślnie usunięto udział"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "wszyscy członkowie"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Nieprawidłowe parametry"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Nie możesz udostępniać biblioteki w ten sposób."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Nie udało się pobrać łącza, proszę później spróbować ponownie."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Usunięto pomyślnie"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Łącze nie istnieje"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Niepowodzenie wysyłania udostępnionego łącza. Usługa e-mail nie jest poprawnie skonfigurowana, proszę skontaktować się z administratorem."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Znajomy udostępnił Ci plik w Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr "Został Ci udostępniony plik w %s"
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Wewnętrzny błąd serwera. Wysyłanie nieudane."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Wysłano pomyślnie."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Proszę wybrać katalog."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Zapisano pomyślnie."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Niepowodzenie udostępniania \"%s\", użytkownik nie został odnaleziony."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Pomyślnie udostępniono %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Pomyślnie wyłączono udostępnianie \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
+msgid "You don't have permission to unshare %s."
 msgstr "Nie masz uprawnień do wyłączenia udostępniania %s."
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Nie posiadasz uprawnień do zapisu %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Nie udało się pobrać łącza, proszę później spróbować ponownie."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "Nie udało się wysłać udostępnionego łącza przesyłania. Usługa e-mail nie jest poprawnie skonfigurowana, proszę się skontaktować z administratorem."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Twój znajomy udostępnił Ci łącze przesyłania w Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr "Udostępniono Ci łącze przesyłania w %s"
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2827,14 +3012,15 @@ msgstr "Wizyty"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Wyświetl"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Usuń"
 
@@ -2863,7 +3049,7 @@ msgid "Folders - Share"
 msgstr "Foldery - Udział"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Foldery"
 
@@ -2888,13 +3074,13 @@ msgid ""
 msgstr "Jeżeli nie chcesz udostępniać innym użytkownikom całej biblioteki możesz udostępniać pojedyncze foldery."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Edycja pomyślna."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Niepowodzenie edycji."
@@ -2961,7 +3147,7 @@ msgstr "Udziały"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Informacje podstawowe"
 
@@ -2974,7 +3160,8 @@ msgid "Add to contacts"
 msgstr "Dodaj do kontaktów"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Opuść udział"
 
@@ -2995,56 +3182,24 @@ msgstr "Aktywności"
 msgid "Exit System Admin"
 msgstr "Wyjdź z administracji"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Powiadomienia"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Łącza"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Administracja"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "nieprzeczytane powiadomienia"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Zaloguj się"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Zarejestruj"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Wersja serwera: "
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Administracja"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Kontakt"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Wszystkie grupy"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Klienci"
 
@@ -3052,7 +3207,7 @@ msgstr "Klienci"
 msgid "Client Name"
 msgstr "Nazwa klienta"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3093,28 +3248,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Ta biblioteka jest zaszyfrowana. Proszę podać hasło jeśli chcesz ją przeglądać online. Hasło będzie przechowywane na serwerze  przez 1 godzinę."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Hasło: "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Tutaj możesz zmienić sposób wyświetlania online szyfrowanych bibliotek."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Proszę podać hasło."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Urządzenia"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Platforma"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Nazwa urządzenia"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Ostatni dostęp"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Biblioteki"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Operacja"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Odłącz"
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "Czy na pewno chcesz odłączyć %s?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "Synchronizacja zostanie natychmiast zatrzymana."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "Nie posiadasz podłączonych urządzeń"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "Twoje urządzenia (Desktop/Android/iOS) będą tutaj wymienione."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Pomyślnie odłączono."
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3124,8 +3331,7 @@ msgstr "Pobierz"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Aktualna ścieżka: "
 
@@ -3440,9 +3646,9 @@ msgid "Password is required."
 msgstr "Hasło jest wymagane."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Historia"
@@ -3461,16 +3667,11 @@ msgstr "Porada: nowa wersja zostanie utworzona po każdej zmianie. W każdej chw
 msgid "Current Path:"
 msgstr "Aktualna ścieżka:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Ostatni modyfikator"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -3478,38 +3679,55 @@ msgstr "Rozmiar"
 msgid "(current version)"
 msgstr "(obecna wersja)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Zmieniono nazwę lub przeniesiono z %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Przywróć"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Różnice"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Wprowadzenie"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Pomoc"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Klient"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile dla Windows, Mac i Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Wersja serwera: "
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Kontakt"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3538,12 +3756,13 @@ msgstr " kosz"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Wróć do biblioteki"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3558,36 +3777,57 @@ msgstr "Osobiste"
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Osobista Wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Udostępnianie"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Łącza"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupa"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Żadna biblioteka nie została udostępniona Twoim grupom"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Żadna biblioteka nie została Ci udostępniona"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Witaj w Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile porządkuje pliki tworząc biblioteki. Każda biblioteka może być niezależnie udostępniania i synchronizowana. Specjalnie dla Ciebie utworzyliśmy Twoją osobistą bibliotekę. W dowolnej chili możesz tworzyć kolejne."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Zamknij"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Moje pliki"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organizacja"
@@ -3598,11 +3838,11 @@ msgid ""
 "current account."
 msgstr "Organizacja zostanie usunięta w następnej wersji, a dane zostaną scalone z Twoim kontem."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3624,420 +3864,452 @@ msgstr "Nikt nie stworzył jeszcze żadnej grupy"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Możesz kliknąć przycisk \"Dodaj grupę\" pod etykietą \"Grupa\", aby stworzyć grupę. "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Udostępnione od"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Brak biblioteki publicznej"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Możesz utworzyć publiczną bibliotekę klikając przycisk \"Nowa biblioteka\". Inni użytkownicy mogą taką bibliotekę przeglądać i pobierać."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Kosz"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Przeszukaj członków..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Kosz"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Przenieś"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Prześlij pliki"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Właściciel tej biblioteki wykorzystał całą dostępną przestrzeń."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Proszę najpierw wybrać plik."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Dodaj pliki"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Rozpocznij wszystko"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Funkcja Przeciągnij i Upuść jest dostępna w Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "Rozmiar pliku powinien być mniejszy niż %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Aktualizuj %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Wybierz plik"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Mniejsze niż %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Nowy katalog"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nazwa katalogu"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Nowy plik"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Typ pliku"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Kliknij, aby wybrać"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "format Rich Text"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "format prostych znaczników"
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Aktualna biblioteka"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Inne biblioteki"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Proszę kliknąć i wybrać folder."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Zmień nazwę %(name)s na: "
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Synchronizuj %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Biblioteka podrzędna zostanie utworzona w tym katalogu. Będzie ona widoczna w Twoim kliencie. Możesz ją pobrać tak samo jak normalną bibliotekę."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Utwórz"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Ta biblioteka jest zaszyfrowana. Proszę podać hasło jeśli chcesz ją przeglądać online. Hasło będzie przechowywane w przeglądarce wyłącznie przez 1 godzinę."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Plik jest zbyt duży"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Plik jest zbyt mały"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Niedozwolony typ pliku"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Przekroczono maksymalną liczbę plików"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Przesłane dane przekraczają rozmiar pliku"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Wynik przesyłania pustego pliku"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Błąd"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Start"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Usuń elementy"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Czy na pewno chcesz usunąć wybrane elementy?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Przetwarzanie..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Pomyślnie usunięto %(name)s i %(amount)s innych elementów."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Pomyślnie usunięto %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Błąd wewnętrzny. Nie udało się usunąć %(name)s i %(amount)s innych pozycji."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Błąd wewnętrzny. Nie udało się usunąć %(name)s"
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Przenieś zaznaczone foldery/pliki do:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Kopiuj zaznaczone foldery/pliki do:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Nieprawidłowa ścieżka docelowa"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Pomyślnie przeniesiono %(name)s i %(amount)s innych pozycji."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Pomyślnie przeniesiono %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Pomyślnie skopiowano %(name)s i %(amount)s innych pozycji."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Pomyślnie skopiowano %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Błąd wewnętrzny. Nie udało się przenieść %(name)s i %(amount)s innych elementów."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Błąd wewnętrzny. Nie udało się przenieść %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Błąd wewnętrzny. Nie udało sie skopiować %(name)s i %(amount)s innych elementów."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Błąd wewnętrzny. Nie udało się skopiować %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Przenoszenie..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Kopiowanie..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr "Pomyślnie przeniesiono %(s_num)s pozycji."
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr "Nie udało się przenieść %(f_num)s pozycji."
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr "Pomyślnie skopiowano %(s_num)s pozycji."
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr "Niepowodzenie"
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Szyfrowanie pliku..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Wewnętrzny błąd serwera"
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Szyfrowanie, %(num)s% ukończono."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Przesyłanie..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Zakończono!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Pobieranie..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Pobieranie, %(num)s% ukończono."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Deszyfrowanie..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Odszyfrowywanie, %(num)s% ukończono."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Pomyślnie usunięto %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Zmień nazwę pliku"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Zmień nazwę katalogu"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Kopiuj plik"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Przenieś plik"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Kopiuj folder"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Przenieś folder"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Kopiuj %(name)s do:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Przenieś %(name)s do:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Pobieranie folderów nie jest obsługiwane w tej bibliotece."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "Nieoznaczone gwiazdką"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "Oznaczone gwiazdką"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Biblioteka podrzędna jest utworzona."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Jest wymagane."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Podano samo rozszerzenie, proszę wprowadzić nazwę."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Tworzenie..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Nazwa nie została zmieniona."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Pomyślnie zmieniono nazwę z %(old_name)s na %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr "Anulowano."
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Proszę wybrać przynajmniej jeden kontakt."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Proszę wpisać adresy e-mail, grupy lub wybrać jakieś."
 
@@ -4059,11 +4331,12 @@ msgstr "Porada: Po modyfikacji zostanie utworzona migawka, która pozwala na odt
 msgid "View Snapshot"
 msgstr "Pokaż migawkę"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Na stronie: "
@@ -4104,34 +4377,78 @@ msgstr "wszystko"
 msgid "Delete Time"
 msgstr "Usuń czas"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Ustawienia biblioteki"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Przechowuj pełną historię"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Nie przechowuj historii"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Przechowuj historię z ostatnich:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "dni"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Przeniesienie własności"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Przenieś własność biblioteki na innego użytkownika:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr "Zmień hasło"
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Zmień hasło do tej biblioteki:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr "Stare hasło"
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr "Nowe hasło (min. 6 znaków)"
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr "Powtórz nowe hasło"
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr "Wpisz stare hasło"
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr "Wpisz nowe hasło"
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "Nowe hasło jest zbyt krótkie"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "Nowe hasło jest zbyt długie (maks. 35 znaków)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Proszę ponownie wpisać nowe hasło"
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Nowe hasła nie są identyczne"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Powrót do historii modyfikacji"
@@ -4140,11 +4457,15 @@ msgstr "Powrót do historii modyfikacji"
 msgid "Create Time"
 msgstr "Czas utworzenia"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Ostatni modyfikator"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "Detail"
-msgstr "Szczegół"
+msgstr "Szczegóły"
 
 #: seahub/templates/repo_view_snapshot.html:87
 msgid "Restore Library"
@@ -4182,8 +4503,14 @@ msgstr "Twój klient Seafile jest przestarzały, proszę zaktualizować go do na
 msgid "Click to download."
 msgstr "Kliknij, aby pobrać."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr "Proszę podać hasło jeśli chcesz przeglądać współdzielony plik/katalog. Będzie ono przechowywane na serwerze wyłącznie przez 1 godzinę."
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Udostępnił: "
 
@@ -4195,25 +4522,26 @@ msgstr "Zapisz jako..."
 msgid "Save To:"
 msgstr "Zapisz w:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr "Cześć,"
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Otrzymujesz tę wiadomość ponieważ %(email)s udostępnił Ci plik w %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr "%(email)s udostępnił Ci plik w %(site_name)s:"
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Proszę odwiedzić poniższą stronę by wyświetlić plik:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Otrzymujesz tę wiadomość ponieważ %(email)s udostępnił i przesłał Ci łącze w %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr "%(email)s udostępnił Ci łącze przesyłania w %(site_name)s."
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Możesz odwiedzić następującą stronę, aby przesłać swoje pliki"
 
@@ -4225,8 +4553,8 @@ msgstr "Gwiazdki"
 msgid "icon"
 msgstr "ikona"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Usuń gwiazdkę"
 
@@ -4281,18 +4609,18 @@ msgstr "do"
 msgid "Sorry, this user is not registered yet."
 msgstr "Przepraszamy, ten użytkownik nie jest jeszcze zarejestrowany."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Gwiazdka"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "aktualizuj ten plik"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
@@ -4300,31 +4628,31 @@ msgstr[0] "jeden współpracownik"
 msgstr[1] " %(counter)s współpracowników"
 msgstr[2] " %(counter)s współpracowników"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Pomyślnie usunięto gwaizdkę"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Pomyślnie oznaczono gwiazdką"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "możesz także wcisnąć ←"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "poprzedni"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "możesz także wcisnąć →"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "następny"
 
@@ -4343,7 +4671,7 @@ msgid "auto detect"
 msgstr "wykryj automatycznie"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Pełny ekran"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "wczytywanie..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Możesz użyć IE 10 lub innej przeglądarki, np. Firefox, aby wyświetlić go online."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Aby wyświetlić go online, możesz użyć Firefoksa, Chrome lub IE 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Ten typ pliku nie może być wyświetlony online."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4390,41 +4718,55 @@ msgstr "Prześlij pliki do %(dir_name)s"
 msgid "shared by:"
 msgstr "udostępnił:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Zaloguj się"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(zapomniane hasło)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Nieczytelne? Odśwież."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Nieprawidłowy e-mail lub hasło"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Zapamiętaj mnie przez %(remember_days)s dni"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Zarejestruj"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Niepowodzenie odświeżania CAPTCHA, proszę później spróbować ponownie."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "Adre e-mail nie może być pusty"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Hasło nie może być puste"
 
@@ -4478,13 +4820,13 @@ msgstr "Pomyślnie zresetowano hasło."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Wprowadź nowe hasło"
+msgid "Reset Password"
+msgstr "Zresetuj hasło"
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4495,23 +4837,19 @@ msgid "Password Reset Successfully"
 msgstr "Pomyślnie zresetowano hasło"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Wysłaliśmy wiadomośc na Twoją skrzynkę e-mail."
+msgid "We've sent a password reset email to your mailbox."
+msgstr "Wysłaliśmy na Twoją skrzynkę e-mail resetujący hasło."
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Otrzymujesz tę wiadomość ponieważ poprosiłeś o zresetowanie swojego hasła w %(site_name)s."
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr "Aby zresetować hasło do Twojego konta %(account)s w %(site_name)s, proszę kliknąć następujące łącze:"
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Odwiedź poniższą stronę i ustaw swoje nowe hasło:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Dla przypomnienia, twoja nazwa użytkownika to:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr "Jeśli nie prosiłeś o niego, po prostu go zignoruj."
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4541,23 +4879,31 @@ msgstr "Rejestracja zakończona. Proszę czekać, aż administrator aktywuje kon
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Witamy ponownie, jesteś już zalogowany."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Potwierdź hasło"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr "Zarejestruj"
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Proszę wpisać hasło ponownie"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Hasła się nie zgadzają"
 
@@ -4577,12 +4923,6 @@ msgstr " jest za duży. Maksymalny dozwolony rozmiar to 1MB."
 msgid "Discuss"
 msgstr "Dyskutuj"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Grupa"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Prosze wybrać przynajmniej 1 grupę."
@@ -4591,10 +4931,6 @@ msgstr "Prosze wybrać przynajmniej 1 grupę."
 msgid "Please input a discussion."
 msgstr "Proszę podać dyskusję."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Wygenerowane przez system"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4613,42 +4949,66 @@ msgstr "Łącze przesyłania"
 msgid "Private Share"
 msgstr "Prywatny udział"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr "Użyj hasła"
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr "(min. 6 znaków)"
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Powtórz hasło"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr "Ustaw czas wygaśnięcia"
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr "Dni"
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Wygeneruj"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Odsyłacz: "
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Wyślij"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Wyślij do:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Adresy e-mail, oddzielone za pomocą ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Wysyłanie..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Możesz udostępnić utworzone łącze, aby umożliwić innym przesyłanie plików do tego katalogu."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Łącze przesyłania: "
 
@@ -4701,7 +5061,7 @@ msgid "Sub-libraries"
 msgstr "Biblioteki podrzędne"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Udostępnione"
 
@@ -4732,29 +5092,23 @@ msgid ""
 " library."
 msgstr "Możesz tworzyć biblioteki podrzędne wewnątrz katalogów w bibliotekach. Biblioteka podrzędna może być niezależnie udostępniana i synchronizowana. Pliki w takiej bibliotece będą automatycznie zsynchronizowane z tymi w oryginalnej bibliotece."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Żadna biblioteka nie została Ci udostępniona"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Żadna biblioteka nie została udostępniona Twoim grupom"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Plik jest przetwarzany, proszę czekać..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "ukryj zarys"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "pokaż zarys"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Niepowodzenie konwersji dokumentu"
 
@@ -4771,27 +5125,29 @@ msgstr "Zaszyfruj"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(minimum %(repo_password_min_length)s znaków)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Powtórz hasło"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Nazwa jest wymagana"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Opis jest wymagany"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Proszę podać hasło"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Hasło jest za krótkie"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Hasło jest za długie (maksimum 35 znaków)"
 
@@ -4804,7 +5160,7 @@ msgstr "Usunięto pomyślnie."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Czy na pewno chcesz usunąć %(lib_name)s ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Prześlij"
 
@@ -4931,15 +5287,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Proszę wybrać przynajmniej jeden typ pliku lub podać przynajmniej jedno rozszerzenie"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Wybierz kontakty"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Proszę podać przynajmniej jeden adres e-mail."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr "Proszę podać dni"
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr "Podaj prawidłową liczbę dni"
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4952,7 +5316,7 @@ msgstr "Własne"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Udostępnianie"
 
@@ -4964,6 +5328,22 @@ msgstr "Ruch w tym miesiącu:"
 msgid "Payment"
 msgstr "Płatności"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Użytkownicy"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Powiadomienia"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr "Ruch"
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr "Logi"
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Przekaż bibliotekę"
@@ -4974,74 +5354,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Przenieś %(lib_name)s do:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Właściciel"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Wszystkie grupy"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Twórca"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Utworzono"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Usuń grupę"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr "Przeszukaj użytkowników..."
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Baza danych"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Szukaj"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Utworzono / Ostatnie logowanie"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Wykorzystana przestrzeń"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr "Przeszukaj biblioteki wg nazwy..."
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Wszystkie"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Porzucone"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "System"
 
@@ -5057,96 +5437,117 @@ msgstr "Przedrostek URL"
 msgid "Delete Organization"
 msgstr "Usuń organizację"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Wszystkie publiczne łącza"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Ilość"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Porada: możesz wyszukiwać według klucza w nazwie, właścicielu lub obu polach."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Wynik"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Brak rezultatu"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr "Ruch użytkownika"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr "Miesiąc"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr "Użytkownik"
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr "Całkowite użycie"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr "Dodaj admina"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr "Dodaj adminów"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr "Porada: adresy e-mail powinny należeć do już dodanych użytkowników"
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Aktywacja..., proszę czekać"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Hasła nie pasują"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr "Twoje konto %(username)s w %(site_name)s zostało aktywowane."
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Otrzymujesz tę wiadomość ponieważ %(user)s dodał Cię do organizacji \"%(org.org_name)s\" w %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr "%(user)s zaprosił Cię do organizacji \"%(org_name)s\" w %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Otrzymujesz tę wiadomość ponieważ %(user)s dodał Cię do %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr "%(user)s zaprosił Cię do %(site_name)s."
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
 msgstr "Oto informacje o Twoim koncie:"
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "E-mail: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
+msgid "Password: %(password)s"
 msgstr "Hasło: %(password)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Proszę się zalogować na poniższej stronie:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Otrzymujesz tę wiadomość ponieważ członek załogi zresetował Twoje hasło w %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr "Twoje hasło w %(site_name)s zostało zresetowane. Teraz jest ono następujące %(password)s. Prosimy je niezwłocznie zmienić. "
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Twoje nowe hasło to %(password)s, proszę je zmienić jak najszybciej. "
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Wyszukaj użytkownika"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Porada: Możesz użyć *, aby dopasować dowolną liczbę znaków."
 
@@ -5160,7 +5561,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Czy na pewno chcesz zresetować hasło %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Odwołaj admina"
 
@@ -5170,7 +5571,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Czy na pewno chcesz odwołać uprawnienia administracyjne użytkownika %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Ustaw admina"
 
@@ -5189,437 +5589,466 @@ msgid ""
 "configuration."
 msgstr "Edycja zakończona pomyślnie, ale nie udało się wysłać wiadomości e-mail. Proszę sprawdzić konfigurację."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Status"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Aktywny"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Resetuj hasło"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr "Wróć do listy użytkowników"
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Łącznie"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Wykorzystane"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Ogranicz przestrzeń"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Ogranicz przestrzeń użytkownika"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Porada: 0 oznacza limit domyślny"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "W posiadaniu"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Nie posiadasz osobistej Wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "osobista-wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Osobiste strony Wiki"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "błąd uprawnień"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Nie można wyświetlić strony odzyskiwania"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Biblioteka nie istnieje."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Nie masz uprawnień do wykonania tej akcji."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Niepowodzenie edycji informacji biblioteki"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Nie udało się zapisać ustawień na serwerze"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Ustawienia zapisane."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Nazwa użytkownika %s jest niepoprawna"
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Użytkownik %s nie został odnaleziony."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "Biblioteka %(repo_name)s została przekazana %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Pomyślnie zaktualizowano hasło biblioteki %(repo_name)s."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Nazwa pliku zawiera niedozwolone znaki"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Duplikat nazwy pliku"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "Rozmiar pliku przekracza limit"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "Przestrzeń właściciela jest wykorzystana, niepowodzenie przesyłania"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Wystąpił błąd podczas przekazywania pliku"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Nieprawidłowy URL"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Nie można wyświetlić modyfikacji biblioteki"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Nie można wyświetlić migawek biblioteki"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Nie masz uprawnień do odtworzenia biblioteki"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Proszę określić identyfikator historii"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Biblioteka nie istnieje"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "Wskazana historia nie istnieje"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Brak konfliktów podczas scalania."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Moja biblioteka"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Nie udało się wyłączyć udostępniania biblioteki, ponieważ ona nie istnieje."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Pomyślnie wyłączono udostępnienie \"%s\"."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Niepowodzenie wyłączania udostępnienia \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Niepowodzenie usuwania pliku"
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s został usunięty pomyślnie."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Błąd wewnętrzny. Niepowodzenie usuwania %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Nie można uzyskać dostępu do pliku"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Niepowodzenie pobierania biblioteki, nie można odnaleźć serwera"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Nieprawidłowe ustawienie serwera"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Pomyślnie przywrócono %(path)s do katalogu głównego."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Pomyślnie przywrócono %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Pomyślnie przywrócono %(path)s do katalogu głównego."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Błąd wewnętrzny"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Nie można pobrać katalogu \"%s\": rozmiar jest zbyt duży."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Nie można pobrać \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Pomyślnie włączono \"Osobistą Wiki\"."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Pomyślnie wyłączono \"Osobistą Wiki\"."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Nie masz praw dostępu do biblioteki."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Brak ścieżki"
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Grupa nie istnieje"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Biblioteka jest zaszyfrowana."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Błąd: brak identyfikatora głównej zmiany"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Brak parametru."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Ścieżka docelowa jest zbyt długa."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Pomyślnie przeniesiono %(name)s pokaż"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Pomyślnie skopiowano %(name)s pokaż"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Nie można przenieść katalogu %(src)s do jego podkatalogu %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Nie można skopiować katalogu %(src)s do jego podkatalogu %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Ścieżka docelowa jest zbyt długa dla %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Niepowodzenie pobierania listy bloków pliku"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Błędny identyfikator repozytorium"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "Biblioteka systemowa nie może zostać usunięta."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Błąd HTTP: niepowodzenie otwierania pliku online"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Błąd URL: niepowodzenie otwierania pliku online"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "Wybrane kodowanie jest nieprawidłowe."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Nieznane kodowanie pliku"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Rozmiar pliku przekracza %s, nie może być otwarty online."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Nie można wyświetlić pliku"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Niepoprawny format pliku"
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "Biblioteka nie istnieje."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "Biblioteka jest zaszyfrowana."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Nie można edytować pliku"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Plik nie istnieje."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Edycja online nie jest oferowana dla plików tego typu."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Niepowodzenie ograniczania przestrzeni: błąd wewnętrzny"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Pomyślnie usunięto %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Niepowodzenie usuwanie: użytkownik nie istnieje"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "Pomyślnie przyznano %s uprawnienia administracyjne"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Niepowodzenie przyznawania uprawnień administracyjnych: użytkownik nie istnieje"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Pomyślnie cofnięto uprawnienia administracyjne użytkownikowi %s"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Niepowodzenie cofania uprawnień administracyjnych: użytkownik nie istnieje"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Pomyślnie aktywowano \"%s\"."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Niepowodzenie aktywacji: użytkownik nie istnieje."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Pomyślnie dezaktywowano \"%s\"."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Niepowodzenie dezaktywacji: użytkownik nie istnieje."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr "Twoje konto w %s jest aktywowane"
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr "Hasło w %s zostało zresetowane"
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Pomyślnie zresetowano hasło na %(passwd)s, wiadomość e-mail została wysłana do %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Pomyślnie zresetowano hasło na %(passwd)s, ale nie udało się wysłać wiadomości do %(user)s, proszę sprawdzić konfigurację e-mail."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Pomyślnie zresetowano użytkownikowi %(user)s hasło na %(passwd)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5627,47 +6056,53 @@ msgid ""
 "configured."
 msgstr "Pomyślnie zresetowano użytkownikowi %(user)s hasło na %(passwd)s. Niestety powiadomienie e-mail nie zostało wysłane, ponieważ usługa e-mail nie została poprawnie skonfigurowana."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Niepowodzenie resetowania hasłą: użytkownik nie istnieje"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Informacje rejestracyjne Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr "Zostałeś zaproszony do %s"
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Pomyślnie dodano użytkownika %s. Powiadomienie e-mail zostało wysłane."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Pomyślnie dodano użytkownika %s. Niestety podczas wysyłania powiadomienie e-mail wystąpił błąd. Proszę sprawdzić konfigurację e-mail."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Pomyślnie dodano użytkownika %s."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "Pomyślnie dodano użytkownika %s. Niestety powiadomienie e-mail nie zostało wysłane ponieważ usługa e-mail nie została poprawnie skonfigurowana."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Pomyślnie przeniesiono."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Niepowodzenie przekazywania, użytkownik %s nie został odnaleziony"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Niepowodzenie przekazywania, nieprawidłowe parametry."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr "Nie udało się przyznać %s uprawnień administracyjnych"
diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index 0d1113be5e..fe1f9e770d 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-13 15:38+0000\n"
-"Last-Translator: paulocotta \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/seahub/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,175 +25,207 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Já existe um usuário cadastrado com este email"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "As senhas não coincidem."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Nome não pode ser vazio"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Nome é muito longo (o máximo é 255 caracteres)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Descrição não pode ser vazio"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Descrição é muito longa (o máximo é 100 caracteres)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Nome %s não é válido"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Argumento ausente"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Nome anterior é obrigatório"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Muito extenso."
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Obrigatório"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Nome %s não é válido"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "ID do repositório é obrigatório"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Nome de usuário é obrigatório"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "A senha não pode ser vazia"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Formato de URL inválido"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Senha incorreta"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr ""
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Falha ao descriptografar a biblioteca"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "O Email é obrigatório"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "A cota não pode ser vazio"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "A cota é muito baixa (o valor mínimo é 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Nome da biblioteca é obrigatório"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Descrição da biblioteca é obrigatório"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Por favor, informe um número"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Alemão"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "Inglês"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Espanhol"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Espanhol do México"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Francês"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebreu"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Húngaro"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Holandês"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Português Brasil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Russo"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "Chinês Simplificado"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "Chinês Tradicional"
 
@@ -202,8 +234,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Equipe de colaboração"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Discussão"
 
@@ -215,16 +248,17 @@ msgstr "Discussão"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -234,13 +268,13 @@ msgstr "Arquivo"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -249,9 +283,9 @@ msgstr "Ícone do diretório"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s respostas"
@@ -262,43 +296,48 @@ msgstr "Sem discussões."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Carregando..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Falha. Por favor verifique a rede."
 
@@ -347,6 +386,25 @@ msgstr "Por favor, verifique a conexão com a rede"
 msgid "New Replies"
 msgstr "Não responda"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Mensagens"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "As mensagens com %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Informações pessoais"
@@ -360,10 +418,11 @@ msgid "Important dates"
 msgstr "Datas importantes"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Grupos"
 
@@ -376,72 +435,74 @@ msgstr "Senha alterada com sucesso"
 msgid "Change password: %s"
 msgstr "Senha alterada: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Senha"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Por favor, informe um nome de usuário e senha corretamente. Note que ambos os campos são case-sensitive."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Esta conta está inativa."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Seu navegador aparentemente não possui cookies habilitados. Cookies são requeridos para fazer login."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Falha ao enviar e-mail, o serviço de e-mail não está configurado corretamente. Por favor, contate o administrador."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Este endereço de e-mail não está associado a uma conta de usuário. Certifique-se que ele esteja registrado?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Senha redefinida em %s"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nova senha"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Nova senha confirmada"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Senha anterior"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Sua antiga senha foi informada incorretamente. Por favor, tente novamente."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Informe a senha novamente"
 
@@ -479,7 +540,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Você já tem %(nb_avatars)d avatars, e o máximo permitido é %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar para %s"
@@ -547,57 +608,62 @@ msgstr "Avatar atual:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Enviar"
@@ -614,7 +680,7 @@ msgstr "%(avatar_creator)s avatar foi atualizado %(avatar)s."
 msgstr "Seu avatar foi atualizado %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Avatar padrão"
 
@@ -646,7 +712,7 @@ msgstr "telefone"
 msgid "note"
 msgstr "nota"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Os arquivos desta biblioteca não podem ser visualizados online."
 
@@ -703,7 +769,7 @@ msgstr "Arquivo revertido \"%(file)s\" para o status de %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Diretório apagado recuperado"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "O nome da biblioteca mudou ou sua descrição"
 
@@ -713,9 +779,9 @@ msgstr "Auto merge pelo sistema seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Agora"
 
@@ -751,42 +817,48 @@ msgstr[1] "%(seconds)d segundos atrás"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Leitura-Escrita"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Somente leitura"
 
@@ -795,33 +867,33 @@ msgstr "Somente leitura"
 msgid "Email is required."
 msgstr "E-mail é obrigatório."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s não é um email válido."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s já está nos seus contatos."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "O contato %s foi adicionado com sucesso."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Falha ao adicionar %s à lista de contatos."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "%s foi editado com sucesso."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "%s foi excluído com sucesso."
@@ -846,10 +918,10 @@ msgstr "E-mail"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -857,45 +929,46 @@ msgstr "E-mail"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Nome"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Nota"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -904,56 +977,64 @@ msgstr "Nota"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Operações"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Editar"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Excluir"
 
@@ -969,17 +1050,19 @@ msgstr "Ao adicionar contatos, você facilmente poderá compartilhar e enviar ar
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "E-mail"
 
@@ -1004,8 +1087,8 @@ msgid "Delete Contact"
 msgstr "Excluir Contato"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1081,400 +1164,415 @@ msgstr "Mensagem de verificação é muito extensa (máximo 255 caracteres)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" não é um nome válido"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Você não pode criar %d grupos. Atualize a conta."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Já existe um grupo com esse nome."
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Grupo renomeado com sucesso para \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Falha ao renomear o grupo, Nome de Grupo só pode conter letras, número ou underline"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr ""
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Apenas administradores podem tornar o grupo público"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "A mensagem não existe"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Você não tem permissão"
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Você pode apenas convidar %d membros. Atualize a conta."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Um amigo adiciou você a um grupo no Seafile"
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Falha ao adicionar, %s não está registrado."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Adicionado com sucesso. Um e-mail foi enviado"
 msgstr[1] "Adicionado com sucesso. %(count)s e-mails foram enviados."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Adicionado com sucesso."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr ""
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Falha ao adicionar, %s não está registrado."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Operação bem sucedida."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Falha: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Falhou o retirar o compartilhamento: o grupo não existe."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Operação falhou: apenas admistradores e o dono da biblioteca podem remover o compartilhamento."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Falha ao remover o compartilhamento. Erro interno."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Erro: ID do grupo está errado"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Erro: o grupo não existe"
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Postado com sucesso para os %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Erro: Você não está no grupo %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Erro: a biblioteca não existe."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Erro: caminho inexistente."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "falha ao criar: o grupo não existe."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Falha ao criar: você não é do grupo."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Falha ao criar"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Falha ao criar: erro interno."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Você já está no grupo."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Enviado com sucesso, o administrador do grupo irá providenciar."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"Wiki\" habilitada com sucesso."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"Wiki\" desabilitada com sucesso."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Falha ao criar página wiki. Favor tente novamente."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Wiki não existe"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Falha ao criar página home. Favor tentar novamente"
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr ""
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki não encontrada."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Página \"%s\" já existe."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s convida você para participar do grupo %(group.group_name)s. Por favor vá para a página e increva-se: "
+msgid "Successfully deleted \"%s\"."
+msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Obrigado por usar nosso site!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "A equipe %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Ocultar respostas"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Responder"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Adicionar uma resposta..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Não pode ficar em branco ou deve ter mais de 2048 caracteres. "
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Esse grupo é público."
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Habilitar módulos"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Sair"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Esse grupo é público."
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Arquivos"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Membros"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Administrador"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Sair do grupo"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Tem certeza que você deseja sair desse grupo?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Adicionar uma discussão..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Adicionar arquivos"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Depois de logar, você poderá postar discussões e adicionar respostas."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Anterior"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Próximo"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Topo"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Você realmente deseja excluir essa discussão?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Sim"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Não"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Excluído com sucesso"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Falha ao apagar:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Falhou."
 
@@ -1483,6 +1581,7 @@ msgid "Recent Changes"
 msgstr "Alterações recentes."
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1491,77 +1590,58 @@ msgstr "Nova biblioteca"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Descrição"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Última atualização"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Compartilhado por"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "ícone do diretório"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Download e sincronizar"
 
@@ -1577,7 +1657,7 @@ msgstr "Download e sincronizar"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Descompartilhar"
 
@@ -1614,15 +1694,16 @@ msgid "Modified at"
 msgstr "Modificado em"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Modificado"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1631,23 +1712,23 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Nenhum"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1666,15 +1747,43 @@ msgstr "Senha:"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "A senha será mantida no servidor por apenas 1 hora."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Descompartilhar biblioteca"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Tem certeza que deseja remover o compartilhamento de %s ?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "ícone do diretório"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Sem biblioteca pública neste grupo"
@@ -1691,14 +1800,25 @@ msgid ""
 "message: "
 msgstr "%(user)s deseja participar do Grupo \"%(group_name)s\", esta é uma mensagem de verificação: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Obrigado por usar nosso site!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "A equipe %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Administradores"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Configuração"
 
@@ -1706,7 +1826,7 @@ msgstr "Configuração"
 msgid "Add Members"
 msgstr "Adicionar membros"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Incluir Administradores"
 
@@ -1715,7 +1835,7 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Alterar"
 
@@ -1734,7 +1854,7 @@ msgid "Make Public"
 msgstr "Tornar Público"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Transferir"
 
@@ -1758,29 +1878,41 @@ msgstr "Dica: o e-mail já deve estar registrado."
 msgid "Rename Group To"
 msgstr "Renomear Grupo para"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Descartar grupo"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Deseja realmente sair desse grupo?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Excluir membro"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Realmente deseja excluir %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Sair"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Adicionar aos Contatos"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Sair do grupo"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Tem certeza que você deseja sair desse grupo?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Participar do grupo"
@@ -1807,12 +1939,29 @@ msgstr "Membros:"
 msgid "Verification Message"
 msgstr "Mensagem de verificação"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Criar"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Esse grupo atual não tem wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1820,82 +1969,105 @@ msgid ""
 "back to the server."
 msgstr "A wiki Seafile habilita você a organizar seu conhecimento de forma fácil. O conteúdo da wiki é guardado em um biblioteca normal com uma estrutura de arquivo/pasta pré-definida. Isso lhe permitirá editar sua wiki no seu desktop para então sincronizar com o servidor."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Criar Wiki agora"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Criar Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Páginas Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Por favor, clique e escolha uma biblioteca."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Home"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Páginas"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Histórico Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Nova página"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Apagar página"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Editar página"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Histórico da página"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Modificado pela última vez por %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "O nome é obrigatório."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "A descrição é obrigatória."
 
@@ -1942,10 +2114,12 @@ msgstr "Adicionar membros"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Entrar"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "e-mails, separados por \",\""
 
@@ -1961,7 +2135,8 @@ msgstr "Dica: os e-mails já devem estar registrados."
 msgid "Add administrators"
 msgstr "Adicionar administradores"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Por favor informe e-mails, ou selecione algum."
 
@@ -2240,135 +2415,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr ""
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "Mensagem é obrigatória"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "Contato é obrigatório"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Você não pode enviar uma mensagem pra si."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Falha ao enviar mensagem para %s, usuário não encontrado."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Mensagens"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Mensagem"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Hora"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "mensagem..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Adicionar arquivos"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "Envie para: click para selecionar contatos"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "Favor adicionar contatos primeiro"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Falha ao obter contatos para enviar uma mensagem."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Você não tem nenhuma biblioteca no momento"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "As mensagens com %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Envie uma mensagem..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr ""
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr ""
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
+msgid "You have received a new message from %(user)s."
 msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr ""
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr ""
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr ""
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group ."
 msgstr "Compartilhado com todos os membros com sucesso, confira em Compartilhamentos."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" já está no grupo %(group)s. Visualize"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Falha ao compartilhar %(repo)s para %(group)s, Favor tente mais tarde."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Compartilhado com %(group)s com sucesso，confira em Compartilhamentos."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Você não pode compartilhar uma biblioteca com você mesmo."
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Falha ao compartilhar com %s, favor tente mais tarde."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Compartilhado com %(email)s com sucesso，confira em Compartilhamentos."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Falha ao compartilhar para %s, tem um e-mail que não está registrado."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Apenas o dono tem permissão para compartilhar."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Falha ao compartilhar \"%s\", sem cota. Atualize sua conta."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr ""
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Falha ao remover compartilhamento"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "ID do grupo inválido"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Compartilhamento removido com sucesso"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "Todos os membros"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Argumento inválido"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Você não pode compartilhar a biblioteca dessa forma."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Falha ao obter o link, favor tente mais tarde."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Removido com sucesso"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "O link não existe"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Falha ao enviar o link compartilhado. O serviço de e-mail não está configurado adequadamente, favor entre em contato com o administrador."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Um amigocompartilhou um arquivo com você no Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Erro interno do servidor. O envio falhou."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Enviado com sucesso."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Por favor, escolha um diretório."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Salvo com sucesso."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Falhou ao compartilhar com \"%s\", usuário não encontrado."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Compartilhado com sucesso %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Compartilhamento removido com sucesso %s."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "Você não tem permissão de remover compartilhamento %s."
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Você não tem permissão para salvar %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Falha ao obter o link, favor tente mais tarde."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr ""
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
 msgstr ""
 
 #: seahub/share/templates/share/links.html:5
@@ -2826,14 +3010,15 @@ msgstr "Visitas"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Ver"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Remover"
 
@@ -2862,7 +3047,7 @@ msgid "Folders - Share"
 msgstr "Pastas - Compartilhadas"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Pastas"
 
@@ -2887,13 +3072,13 @@ msgid ""
 msgstr ""
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Editado com sucesso"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Edição falhou."
@@ -2960,7 +3145,7 @@ msgstr "Compartilhados"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Informação básica"
 
@@ -2973,7 +3158,8 @@ msgid "Add to contacts"
 msgstr "Adicionar aos contatos"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Permitir compartilhamento"
 
@@ -2994,56 +3180,24 @@ msgstr "Atividades"
 msgid "Exit System Admin"
 msgstr ""
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Usuários"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Notificações"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Links"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Administrador do sistema"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr ""
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Entrar"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Registre-se"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Sair"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Versão do Servidor:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Administrador do sistema"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Entre em contato"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Todos os grupos"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Clientes"
 
@@ -3051,7 +3205,7 @@ msgstr "Clientes"
 msgid "Client Name"
 msgstr "Nome do Cliente"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3092,28 +3246,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Essa biblioteca está criptografa. Favor, informe a senha se quiser navegar online. A senha será mantida no servidor por ao menos 1 hora."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Senha:"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr ""
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Por favor informe a senha."
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3123,8 +3329,7 @@ msgstr "Download"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Caminho atual:"
 
@@ -3439,9 +3644,9 @@ msgid "Password is required."
 msgstr "A senha é obrigatoria"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Histórico"
@@ -3460,16 +3665,11 @@ msgstr "Dica: uma nova versão será gerada depois de cada modificação, e voc
 msgid "Current Path:"
 msgstr "Caminho atual:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Última modificação"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Tamanho"
 
@@ -3477,38 +3677,55 @@ msgstr "Tamanho"
 msgid "(current version)"
 msgstr "(versão atual)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Restaurar"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Diferença"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Documentos"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introdução"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Ajuda"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Cliente"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile para Windows, Mac e Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Versão do Servidor:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Entre em contato"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3537,12 +3754,13 @@ msgstr "'s lixeira"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Voltar para a biblioteca"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3557,36 +3775,57 @@ msgstr "Pessoal"
 msgid "Starred"
 msgstr "Marcado"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Wiki Pessoal"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr ""
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Links"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupo"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr ""
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Não existe bibliotecas compartilhadas com você"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr ""
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr ""
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Fechar"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "My Home"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organização"
@@ -3597,11 +3836,11 @@ msgid ""
 "current account."
 msgstr "A organização será excluída na nova versão, os dados serão deslocados para sua conta atual."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3623,420 +3862,452 @@ msgstr "Nehum grupo foi criado ainda"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Você pode clicar no botão \"Novo Grupo\" abaixo de \"Grupo\" para criar um grupo. "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Compartilhamento de"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Nenhuma biblioteca pública"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Você pode criar uma biblioteca pública clicando no botão \"Nova Biblioteca\", outros podem Visualizar e baixar essa biblioteca."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Lixeira"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Tamanho:"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Lixeira"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Mover"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Copiar"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Enviar arquivos"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr ""
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Favor, selecionar um arquivo primeiro."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Adicione arquivos"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Iniciar Todos"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Cancelar Todos"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Copiar e Colar é  suportado pelo Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr ""
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Atualize %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Escolha um arquivo"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Menor que %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Novo diretório"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Nome do diretório"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Novo arquivo"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Funcionalidades do tipo de arquivo"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Click para selecionar"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Formato Rich Text online."
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "Formato simples"
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Nome do arquivo"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Biblioteca atual"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Outras bibliotecas"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Favor, click e selecione um diretório."
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Renomei %(name)s como:"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Sincronizar %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr ""
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Criar"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Essa biblioteca está criptografa. Favor, digitar a senha se você quiser navegar online. Esta senha será mantida no navegador por no mínimo 1 hora."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "O arquivo é muito grande"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "O arquivo é muito pequeno"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Tipo de arquivo não suportado"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Número máximo de arquivos excedeu"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Bytes enviados excedem o tamanho do arquivo"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Resultou em um arquivo vazio"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Erro"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Iniciar"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Itens excluídos"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Você tem certeza que deseja excluir os itens selecionados?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Processando…"
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr " %(name)s excluído com sucesso e outros %(amount)s itens."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Excluído com sucesso %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Erro interno. Falha ao apagar %(name)s e %(amount)s outros itens."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Erro interno. Falha ao excluir %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Mover os diretórios/arquivos selecionados para:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Copiar diretórios/pastas selecionados para:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "O caminho destino é inválido"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s movido com sucesso e outros %(amount)s itens."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s movido com sucesso."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s copiado com sucesso e outros %(amount)s itens."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s copiado com sucesso."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Erro interno. Falhou ao mover %(name)s e outros %(amount)s itens."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Erro interno. Falhou ao mover %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Erro interno. Falhou ao copiar %(name)s e outros %(amount)s itens."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Erro interno. Falhou ao copiar %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Criptografando o arquivo..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr ""
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Criptografando, %(num)s% completo."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Enviado..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Feito!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Baixando..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Baixando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Decriptografando..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Decriptografando, %(num)s% completo."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "%(name)s excluído com sucesso."
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Renomear o arquivo"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Renomear o diretório"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Copiar arquivo"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Mover arquivo"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Copiar diretório"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Mover diretório"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Copiar %(name)s para:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Mover %(name)s para:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Diretório baixado não suportado nessa biblioteca."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "desmarcar"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "marcado"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr ""
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "É obrigatório."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Apenas uma extensão, favor digite o nome."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Criando..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Você não o renomeou."
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s foi renomeado com sucesso para %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr ""
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Favor digite e-mail ou grupos, ou selecione algum."
 
@@ -4058,11 +4329,12 @@ msgstr "Dica: Uma instantânea será gerada depois da modificação, na qual gra
 msgid "View Snapshot"
 msgstr "Ver instântanea"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Visualizar:"
@@ -4103,34 +4375,78 @@ msgstr "todos"
 msgid "Delete Time"
 msgstr "Excluir hora"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Configurações da biblioteca"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Manter histórico completo"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Não manter histórico"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Mantenha apenas o período do histórico:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "dias"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Transferir propriedade"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Transferir essa biblioteca para outro usuário:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Voltar os histórico das modificações"
@@ -4139,6 +4455,10 @@ msgstr "Voltar os histórico das modificações"
 msgid "Create Time"
 msgstr "Criar hora"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Última modificação"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4181,8 +4501,14 @@ msgstr "Seu cliente Seafile está desatualizado, favor atualize para última ver
 msgid "Click to download."
 msgstr "Click para baixar."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Compartilhado por:"
 
@@ -4194,25 +4520,26 @@ msgstr "Salvar como..."
 msgid "Save To:"
 msgstr "Salvar como:"
 
-#: seahub/templates/shared_link_email.html:2
-#, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Você está recebendo esse e-mail porque %(email)s está compartilhando um arquivo com você en %(site_name)s."
-
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Favor, vá para página seguinte e veja o arquivo:"
-
-#: seahub/templates/shared_upload_link_email.html:2
-#, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
 msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_link_email.html:12
+#, python-format
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
+
+#: seahub/templates/shared_upload_link_email.html:11
+#, python-format
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
+
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr ""
 
@@ -4224,8 +4551,8 @@ msgstr "Favoritos"
 msgid "icon"
 msgstr "ícone"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Desmarcar"
 
@@ -4280,49 +4607,49 @@ msgstr "para"
 msgid "Sorry, this user is not registered yet."
 msgstr "Desculpe, esse usuário não está registrado ainda."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Marcar"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "Atualizar este arquivo"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "Único colaborador"
 msgstr[1] " %(counter)s colaboradores"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Desmarcado com sucesso"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Marcado com sucesso"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "você pode também pressionar ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "anterior"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "você também pode pressionar → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "próximo"
 
@@ -4341,7 +4668,7 @@ msgid "auto detect"
 msgstr "auto detectar"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Tela cheia"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "carregando..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "você pode usar o IE 10 ou outro navegador, por exemplo, para visualizar online"
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Para visualizar online, Instale o firefox, Chrome ou o IE 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Este tipo de arquivo não pode ser visualizado online"
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4388,41 +4715,55 @@ msgstr ""
 msgid "shared by:"
 msgstr ""
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Entrar"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr ""
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr ""
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "E-mail ou senha incorreta"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr ""
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Registre-se"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr ""
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "E-mail não ficar em branco"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Senha não pode ficar em branco"
 
@@ -4476,13 +4817,13 @@ msgstr "Senha alterada com sucesso."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Senha resetada"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Informe a nova senha"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4493,23 +4834,19 @@ msgid "Password Reset Successfully"
 msgstr "Senha resetada com sucesso"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Enviamos a senha recuperada para o seu e-mail."
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Você está recebendo esta mensagem porque você solicitou a recuperação da senha para a sua conta de usuário no site %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Favor, visite a siguinte página e selecione uma nova senha"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Seu nome de usuário, para o caso de ter esquecido:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4539,23 +4876,31 @@ msgstr "Registro completo, favor aguarde que o administrador irá ativar sua con
 msgid "Register"
 msgstr "Registrar"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Bemvindo de volta. você já está autenticado no sistema."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Confirme a senha"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Por favor, informe a senha novamente"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "As senhas não coincidem"
 
@@ -4575,12 +4920,6 @@ msgstr "Muito extenso. O tamanho máximo permitido é de 1MB."
 msgid "Discuss"
 msgstr "Discussão"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Grupo"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Favor, selecione um grupo no mínimo."
@@ -4589,10 +4928,6 @@ msgstr "Favor, selecione um grupo no mínimo."
 msgid "Please input a discussion."
 msgstr "Favor, digite uma discussão."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Gerado pelo sistema"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4611,42 +4946,66 @@ msgstr "Enviar Link"
 msgid "Private Share"
 msgstr "Compartilhamento privado"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Informe a senha novamente"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Gerar"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Link:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Enviar"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Enviar para:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "E-mails, separados por ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Enviando…"
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr ""
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr ""
 
@@ -4699,7 +5058,7 @@ msgid "Sub-libraries"
 msgstr ""
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Compartilhado"
 
@@ -4730,29 +5089,23 @@ msgid ""
 " library."
 msgstr ""
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Não existe bibliotecas compartilhadas com você"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr ""
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "O arquivo está sendo processado, favor aguardar..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "Esconder esboço"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "Mostrar esboço"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "A conversão falhou"
 
@@ -4769,27 +5122,29 @@ msgstr "Criptografar"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr ""
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Informe a senha novamente"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Nome é obrigatório"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Descrição é obrigatória"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Por favor, informe a senha"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr ""
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr ""
 
@@ -4802,7 +5157,7 @@ msgstr ""
 msgid "Really want to delete %(lib_name)s ?"
 msgstr ""
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Enviar arquivo"
 
@@ -4929,15 +5284,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr ""
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Selecione contatos"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Favor, informe ao menos um e-mail."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4950,7 +5313,7 @@ msgstr "Eu"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Compartilhando"
 
@@ -4962,6 +5325,22 @@ msgstr "Tráfego desse mês:"
 msgid "Payment"
 msgstr "Pagamento"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Usuários"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Notificações"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Transferir biblioteca"
@@ -4972,74 +5351,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr ""
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Proprietário"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Todos os grupos"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Criador"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Criado em"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Excluir grupo"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Base de Dados"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Pesquisar"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr ""
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Espaço utilizado"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Todos"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Órfão"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Sistema"
 
@@ -5055,96 +5434,117 @@ msgstr "Prefixo URL"
 msgid "Delete Organization"
 msgstr "Excluir organização"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Todos links públicos"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Contar"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Pesquisar biblioteca"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Dica: você pode pesquisar a palavra chave pelo nome, dono ou ambos."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Resultado"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Sem resultado"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Adicionar novo usuário"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Ativando ... Por favor, aguarde"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Senhas não conscidem"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Você está recebendo este arquivo porque %(user)s adicionou você à organização: \"%(org.org_name)s\" na página: %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Você está recebendo este e-mail porque %(user)s o adicionou à %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "A seguinte é a informação da conta:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "E-mail: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Senha: %(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Favor, visite  a seguinte página e inicie a sessão:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Você está recebendo este e-mail, pois um membro da equipe com autorização redefiniu sua senha da página %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Sua nova senha é %(password)s, favor modificar sua senha tão rápido quanto possível."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Pesquisar usuários"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Dica: Use * para informar qualquer número de caracteres."
 
@@ -5158,7 +5558,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Deseja realmente reiniciar a senha de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Administrador revogado"
 
@@ -5168,7 +5568,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Deseja realmente revogar a permissão de administrador de %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Administrador definido"
 
@@ -5187,437 +5586,466 @@ msgid ""
 "configuration."
 msgstr "Editado com sucesso, mas falhou ao enviar o e-mail, favor verificar sua configuração de e-mail."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Estado"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Ativo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Inativo"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Restaurar senha"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Usado"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "definir cota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Especificar limite de armazenamento do usuario"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Dica: 0 significa limite padrão"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Propriedade de"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Você não tem uma wiki pessoal"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "wiki-pessoal"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Páginas da Wiki pessoal"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "Erro de permissão"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Incapaz de ver a página de reciclagem"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Biblioteca não existe."
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Você não tem permissão para executar essa ação."
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Falha ao editar a informação da biblioteca."
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Falhou ao salvar as configurações no servidor"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Configurações salvas."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr ""
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Usário %s não foi encontrado."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "A biblioteca %(repo_name)s foi transferida para %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr ""
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "O nome do arquivo contém carcter inválido"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Nome de arquivo duplicado"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "O tamanho do arquivo ultrapassa o limite"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "O espaço do proprietário é insuficiente. Falha no envio"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Um erro ocorreu durante a transferencia do arquivo"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "URL inválida"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Incapaz de verlas modificações da biblioteca"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Incapaz de ver a biblioteca instantânea"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Você não tem permissão de restaurar a biblioteca"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Favor, especifique o ID da história"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Biblioteca não existe"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "O histórico que você especificou não existe"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Não há conflito na mesclagem."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Minha Biblioteca"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Falha ao remover o compartilhamento da biblioteca, uma vez que não existe."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Remoção do compartilhamento de \"%s\" realizado com sucesso."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Falha ao remover o compartilhamento \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Falha ao excluir o arquivo"
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s excluído com sucesso"
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Erro interno. Falhou ao excluir %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Incapaz de acessar o arquivo"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Falha ao baixar a biblioteca, servidor não encontrado"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Configuração do servidor inválida."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "%(path)s revertido com siucesso para  diretório raíz."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Revertido com sucesso %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Revertido com sucesso %(path)s para  diretório raíz."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Download do diretório \"%s\" foi desabilitado: o tamanho é muito grande."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Incapaz de baixar \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "\"Wiki Pessoal\" habilitado com sucesso."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "\"Wiki Pessoal\" desabilitado com sucesso."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Você não possui permissão para acessar esse biblioteca."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Sem caminho."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "O grupo não existe"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Permissão negada."
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "A biblioteca está criptografada."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Erro: ID do cabeçalho não commitado"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Argumento ausente."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "O caminho destino é muito extenso"
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Movido com sucesso %(name)s ver"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Copiado com sucesso %(name)s ver"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Não é possível mover o diretório %(src)s para o subdiretório %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Não é possível copiar o diretório %(src)s para o subdiretório %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "O caminho destino é muito longo para %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Falha ao obter a lista de bloqueio do arquivo"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr ""
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "Erro HTTP: Falha ao abrir arquivo online"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "Erro URL: Falha ao abrir arquivo online"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "A codificação escolhida não é adequada."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Codificação de arquivo desconhecida"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "O tamanho do arquivo supera %s, não pode ser aberto online."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Incapaz de visualizar o arquivo"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Formato de arquivo inválido"
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "A biblioteca não existe."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "A biblioteca está encriptada."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Incapaz de editar o arquivo"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "O arquivo não existe."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Edição online não oferecido para esse tipo de arquivo."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Definição de cota falhou: erro interno"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "%s excluído com sucesso"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Falha ao excluir: o usuário não existe"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s foi definido como administrador com sucesso"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Falha ao definir como administrador: o usuário não existe"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "A permissão de administrador do usuário %s foi revogada com sucesso"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Falha ao revogar a permissão de administrador: o usuário não existe"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "\"%s\" ativado com sucesso."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Falha ao ativar: usuário não existe."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "\"%s\" desativado com sucesso."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Falha ao desativar: o usuário não existe."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Reiniciada com sucesso a senha para %(passwd)s, um e-mail foi enviado para %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Reiniciada com sucesso a senha para %(passwd)s, mas falhou ao enviar um e-mail %(user)s, favor verifique sua configuração de e-mail."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Reiniciada com sucesso a senha para %(passwd)s para o usuário %(user)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5625,47 +6053,53 @@ msgid ""
 "configured."
 msgstr "Reiniciada com sucesso a senha para %(passwd)s, para usuário %(user)s, mas uma notificação de e-mail não pode ser enviada porque o serviço de e-mail não esta configurado corretamente."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Redefinição da senha falhou: usuário não existe."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Informação de registro de Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "O usuário %s foi adicionado com sucesso. Um e-mail de notificação foi enviado."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "O usuário %s foi adicionado com sucesso. Um erro ocorreu ao enviar um e-mail de notificação, favor verifique sua configuração de e-mail."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Usuário %s adicionado com sucesso."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "O usuário %s foi adicionado com sucesso mas uma notificação de e-mail não pode ser enviada, porque \" \"o serviço de e-mail não está configurado propriamente."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Transferido com sucesso."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Falha ao transferir, usuário %s não encontrado"
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Falha ao transferir, argumentos inválidos"
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
index 1d240aac22..50877807fb 100644
--- a/locale/ru/LC_MESSAGES/django.po
+++ b/locale/ru/LC_MESSAGES/django.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-13 16:47+0000\n"
-"Last-Translator: laskavtsev \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/seahub/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,175 +25,207 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Пользователь с таким email уже существует"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Пароли не совпадают."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Поле с именем не может быть пустым"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Слишком длинное имя (максимум 255 символов) "
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Поле с описанием не может быть пустым"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Слишком длинное описание (максимум 100 символов)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Имя %s недействительно"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Пропущен аргумент"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Требуется старое имя"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Слишком длинное"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Требуется Email."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Имя %s недействительно"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "Требуется Repo ID"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Требуется имя пользователя"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "Пароль не может быть пустым"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Неверный формат URL"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Неверный пароль"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Внутренняя ошибка сервера"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Ошибка расшифровки библиотеки"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Требуется Email"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Значение квоты не может быть пустым"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Квота слишком мала (минимальное значение 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Требуется название библиотеки"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Требуется описание библиотеки"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Пожалуйста, введите число"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Українська"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -202,8 +234,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Совместный файл сообщества"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Обсуждение"
 
@@ -215,16 +248,17 @@ msgstr "Обсуждение"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -234,13 +268,13 @@ msgstr "Файл"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -249,9 +283,9 @@ msgstr "Значок каталога"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s ответов"
@@ -262,43 +296,48 @@ msgstr "Нет обсуждений."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Не удалось. Пожалуйста, проверьте сеть."
 
@@ -347,6 +386,25 @@ msgstr "Не удалось. Пожалуйста, проверьте сеть."
 msgid "New Replies"
 msgstr "Новые ответы"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Сообщения"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Сообщения от %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Личная информация"
@@ -360,10 +418,11 @@ msgid "Important dates"
 msgstr "Ключевые даты"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Группы"
 
@@ -376,72 +435,74 @@ msgstr "Пароль успешно изменен"
 msgid "Change password: %s"
 msgstr "Изменить пароль: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Пароль"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Пожалуйста, введите правильное имя пользователя и пароль. Обратите внимание, что оба поля чувствительны к регистру."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Эта учетная запись является неактивной."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "В вашем веб-браузере не активированы cookies, необходимые для входа."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Не удалось отправить email - сервис не настроен. Пожалуйста, свяжитесь с администратором."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Этот адрес электронной почты не зарегистрирован. Вы точно зарегистрировались?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Пароль изменен на %s"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Новый пароль"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Подтверждение нового пароля"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваш старый пароль был введен неправильно. Пожалуйста, введите его снова."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Пароль (еще раз)"
 
@@ -479,7 +540,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "У вас уже есть %(nb_avatars)d аватар, максимально разрешено %(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Аватар для %s"
@@ -547,57 +608,62 @@ msgstr "Текущий аватар: "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Готово"
@@ -614,7 +680,7 @@ msgstr "%(avatar_creator)s обновил свой
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Вы обновили свой аватар %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Аватар по умолчанию"
 
@@ -646,7 +712,7 @@ msgstr "телефон"
 msgid "note"
 msgstr "описание"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Файлы в данной библиотеке не могут быть просмотренны он-лайн"
 
@@ -703,7 +769,7 @@ msgstr "Статус файла восстановлен \"%(file)s\" в %(time)
 msgid "Recovered deleted directory"
 msgstr "Восстановленно удаленных файлов"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Изменено название или описание библиотеки"
 
@@ -713,9 +779,9 @@ msgstr "Автоматическое слияние системой seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Прямо сейчас"
 
@@ -755,42 +821,48 @@ msgstr[2] "%(seconds)d секунд назад"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Чтение-запись"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Только чтение"
 
@@ -799,33 +871,33 @@ msgstr "Только чтение"
 msgid "Email is required."
 msgstr "Требуется Email."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "\"%s\" не допустимый email."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s уже есть в ваших контактах."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Успешно добавлен %s в список контактов."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Не удалось добавить %s в список контактов."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Успешно изменено %s."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Успешно удалено %s"
@@ -850,10 +922,10 @@ msgstr "E-mail"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -861,45 +933,46 @@ msgstr "E-mail"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Имя"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Примечание"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -908,56 +981,64 @@ msgstr "Примечание"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Операции"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Редактировать"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Удалить"
 
@@ -973,17 +1054,19 @@ msgstr "Добавьте контакты, чтобы вы могли быстр
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "E-mail"
 
@@ -1008,8 +1091,8 @@ msgid "Delete Contact"
 msgstr "Удалить контакт"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1085,62 +1168,63 @@ msgstr "Проверочное сообщение слишком длинное
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" не допустимое имя"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Вы можете создать %d групп.Обновите аккаунт."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Группа с таким именем уже существует"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Группа успешно переименована в \"%s\"."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Не удалось переименовать группу, имя группы можно содержать только буквы, цифры или подчеркивания"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Email %s недействителен."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Только администраторы могут сделать группу общественной"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Сообщение не существует"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "У вас нет доступа."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Вы можете пригласить %d участников. Обновите аккаунт."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Ваш друг добавил вас в группу на Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Не удалось добавить, %s не зарегистрирован."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
@@ -1148,338 +1232,352 @@ msgstr[0] "Успешно добавлен. %(count)s Сообщение был
 msgstr[1] "Успешно добавлены. %(count)s сообщений было отправлено."
 msgstr[2] "Успешно добавлены. %(count)s сообщений было отправлено."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Успешно добавлен."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Не удалось добавить - %s не допустимый email."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Не удалось добавить, %s не зарегистрирован."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Операция выполнена успешно."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Не удалось: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Не удалось запретить общий доступ: группа не существует."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Операция не удалась: только администраторы или владельцы библиотек могут запретить их совместное использование."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Не удалось запретить совместное использование: внутренняя ошибка."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Ошибка: неверный идентификатор группы"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Ошибка: группа не существует."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Успешно размещен в %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Ошибка: вы не участник группы %s. "
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Ошибка: библиотека не существует."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Ошибка: не верный путь."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Невозможно создать: группа не существует."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Невозможно создать: вы не в группе."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Невозможно создать"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Невозможно создать: внутренняя ошибка."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Вы уже в группе."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Успешно отправлено на рассмотрение администрации."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Файл не существует"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "Модуль \"Wiki\" включён"
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "Модуль \"Wiki\" выключен"
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Не удалось создать wiki-страницу. Повторите попытку позже."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Файл wiki не существует"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Не удалось создать домашнюю страницу. Повторите попытку позже."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Не удалось установить WIKI библиотеку."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki не найден."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Страница \"%s\" уже существует."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s приглашаем Вас присоединиться к группе %(group.group_name)s. Пожалуйста, перейдите на следующую страницу и зарегистрируйтесь:"
+msgid "Successfully deleted \"%s\"."
+msgstr "Успешно удален \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Спасибо за использование нашего сайта!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "Команда %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Ошибка удаления \"%s\". Попробуйте позже."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Скрыть ответы"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Ответ"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Добавить ответ ..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Значение не может быть пустым и должно быть не более 150 символов."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Отмена"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Это публичная группа"
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Включить Модули"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Выход"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Это публичная группа"
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Файлы"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Участники"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Админитратор"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Выйти из группы"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Вы уверенны что хотите выйти из группы?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Добавить обсуждение"
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Добавить файл"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "После авторизации Вы можете участвовать в обсуждениях."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Следующий"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Вверх"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Вы действительно хотите удалить это обсуждение?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Да"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Нет"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Успешно удалено"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Не удалось удалить:"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Не удачно."
 
@@ -1488,6 +1586,7 @@ msgid "Recent Changes"
 msgstr "Недавние изменения"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1496,77 +1595,58 @@ msgstr "Новая библиотека"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Описание"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Последнее обновление"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Доступно для"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "Значёк каталога"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Скачать и синхронизировать"
 
@@ -1582,7 +1662,7 @@ msgstr "Скачать и синхронизировать"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Закрыть доступ"
 
@@ -1619,15 +1699,16 @@ msgid "Modified at"
 msgstr "Изменено"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Изменил"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1636,23 +1717,23 @@ msgid "Details"
 msgstr "Детали"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Нет"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Не определено"
 
@@ -1671,15 +1752,43 @@ msgstr "Пароль: "
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Пароль будет храниться на сервере в течение 1 часа."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Отменить общий доступ к библиотеке"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Вы уверены, что хотите запретить достут к %s ?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "Значёк каталога"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Нет общедоступных библиотек в этой группе"
@@ -1696,14 +1805,25 @@ msgid ""
 "message: "
 msgstr "%(user)s хочет вступить в группу \"%(group_name)s\". Проверочное сообщение: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Спасибо за использование нашего сайта!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Команда %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Администраторы"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Настройки"
 
@@ -1711,7 +1831,7 @@ msgstr "Настройки"
 msgid "Add Members"
 msgstr "Добавть участника"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Добавить администраторов"
 
@@ -1720,7 +1840,7 @@ msgid "Avatar"
 msgstr "Аватар"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Изменить"
 
@@ -1739,7 +1859,7 @@ msgid "Make Public"
 msgstr "Опубликовать"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Передать"
 
@@ -1763,29 +1883,41 @@ msgstr "Учтите: email должен быть уже зарегистрир
 msgid "Rename Group To"
 msgstr "Переименовать группу в"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Исключить группу"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Вы действительно хотите удалить эту группу?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Удалить участника"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Действительно хотите удалить %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Выход"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Добавить в контакты"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Выйти из группы"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Вы уверенны что хотите выйти из группы?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Присоединиться к группе"
@@ -1812,12 +1944,29 @@ msgstr "Пользователи: "
 msgid "Verification Message"
 msgstr "Проверочное сообщение"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Создать"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Для этой группы в настоящее время нет wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1825,82 +1974,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile wiki позволяет вам организовать базу знаний. Содержание wiki хранится как обычная библиотека в структуре предопределенного файла или каталога. Это позволяет редактировать wiki на рабочем столе, а затем синхронизировать с сервером. "
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Создать Wiki сейчас"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Создать Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wiki страницы"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Пожалуйста кликните для выбора библиотеки."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Главная"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Страницы"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki история"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Новая страница"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Удалить страницу"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Редактировать страницу"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Страница истории"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Последнее изменение: %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Вы уверены, что хотите удалить эту страницу?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Необходимо имя."
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Необходимо описание."
 
@@ -1947,10 +2119,12 @@ msgstr "Добавить пользователей"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Ввод"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "email(ы), разделённые ','"
 
@@ -1966,7 +2140,8 @@ msgstr "Учтите: email должен быть уже зарегистрир
 msgid "Add administrators"
 msgstr "Добавить Администраторов"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Пожалуйста введите или выберите E-Mail."
 
@@ -2245,135 +2420,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Seafile сервер не хранит пароль для зашифрованной библиотеки. Чтобы просмотреть зашифрованную библиотеку онлайн, вам нужно предоставить пароль для библиотеки. Ваш пароль хранится только в зашифрованной памяти сервера. Он удалится из памяти через час. После этого, если Вы хотите просмотреть библиотеку, Вам снова потребуется ввести пароль."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "требуется сообщение"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "требуестся контакт"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Вы не можете посылать сообщения самому себе."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Невозможно отправить сообщение для %s, пользователь не найден."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Сообщения"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Новое сообщение"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Сообщение"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Время"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "Сообщение..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Добавить файл"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "Чтобы отправить: кликните для выбора контактов"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "сначала выберите контакты"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Невозможно получить ваши контакты для отправки сообщения."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Вы пока не отметили ни одного файла"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Сообщения от %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Отправить сообщение ..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Файл с именем %(file_name)s был загружен в папку %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s поделился с вами библиотекой %(repo_name)s."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s поделился с вами файлом %(file_name)s."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "Вы получили новое сообщение от %(user)s."
+msgid "You have received a new message from %(user)s."
+msgstr "Вы получили  новое сообщение от %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s появилось новое обсуждение"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s открыл новое обсуждение в %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "В обсуждаемой группе появился новый ответ"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s ответил в вашей обсуждаемой группе"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s з
 msgid "Successfully cleared all notices."
 msgstr "Успешно очищены все уведомления."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Добавить новое уведомление"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr ""
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr ""
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Все уведомления"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Добавить новое уведомление"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Уведомление подробно"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(текущее уведомление)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Установить как текущее"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Пусто"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Удалить Уведомление"
 
@@ -2436,27 +2616,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Пожалуйста, выберите, как просматривать зашифрованные библиотеку онлайн:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Посылать пароли на сервер."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Файлы будут расшифрованы на сервере перед отсылкой Вам."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Сохранить пароли в вашем браузере."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Файлы будут расшифрованы в Вашем браузере после их загрузки."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2488,81 +2668,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "\"%s\" успешно установлена Вашей библиотекой по умолчанию."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Настройки профиля"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Профиль"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Зашифрованные библиотеки"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Суб-библиотеки"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Библиотека по умолчанию"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Удалить аккаунт"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Аватар:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Пароль:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Обновить"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Имя:"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Обо мне:"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Отдел:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Телефон:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Настройки зашифрованных библиотек"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Как просматривать зашифрованные библиотеки онлайн:"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Настройка суб-библиотек"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Включить под-каталоги"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2571,7 +2758,7 @@ msgid ""
 "library."
 msgstr "Эта функция позволяет выборочно синхронизировать папки внутри библиотеки. Вложенная библиотека может быть создана из любой папки. После создания, она будет показана в настольном клиенте, и вы можете скачать её так же, как и обычную библиотеку. Она будут автоматически синхронизироваться. "
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2579,37 +2766,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Под-каталоги также используются при совместном доступе к папкам группы или папкам другого пользователя. Без этой опции, скрытые вложенные библиотеки будут создаваться автоматически. С помощью этой опции, скрытые вложенные библиотеки также будут видны в списке, который позволяет управлять ими. "
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Настройки библиотеки по умолчанию"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Ваша библитоека по умолчанию:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Библиотека по умолчанию - это место по умолчанию для хранения Ваших персональных документов и изображений."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Выберите библиотеку по умолчанию"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Эту операцию нельзя отменить. Пожалуйста проверьте её дважды!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Выберите библиотеку по умолчанию:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Пожалуйста кликните для выбора библиотеки."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Вы действительно хотите удалить вашу учетную запись?"
 
@@ -2622,25 +2805,25 @@ msgid "Info"
 msgstr "Инфо"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Имя"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "О себе"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Отдел"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Телефон"
 
@@ -2648,169 +2831,171 @@ msgstr "Телефон"
 msgid "Email is not longer than 512 characters"
 msgstr "E-mail не длиннее 512 символов"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Невозможно открыть общий доступ для всех участников. Повторите попытку позже."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Успешно предоставлен общий доступ для всех участников, для проверки перейдите к доступу."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" уже в группе %(group)s. Посмотреть"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Общий доступ не предоставлен %(repo)s в %(group)s, повторите попытку позднее."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Общий доступ успешно предоставлен для %(group)s для проверки перейдите к Доступу."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Вы не можете открыть общий доступ самому себе"
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Не удалось открыть общий доступ %s, пожалуйста, повторите попытку позже."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Общий доступ %(email)s успешно предоставлен， для проверки перейдите к Доступу."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Не удалось открыть общий доступ %s, такой email не зарегистрирован."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Только владелец библиотеки имеет право дать общий доступ к ней."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Общий доступ к \"%s\" не возможен, т.к. ограничен квотой. Обновите аккаунт."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Аргумент недействителен."
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Не удалось исключить общий доступ"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "идентификатор группы не является действительным"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Общий доступ успешно закрыт"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "все участники"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "У вас нет доступа к этой библиотеке"
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Ошибка при получении ссылки. Пожалуйста, повторите позже."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Успешно исключено"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Группа не существует"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Отправка ссылки общего доступа не удалось. Услуги электронной почты не настроены должным образом. Пожалуйста, свяжитесь с администрацией."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Ваш друг дал вам общий доступ к файу на Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Внутренняя ошибка сервера. Отправить не удалось."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Успешно отправлено."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Пожалуйста, выберите папку."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Успешно добавлен."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Невозможно отправить сообщение для %s, пользователь не найден."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Успешно открыт доступ к %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Успешно закрыт доступ к \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "У вас нет разрешения на доступ к %s."
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "У вас нет разрешения на доступ к %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Ошибка при получении ссылки. Пожалуйста, повторите позже."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "Отправка ссылки общего доступа не удалось. Служба электронной почты не настроена должным образом. Пожалуйста, свяжитесь с администратором."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Ваш друг предоставил вам ссылку для загрузки на Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr ""
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2831,14 +3016,15 @@ msgstr "Посещения"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Просмотр"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Исключено"
 
@@ -2867,7 +3053,7 @@ msgid "Folders - Share"
 msgstr "Общие папки"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Папки"
 
@@ -2892,13 +3078,13 @@ msgid ""
 msgstr "Вы можете открыть доступ к отдельной папке для зарегистрованного пользователя, если не хотие открывать доступ ко всей библиотеке."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Редактирование удалось."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Редактирование не удалось."
@@ -2965,7 +3151,7 @@ msgstr "Общедоступно"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Базовая информация"
 
@@ -2978,7 +3164,8 @@ msgid "Add to contacts"
 msgstr "Добавить в контакты"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Оставить общий доступ"
 
@@ -2999,56 +3186,24 @@ msgstr "Активность"
 msgid "Exit System Admin"
 msgstr "Выйти из консоли Администратора"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Пользователи"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Уведомления"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Ссылки"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Управление системой"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "непрочитанные сообщения"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Вход"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Регистрация"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Выход"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Версия сервера:"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Управление системой"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Обратная связь"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Все группы"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Клиенты"
 
@@ -3056,7 +3211,7 @@ msgstr "Клиенты"
 msgid "Client Name"
 msgstr "Имя клиента"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3097,28 +3252,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Эта библиотека зашифрована. Введите пароль, если вы хотите её просмотреть. Пароль будет храниться на сервере только в течение 1 часа."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Пароль: "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Вы можете изменить порядок просмотра зашифрованных библиотек в режиме онлайн здесь."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Пожалуйста введите пароль"
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3128,8 +3335,7 @@ msgstr "Скачать"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr " "
 
@@ -3444,9 +3650,9 @@ msgid "Password is required."
 msgstr "Требуется пароль."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "История"
@@ -3465,16 +3671,11 @@ msgstr "Учтите: новая версия будет генерироват
 msgid "Current Path:"
 msgstr " "
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Последние изменения от "
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Размер"
 
@@ -3482,38 +3683,55 @@ msgstr "Размер"
 msgid "(current version)"
 msgstr "(текущая версия)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Переименовано или перемещено от  %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Восстановить"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Разница"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Документы"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "О системе"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Помощь"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Программа-клиент"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Скачать для Windows, Mac или Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Версия сервера:"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Обратная связь"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3542,12 +3760,13 @@ msgstr " корзина"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Назад в библиотеку"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3562,36 +3781,57 @@ msgstr "Личные"
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Персональная Wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Предоставленные ресурсы"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Ссылки"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Группа"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Ни одна библиотека не предоставлена вашим группам"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Ни одна библиотека не предоставлена вам в доступ"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Приветствуем в системе Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile организует хранение ваших файлов в библиотеках. Каждая библиотека может быть автоматически синхронизирована или отдана в общее пользование отдельно. Мы уже создали личную библиотеку для вашего пользования. В последствии вы можете создавать любое количество библиотек для работы с ними. "
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Закрыть"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Моя страница"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Сообщества"
@@ -3602,11 +3842,11 @@ msgid ""
 "current account."
 msgstr "Сообщества будут удалены в следующей версии, данные будут внесены в ваш текущий аккаунт."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3628,420 +3868,452 @@ msgstr "Никто не создал ни одной группы"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Чтобы создать группу, кликните \"Добавить группу\" в разделе \"Группы\". "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Общий доступ от"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Нет публичных библиотек"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Вы можете создать публичную библиотеку нажав кнопку \"Новая библиотека\", другие пользователи смогут просматривать и загружать эту библиотеку."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Корзина"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Размер: "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Корзина"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Переместить"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Копировать"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Загрузить файл"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Владелец этой библиотеки превысил допустимый лимит дискового пространства."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Выберите файл."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Добавить файл"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Начать все"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Выход"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Перетаскивание поддерживается Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "Размер файла должен быть меньше чем %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Обновление %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Выбрать файл"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Меньше, чем %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Новый каталог"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Имя каталога"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Новый файл"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Рекомендуемые типы файлов"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Нажмите для выбора"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Онлайновый Rich Text формат."
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "формат простой разметки."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Имя файла"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Текущая библиотека"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Другие библиотеки"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Кликните для выбора каталога"
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "в %(name)s"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Синхронизировать %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Вложенная библиотека будет создана из данного каталога. Это изменение отобразится и в настольном клиенте, соответственно вы можете скачать её так же как обычную библиотеку. "
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Создать"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Эта библиотека зашифрована. Введите пароль для просмотра её в режиме онлайн. Пароль будет храниться в браузере только 1 час. "
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Имя файла слишком длинное"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Имя файла слишком длинное"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Запрещенный тип файлов"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Превышение максимального числа файлов"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Превышение лимита размера файла"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Результат загрузки пустого файла"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Ошибка"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Начать"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Удаление элементов"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Вы уверены, что хотите удалить выбранные элементы?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Обработка ..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Успешно удален %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Успешно удалена %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Внутренняя ошибка. Не удалось удалить %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Внутренняя ошибка. Нельзя удалить %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Переместить выбранные папки/файлы в:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Скопировать выбранные папки/файлы в:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Неправельная настройка сервера."
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Успешно пемещен %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Успешно перемещена %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Успешно скопирован %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Успешно скопирована %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Внутренняя ошибка. Не удалось переместить %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Внутренняя ошибка. Нельзя переместить %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Внутренняя ошибка. Не удалось скопировать %(name)s и еще %(amount)s других объектов."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Внутренняя ошибка. Нельзя скопировать %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Шифрование файла..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Ошибка при шифровании."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Шифрование, %(num)s% complete."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Загрузка..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Выполнено!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Загрузка..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Загрузка, %(num)s% complete."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Расшифровка..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Расшифровка, %(num)s% complete."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Успешно удалена %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Переименовать"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Переименовано каталогов"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Копировать "
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Переместить "
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Каталог"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Перемещено каталогов"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "в %(name)s"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "в %(name)s"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Скачивание каталога не поддерживается в этой библиотеке."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "Снять отметку"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "Отметить"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Суб-библиотека создана."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Требуется Email."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Здесь только расширение, пожалуйста, введите значение."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Извлечение ..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Вы еще не загрузили "
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Успешное переименование %(old_name)s в %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Пожалуйста, выберите хотя бы один контакт."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Введите email или название группы, или выберите из списка."
 
@@ -4063,11 +4335,12 @@ msgstr "Учтите: снимок создаётся после модифик
 msgid "View Snapshot"
 msgstr "Просмотр снимка"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "На страницу: "
@@ -4108,34 +4381,78 @@ msgstr "все"
 msgid "Delete Time"
 msgstr "Удалить время"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Настройка библиотеки"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Сохранять полную историю"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Не сохранять историю"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Сохранить только период истории: "
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "дней"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Поменять владельца"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Передать библиотеку пользователю:"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Назад к истории изменений"
@@ -4144,6 +4461,10 @@ msgstr "Назад к истории изменений"
 msgid "Create Time"
 msgstr "Дата создания"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Последние изменения от "
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4186,8 +4507,14 @@ msgstr "Ваш клиент Seafile устарел, пожалуйста, обн
 msgid "Click to download."
 msgstr "Кликните для скачивания"
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Общий доступ: "
 
@@ -4199,25 +4526,26 @@ msgstr "Сохранить..."
 msgid "Save To:"
 msgstr "Доступно для"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Вы получили это письмо, потому что %(email)s предоставил вам общий доступ к файлу на %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Пожалуйста, перейдите на страницу и посмотрите файл: "
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Вы получили это письмо, потому что %(email)s предоставил вам общий доступ к файлу на %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Для загрузки файлов, перейдите пожалуйста на страницу:"
 
@@ -4229,8 +4557,8 @@ msgstr "Пометки"
 msgid "icon"
 msgstr "иконка"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Снять отметку"
 
@@ -4285,18 +4613,18 @@ msgstr "для"
 msgid "Sorry, this user is not registered yet."
 msgstr "К сожалению, этот пользователь не зарегистрирован."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Отметить"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "обновить этот файл"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
@@ -4304,31 +4632,31 @@ msgstr[0] " %(counter)s участник"
 msgstr[1] " %(counter)s участника(ов) "
 msgstr[2] " %(counter)s участника(ов) "
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Отметка успешно снята"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Успешно отмечено"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "Вы также можете нажать ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "Предыдущая"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "Вы также можете нажать →"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "Следующая"
 
@@ -4347,7 +4675,7 @@ msgid "auto detect"
 msgstr "автоопределение"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Полный экран"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "Загрузка..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Вы можете использовать IE 10 или другие браузеры, например, Firefox,для просмотра в режиме он-лайн."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Для просмотра в режиме он-лайн, вы можете использовать Firefox, Chrome или IE 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Этот тип файла не может быть просмотрен в режиме он-лайн."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4394,41 +4722,55 @@ msgstr "Загрузить файлы в %(dir_name)s<
 msgid "shared by:"
 msgstr "предоставлено:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Вход"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(забыли пароль)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Неразборчиво? Обновите."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Неправильный email или пароль"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Запомнить меня на %(remember_days)s дней"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Регистрация"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Не удалось обновить CAPTCHA, попробуйте снова."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "E-mail не может быть пустым"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Пароль не может быть пустым"
 
@@ -4482,13 +4824,13 @@ msgstr "Пароль успешно изменен."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Изменить пароль"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Введите новый пароль"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4499,23 +4841,19 @@ msgid "Password Reset Successfully"
 msgstr "Пароль успешно изменен"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Мы отправили письмо об изменении пароля на электронную почту."
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Вы получили это письмо, потому что вы изменили свой пароль на сайте %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Пожалуйста, перейдите на следующую страницу и введите новый пароль:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Ваше имя пользователя, если вы забыли:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4545,23 +4883,31 @@ msgstr "Регистрация завершена. Подождите актив
 msgid "Register"
 msgstr "Зарегестрироваться"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Добро пожаловать! Вы уже вошли в систему."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Подтвердите пароль"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Пожалуйста подтвердите пароль"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Пароли не совпадают"
 
@@ -4581,12 +4927,6 @@ msgstr " слишком большой. Разрешенный максимал
 msgid "Discuss"
 msgstr "Обсуждения"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Группа"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Пожалуйста, выберите по крайней мере, одну группу."
@@ -4595,10 +4935,6 @@ msgstr "Пожалуйста, выберите по крайней мере, о
 msgid "Please input a discussion."
 msgstr "Пожалуйста, начните обсуждение."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Создано с помощью системы"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4617,42 +4953,66 @@ msgstr "Ссылка для загрузки"
 msgid "Private Share"
 msgstr "Оставить общий доступ"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Подтвердите пароль"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Создать"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Ссылка: "
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Отправить"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Отправить: "
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Email(ы), разделённые ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Отправка ..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Вы можете поделиться сгенерированной ссылкой с другими людьми, и они смогу загружать файлы в эту папку."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Ссылка для загрузки:"
 
@@ -4705,7 +5065,7 @@ msgid "Sub-libraries"
 msgstr "Суб-библиотеки"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Доступные"
 
@@ -4736,29 +5096,23 @@ msgid ""
 " library."
 msgstr "Вы можете создать вложенную библиотеку из каталога внутри библиотеки. Вложенную библиотеку можно независимо синхронизировать и обмениваться ей. Файлы во вложенной библиотеке будут автоматически синхронизироваться с теми же файлами, что и в каталоге основной библиотеки. "
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Ни одна библиотека не предоставлена вам в доступ"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Ни одна библиотека не предоставлена вашим группам"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Файл обрабатывается, пожалуйста, подождите ..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "скрыть контур"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "показать контур"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Ошибка конвертации."
 
@@ -4775,27 +5129,29 @@ msgstr "Шифровать"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(не менее %(repo_password_min_length)s символов)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Подтвердите пароль"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Имя необходимо"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Описание необходимо"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Пожалуйста введите пароль"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Пароль слишком короткий"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Пароль слишком длинный (максимум 35 символов)"
 
@@ -4808,7 +5164,7 @@ msgstr "Успешно удалено."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Действительно хотите удалить %(lib_name)s ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -4935,15 +5291,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Пожалуйста, выберите по крайней мере 1 тип файла или введите не менее 1 расширения файла"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Удалить контакт"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Пожалуйста, введите по крайней мере, E-mail."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4956,7 +5320,7 @@ msgstr "Мной"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "В общем доступе"
 
@@ -4968,6 +5332,22 @@ msgstr "Трафик в этом месяце:"
 msgid "Payment"
 msgstr "Оплата"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Пользователи"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Уведомления"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Смена владельца библиотеки"
@@ -4978,74 +5358,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Передача %(lib_name)s к:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Владелец"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Все группы"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Создатель "
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Создать как"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Удалить группу"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "База данных"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Поиск"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Создано / Последний вход"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Использованно пространства"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Все"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Без владельца"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Система"
 
@@ -5061,96 +5441,117 @@ msgstr "Префикс URL"
 msgid "Delete Organization"
 msgstr "Удалить сообщество"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Общие библиотеки"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Профиль"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Поиск библиотеки"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Совет: вы можете искать по слову в названии библиотеки, владельцу или по обоим полям."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Результат"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Ничего не найдено"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Добавить нового пользователя"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Подготовка, пожалуйста ожидайте..."
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Вы получили это письмо, потому что %(user)s добавил вас в сообщество \"%(org.org_name)s\" на сайте %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Вы получили это письмо, потому что %(user)s добавил вас на сайт %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "Ниже приводится информации об учетной записи:"
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "E-Mail: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Пароль:  %(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Для входа, перейдите пожалуйста на страницу:"
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Вы получили это письмо, потому что штатно, в целях безопасности, был изменен ваш пароль на сайте %(site_name)s. "
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Ваш новый пароль %(password)s, пожалуйста, измените пароль, как только у вас будет возможность."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Поиск пользователя"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Совет: Используйте * как символ подстановки - для замещения любого количества любых букв"
 
@@ -5164,7 +5565,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Вы уверены, что хотите изменить пароль %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Отозвать Администратора"
 
@@ -5174,7 +5575,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Вы уверены, что хотите отозвать права администратора %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Назначить администратора"
 
@@ -5193,437 +5593,466 @@ msgid ""
 "configuration."
 msgstr "Правка сохранена, но отправка письма не удалась. Проверьте настройки электронной почты."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Статус"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Активный"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Не активный"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Изменить пароль"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Всего"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Используется"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Установить квоту"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Установите предел хранения пользовательских данных"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Учтите: по умолчанию 0 - без ограничений"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Принадлежит"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "У вас нет личной Wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "персональная wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Персональные Wiki страницы"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "ошибка доступа"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Не удается просмотреть страницу"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Библиотека не существует"
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "у вас нет разрешения на восстановление библиотеки"
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Не удается просмотреть библиотеку"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Не удалось сохранить настройки на сервере"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Имя %s недействительно"
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Пользователь %s не найден."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "Библиотека %(repo_name)s была перенесена к %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr ""
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Имя файла содержит недопустимый символ"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Дубликат файла"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "Размер файла превышает лимит"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "Все пространство использованно, загрузить не удалось"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Произошла ошибка во время передачи файлов"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Неправильный URL"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Не удается просмотреть библиотеку"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Не удается просмотреть библиотек снимков"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "у вас нет разрешения на восстановление библиотеки"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Пожалуйста создайте ID истории"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Библиотека не существует"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "Указанная история не существует"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "неизвестная ошибка"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Нет конфликта при слиянии."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Моя библиотека"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Не удалось запретить совместное использование библиотек,так как они не существует."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Запрещено совместное использование \"%s\"."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Запрещение совместного использования \"%s\" не удалось."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Не удалось удалить файл."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s Успешно удален."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Внутренняя ошибка. Файл %s не удален."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Невозможно получить доступ к файлу."
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Не удалось загрузить библиотеку, невозможно найти сервер."
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Неправельная настройка сервера."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Успешно возвращено %(path)s в основную директорию."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Успешно возвращено %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Успешно возвращено %(path)s в основную директорию."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Внутренняя ошибка"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Не удается загрузить каталог \"%s\": размер слишком велик."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Не удается загрузить \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Модуль \"Личной Wiki\" включен."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Модуль \"Личной Wiki\" выключен."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "У вас нет разрешения на доступ к библиотеке."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "No path."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Группа не существует"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Доступ запрещен"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Библиотека зашифрована."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Ошибка: не верный путь."
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Аргумент пропущен."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Путь назначения слишком длинный."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Успешное перемещение %(name)s Посмотреть"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Успешное перемещение %(name)s Посмотреть"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Не удается переместить каталог %(src)s в подкаталог %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Невозможно скопировать папку %(src)s в её подпапку %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Путь назначения для %s слишком длинный."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Не возможно получить список блокировки файлов"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Неверный repo id"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "Системная библиотека не может быть удалена."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTP ошибка: файл не может быть открыт в он-лайн режиме."
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URL ошибка: файл не может быть открыт в он-лайн режиме."
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "Выбранный режим кодирования не является правильным."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Неизвестная кодировка файла."
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Размер файла превышает %s, и не может быть открыт в онлайн режиме."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Не удается посмотреть файл"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Неверный формат файла."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "Библиотека не существует."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "Библиотека зашифрована."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Невозможно отредактировать файл."
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Файл не существует."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Редактирование онлайн не предполагается для этого типа файлов."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Не удалось установить квоту: внутренняя ошибка"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Успешно удалено %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Не удалось удалить: Пользователь не существует"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s успешно назначен администратором"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Не удалось назначить администратора: Пользователь не существует"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Права администратора %s успешно отозваны"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Не удалось отозвать администратора: Пользователь не существует"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Успешно изменено %s."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Невозможно создать: группа не существует."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Успешно деактивировано \"%s\"."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Не удалось деактивировать: пользователь не существует."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Пароль успешно изменён на %(passwd)s, сообщение было отправлено %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Пароль успешно изменён на %(passwd)s, но сообщение не было отправлено %(user)s, пожалуйста, проверьте настройки электронной почты."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Пароль успешно изменён на %(passwd)s для пользователя %(user)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5631,47 +6060,53 @@ msgid ""
 "configured."
 msgstr "Пароль успешно изменён на %(passwd)s для пользователя %(user)s. Но сообщение не было отправлено, потому что не правильно сконфигурирована почтовая служба."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Не удалось изменить пароль: пользователь не существует."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Регистрационная информация Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Успешно добавлен пользователь %s. Уведомление было отправлено по электронной почте."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Успешно добавлен пользователь %s. Но произошла ошибка при отправке уведомления, пожалуйста, проверьте настройки электронной почты."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Успешно добавлен пользователь %s."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "Успешно добавлен пользователь %s. Но сообщение не было отправлено, потому что не правильно сконфигурирована почтовая служба."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Успешно передана."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Невозможно отправить, пользователь %s не найден."
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Ошибка передачи, неверные параметры."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
index bbc7ce14fe..3591f47e8a 100644
--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/sv/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-01 11:30+0000\n"
-"Last-Translator: ugusta \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/seahub/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,175 +19,207 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Det finns redan en användare med denna email adress"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Lösenorden överensstämmer inte"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Namn måste anges"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Namnet är för långt (max 255 tecken)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Berkrivning måste anges"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Beskrivningen är för lång (max 255 tecken)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Namn %s är inte giltigt"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Argument saknas"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Gammalt namn behövs"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Det är för långt"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Måste anges"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Namnet \"%s\" är inte giltigt"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "Repo id måste anges"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Användarnamn måste anges"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "Lösenord måste anges"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Felaktig URL-syntax"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Fel lösenord"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Internt serverfel"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Avkrypteringsfel"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Email måste anges"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Quota måste anges"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Quota är för lågt (minsta värde 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Katalognamn måste anges"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Katalogbeskrivning måste anges"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Ange ett nummer"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "Katalanska"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Tyska"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "Engelska"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Spanska"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Spanska (Argentina)"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexikansk spanska"
 
-#: seahub/settings.py:137
-msgid "Français"
+#: seahub/settings.py:139
+msgid "français"
 msgstr "Franska"
 
-#: seahub/settings.py:138
-msgid "Hebrew"
+#: seahub/settings.py:140
+msgid "עברית"
 msgstr "Hebreiska"
 
-#: seahub/settings.py:139
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Ungerska"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Isländska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italienska"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "Koreanska"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Lettiska"
 
-#: seahub/settings.py:142
-msgid "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
 msgstr "Holländska"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polska"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portugisiska"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Ryska"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Svenska"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
+
+#: seahub/settings.py:152
+msgid "українська мова"
 msgstr "Ukrainska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "Kinesiska (förenklad)"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "Kinesiska (traditionell)"
 
@@ -196,8 +228,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Samarbetande Team"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -209,16 +242,17 @@ msgstr "Diskussion"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -228,13 +262,13 @@ msgstr "Fil"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -243,9 +277,9 @@ msgstr "Katalogikon"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s kommentarer"
@@ -256,43 +290,48 @@ msgstr "Inga diskussioner"
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Laddar"
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Misslyckades, Kontrollera nätverksanslutning"
 
@@ -341,6 +380,25 @@ msgstr "Kontrollera nätverksanslutningen"
 msgid "New Replies"
 msgstr "Nya meddelanden"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Meddelanden"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Meddelanden med %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Personlig information"
@@ -354,10 +412,11 @@ msgid "Important dates"
 msgstr "Viktiga datum"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Grupper"
 
@@ -370,72 +429,74 @@ msgstr "Lösenordet ändrades"
 msgid "Change password: %s"
 msgstr "Byt lösenord: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Användarnamn"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Lösenord"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Vänligen ange ett giltigt användarnamn och lösenord. Observera att båda fälten är skiftlägeskänsliga."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Detta konto är inaktivt"
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "Din webläsare verkar inte acceptera cookies. Cookies krävs för att du ska kunna logga in"
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "Email"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Misslyckades att skicka email. Email-tjänsten är inte korrekt konfigurerad. Kontakta en administratör"
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Email-adressen har ingen koppling till ett användarkonto. Är du säker att du har registrerat dig?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "Lösenordet för %s är ändrat"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Verifiera nytt lösenord"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ditt gamla lösenord var felaktigt. Försök igen"
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
@@ -473,7 +534,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "Du har redan %(nb_avatars)d avatarer, och max antal tillåtet är %(nb_max_avatars)d"
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Avatar för %s"
@@ -541,57 +602,62 @@ msgstr "Nuvarande avatar:"
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "OK"
@@ -608,7 +674,7 @@ msgstr "%(avatar_creator)s har uppdaterat deras ava
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Du har uppdaterat din avatar %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Standard-avatar"
 
@@ -640,7 +706,7 @@ msgstr "telefon"
 msgid "note"
 msgstr "anteckning"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Filer i denna katalog kan inte läsas on-line"
 
@@ -697,7 +763,7 @@ msgstr "Backade filen \"%(file)s\" till status kl. %(time)s."
 msgid "Recovered deleted directory"
 msgstr "Återskapade borttagen katalog"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Ändrade katalognamn eller beskrivning"
 
@@ -707,9 +773,9 @@ msgstr "Automatisk ihopslagning av seafile-systemet"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Precis nyss"
 
@@ -745,42 +811,48 @@ msgstr[1] "%(seconds)d sekunder sedan"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Read-Write"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Read-Only"
 
@@ -789,33 +861,33 @@ msgstr "Read-Only"
 msgid "Email is required."
 msgstr "Email krävs"
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s är inte en giltig email"
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s finns redan i dina kontakter"
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Kontakten %s skapades"
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Misslyckades att skapa kontakten %s"
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Ändring lyckades för %s"
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "%s togs bort"
@@ -840,10 +912,10 @@ msgstr "Email"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -851,45 +923,46 @@ msgstr "Email"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Namn"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Anteckning"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -898,56 +971,64 @@ msgstr "Anteckning"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Åtgärder"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Ändra"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -963,17 +1044,19 @@ msgstr "Lägg till kontakter så du snabbt kan dela kataloger och skicka delning
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Email"
 
@@ -998,8 +1081,8 @@ msgid "Delete Contact"
 msgstr "Ta bort kontakt"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1075,400 +1158,415 @@ msgstr "Verifikationsmeddelande är för långt (max är 255 tecken)"
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" är inte ett giltigt namn"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Du kan bara skapa %d grupper. Upgrade account."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Det finns redan en annan grupp med detta namn. Kontakta administratör eller byt gruppnamn"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Namnändring till \"%s\" lyckades."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Misslyckades att döpa om gruppen. Gruppnamn kan bara innehålla bokstäver, siffror elle underscore"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "Email %s är inte giltig"
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Endast administratörer kan göra gruppen publik"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Meddelandet saknas"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "Du har inte behörighet"
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Du kan bara bjuda in %d medlemmar. Upgrade account."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Din vän lade till dig till en grupp på Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Misslyckades att  lägga till, %s är inte registrerad"
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "Lyckades. Ett email har skickats."
 msgstr[1] "Lyckades. %(count)s email har skickats."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Lyckades"
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Misslyckades att lägga till, %s är inte en giltig email."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Misslyckades att lägga till, %s är inte registrerad."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Åtgärden lyckades."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Misslyckades: %s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Misslyckades att ta bort delning: gruppen existerar inte."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Åtgärden misslyckades: endast administratörer och ägaren av katalogen kan avsluta delningen."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Misslyckades att sluta dela: internt fel."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Fel grupp-ID"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Fel: gruppen existerar inte."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Publicering till %(groups)s lyckades"
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Fel: du tillhör inte gruppen %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Fel: katalogen existerar inte."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Fel: ingen sökväg."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Misslyckades att skapa: gruppen existerar inte."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Misslyckades att skapa: du är inte med i gruppen."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Misslyckades att skapa"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Misslyckades att skapa: internt fel."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Du är redan med i gruppen."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Skickades. Gruppens administratör kommer hantera detta."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Filen existerar inte"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "Aktiverade \"Wiki\"."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "Inaktiverade  \"Wiki\"."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Misslyckades skapa wiki-sida. Försök igen senare."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Internt serverproblem"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Wiki existerar inte."
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Misslyckades att skapa hemsida. Försök senare."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Misslyckades att sätta wiki som bibliotek."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki ittas inte"
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Sidan \"%s\" finns redan."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s bjuder in dig att vara med i gruppen %(group.group_name)s. Gå till följande sida och registrera dig:"
+msgid "Successfully deleted \"%s\"."
+msgstr "Tog bort \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Tack för att du använder vår site."
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s teamet"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Misslyckades att ta bort \"%s\". Försök igen senare."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Dölj kommentarer"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Svara"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Skapa kommentar..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Kan inte vara tom och ska inte vara mer än 2048 tecken."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Denna grupp är publik"
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Aktivera moduler"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Lämna grupp"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Denna grupp är publik"
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Kataloger"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Filer"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Medlemmar"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Administrera"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Lämna grupp"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Är du säker att du vill lämna gruppen?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Skapa diskussion..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Lägg till filer"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "När du loggat in kan du skapa diskussioner och svara"
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Tidigare"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Nästa"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Upp"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Vill du verkligen radera denna diskussion?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Ja"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Nej"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Borttagen"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Misslyckades att radera"
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Misslyckades"
 
@@ -1477,6 +1575,7 @@ msgid "Recent Changes"
 msgstr "Nya förändringar"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1485,77 +1584,58 @@ msgstr "Ny katalog"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Beskrivning"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Senaste uppdatering"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Delad av"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "katalogikon"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Ladda ner och synka"
 
@@ -1571,7 +1651,7 @@ msgstr "Ladda ner och synka"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Sluta dela"
 
@@ -1608,15 +1688,16 @@ msgid "Modified at"
 msgstr "Ändrad"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Ändrad av"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1625,23 +1706,23 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Ingen"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -1660,15 +1741,43 @@ msgstr "Lösenord"
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Lösenordet kommer sparas på servern endast en timme"
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Sluta dela katalog"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Är du säker att du vill sluta dela %s ?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "katalogikon"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Ingen publik katalog i denna grupp"
@@ -1685,14 +1794,25 @@ msgid ""
 "message: "
 msgstr "%(user)s vill gå med i gruppen  \"%(group_name)s\", här är verifikationsmeddelandet: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Tack för att du använder vår site."
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s teamet"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Administratörer"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -1700,7 +1820,7 @@ msgstr "Inställningar"
 msgid "Add Members"
 msgstr "Lägg till medlemmar"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Lägg till administratörer"
 
@@ -1709,7 +1829,7 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Ändra"
 
@@ -1728,7 +1848,7 @@ msgid "Make Public"
 msgstr "Gör publik"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Överför"
 
@@ -1752,29 +1872,41 @@ msgstr "Tips: email behöver finnas registrerad i förväg."
 msgid "Rename Group To"
 msgstr "Döp om grupp till"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Ta bort grupp"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Vill du verkligen ta bort denna grupp?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "To bort medlem"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Vill du verkligen ta bort %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Lämna grupp"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Lägg till kontakter"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Lämna grupp"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Är du säker att du vill lämna gruppen?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Gå med i grupp"
@@ -1801,12 +1933,29 @@ msgstr "Medlemmar:"
 msgid "Verification Message"
 msgstr "Verifikationsmeddelande"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Wiki Index"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr "Inget index nu."
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Skapa"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Denna grupp har ingen Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1814,82 +1963,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile Wiki ger dig möjlighet att organisera dina kunskaper på ett enkelt sätt.  Innehållet i wikin sparas i en vanlig katalog med fördefinierad katalogstruktur. Detta gör att du kan ändra din wiki på din desktop och sedan synka tillbaka den till servern"
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Skapa Wiki nu"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Välj ett bibliotek som wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Skapa Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wiki-sidor"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Välj ett bibliotek som wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Klicka och välj standardkatalog"
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Hem"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Sidor"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki-historik"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Ny sida"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Ta bort sida"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Skapa sida"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Sidhistorik"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Ändrades senast av %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Är du säker på att du vill ta bort den här sidan?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Namn krävs"
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Beskrivning krävs"
 
@@ -1936,10 +2108,12 @@ msgstr "Lägg till medlemmar"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Ange"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "email-adresser, separerade med ','"
 
@@ -1955,7 +2129,8 @@ msgstr "Tips: email behöver vara registrerad i förväg."
 msgid "Add administrators"
 msgstr "Lägg till administratörer"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Lägg till email, eller välj några."
 
@@ -2234,135 +2409,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Lösenordet för en krypterad katalog kommer inte sparas på servern. För att läsa en krypterad katalog on-line, behöver du ange katalogens lösenord. Ditt lösenord sparas endast i serverns krypterade minne. Det kommer rensas från minnet inom en timme. Efter det behöver du ange lösenord igen."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "meddelande krävs"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "kontakt krävs"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Du kan inte skicka meddelande till dig själv."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Misslyckades skicka meddelande till %s, användare hittas ej."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Meddelanden"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Nytt meddelande"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Meddelande"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Tid"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "meddelande..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Lägg till filer"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "skicka till: klicka för att välja kontakter"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "ange kontakter först"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Misslyckades att hämta dina kontakter för att skicka meddelandet"
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Du har inga kataloger för tillfället"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Meddelanden med %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Skicka ett meddelande..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "En fil %(file_name)s har laddats upp till dinmapp %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s har delat en katalog %(repo_name)s med dig."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s har delat en fil%(file_name)s med dig."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "Du har fått ett a nytt meddelande från %(user)s."
+msgid "You have received a new message from %(user)s."
+msgstr "Du har mottagit ett nytt meddelande från %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s har en ny diskussion"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s skapade en ny diskussion i %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "En gruppdiskussion har en ny kommentar"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s kommenterade din gruppdiskussion"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s har bett dig anlu
 msgid "Successfully cleared all notices."
 msgstr "Rensade alla meddelanden"
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Skapa nytt systemmeddelande"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr ""
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr ""
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Alla systemmeddelanden"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Skapa nytt systemmeddelande"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Detaljer"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "aktuellt systemmeddelande"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Sätt som aktuellt systemmeddelande"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Tomt"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Ta bort systemmeddelande"
 
@@ -2425,27 +2604,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Ange hur krypterade kataloger ska visas on-line"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Skicka lösenord till servern"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Filerna kommer krypteras i servern innan de skickas till dig"
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Spara lösenord i din browser"
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Filerna kommer avkrypteras i din browser när du laddar ner dem."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2477,81 +2656,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "Satte \"%s\" som din standardkatalog."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Profilinställningar"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Profil"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Krypterade kataloger"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Underkataloger"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Standardkatalog"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Ta bort konto"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Avatar:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Lösenord"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Uppdatera"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Namn"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Om mig"
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Avdelning"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Telefon"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Inställning för krypterade kataloger"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Hur krypterade kataloger visas"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Underkataloginställningar"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Aktivera underkataloger"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2560,7 +2746,7 @@ msgid ""
 "library."
 msgstr "Denna funktion gör så att du kan välja att synka en mapp inuti en katalog. En undekatalog kan skapas från vilken katalog som helst Efteråt kommer den listas  i din desktopklient, och du kan ladda ner den som vilken annan katalog som helst.  Undekatalogen kommer hållas synkad med orginalmappen"
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2568,37 +2754,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Underkatalog används vid delning av mapp till en grupp eller annan användare. Utan detta val, kommer en dold underkatalog skapas i sånt fall. Med detta val, kommer dessa dolda underkataloger listas, vilket gör att du kan hantera dem."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Instaällningar för standardkatalog"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Din standardkatalog:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Standardkatalog är den plats där du sparar personliga dokument och bilder."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Välj standardkatalog"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Denna åtgärd kan inte ångras. Tänk efter innan!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Välj standardkatalog"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Klicka och välj standardkatalog"
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Vill du verkligen ta bort ditt konto? "
 
@@ -2611,25 +2793,25 @@ msgid "Info"
 msgstr "Info"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Namn"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Om mig"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Avdelning"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -2637,169 +2819,171 @@ msgstr "Telefon"
 msgid "Email is not longer than 512 characters"
 msgstr "Email får inte vara längre än 512 tecken"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Misslyckades att dela med all medlemmar, försök igen senare."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Delade med alla medlemmar. Kontrollera Kataloger."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" är redan med i en grupp %(group)s. Visa"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Misslyckades att dela %(repo)s till %(group)s, försök igen senare."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Delade till %(group)s Kontrollera Kataloger."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Du kan inte dela en katalog till dig själv"
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Misslyckades att dela till %s, försök igen senare."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Delad med %(email)s, kontrollera Kataloger."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Misslyckades att dela %s, eftersom email inte finns registrerad."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Endast katalogens ägare har behörighet att dela det."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Misslyckades att dela \"%s\", inte tillräcklig quota.Upgrade account."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Argumentet är ej giltigt"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Misslyckades att ta bort delning"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "grupp-ID är inte giltigt"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Tog bort delning"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "alla medlemmar"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "Du kan inte dela kataloger på detta sätt."
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Misslyckades att få länken, försök senare."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Borttagen"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Länken finns inte"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Misslyckades att dela länk. Email-service är inte korrekt konfigurerd, vänligen kontakta en administratör."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Din vän delade en fil med dig på Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Internt serverfel. Sändning misslyckades."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Skickat"
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Vänligen välj en katalog"
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Sparad"
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Misslyckades att dela \"%s\", användare saknas."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Delade %s"
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Slutade dela \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "Du har inte behörighet till odelade %s."
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "Du har inte behörighet att spara %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Misslyckades att få länken, försök senare."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "Misslyckades att skicka en uppladdningslänk. Email-service är inte korrekt konfigurerad. Kontakta en administratör."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Din vän har delat en uppladdningslänk med dig på Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr ""
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2820,14 +3004,15 @@ msgstr "Besök"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Visa"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2856,7 +3041,7 @@ msgid "Folders - Share"
 msgstr "Mappar - Delning"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Mappar"
 
@@ -2881,13 +3066,13 @@ msgid ""
 msgstr "Du kan dela en enstaka mapp med en önskad registrerad användare om du inte vill dela en hel katalog"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Ändring lyckades"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Ändring misslyckades"
@@ -2954,7 +3139,7 @@ msgstr "Delningar"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Grundinformation"
 
@@ -2967,7 +3152,8 @@ msgid "Add to contacts"
 msgstr "Lägg till Kontakter"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Lämna delning"
 
@@ -2988,56 +3174,24 @@ msgstr "Aktiviteter"
 msgid "Exit System Admin"
 msgstr "Lämna Systemadmin"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Användare"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Meddelanden"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Länkar"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Systemadministratör"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "olästa meddelanden"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Logga in"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Registrera"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Logga ut"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Serverversion"
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Systemadministratör"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Kontakta oss"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Alla grupper"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Klienter"
 
@@ -3045,7 +3199,7 @@ msgstr "Klienter"
 msgid "Client Name"
 msgstr "Klientnamn"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3086,28 +3240,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Katalogen är krypterad. Ange lösenord om du önskar läsa den on-line. Lösenordet kommer sparas på servern i en timme."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Lösenord"
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Du kan ändra hur du kommer åt krypterade kataloger on-line här."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Ange lösenord"
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3117,8 +3323,7 @@ msgstr "Ladda ner"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Nuvarande sökväg"
 
@@ -3433,9 +3638,9 @@ msgid "Password is required."
 msgstr "Lösenord krävs"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Historik"
@@ -3454,16 +3659,11 @@ msgstr "Tips: en ny version kommer skapas efter varje ändring, och du kan åter
 msgid "Current Path:"
 msgstr "Nuvarande sökväg:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Senast ändrad av"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Storlek"
 
@@ -3471,38 +3671,55 @@ msgstr "Storlek"
 msgid "(current version)"
 msgstr "(nuvarande version)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Bytt namn eller flyttats från %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Läs tillbaka"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Skillnad"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Dokument"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Introduktion"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Hjälp"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Klient"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Seafile för Windows, Mac och Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Serverversion"
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Kontakta oss"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3531,12 +3748,13 @@ msgstr "s papperskorg"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Tillbaka till katalog"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3551,36 +3769,57 @@ msgstr "Personligt"
 msgid "Starred"
 msgstr "Favoriter"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Personlig Wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Administrera delningar"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Länkar"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Grupp"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Inga kataloger delas till din grupp"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Inga kataloger delas med dig"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Välkommen till Seafile"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile ordnar filer i kataloger. Varje katalog kan synkas och delas separat. Vi har skapat en personlig katalog åt dig. Du kan skapa fler kataloger senare"
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Stäng"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Hem"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Organisation"
@@ -3591,11 +3830,11 @@ msgid ""
 "current account."
 msgstr "*Organisation kommer tas bort i nästa version, data kommer slås ihop med ditt nuvarande konto."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3617,420 +3856,452 @@ msgstr "Ingen har skapat någon grupp ännu"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Du kan klicka \"Lägg till grupp\"knappen under \"Grupp\"menyn för att skapa en grupp. "
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Dela från"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Inga publika kataloger"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Du kan skapa publika kataloger genom att klicka \"Ny katalog\".Andra kan sedan se och ladda ner katalogen"
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Papperskorg"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Storlek"
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Papperskorg"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Flytta"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Kopiera"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Ladda upp filer"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Ägaren av denna katalog har inte tillräckligt med diskutrymme."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Välj en fill först."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Lägg till filer"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Starta alla"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Avbryt alla"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Drag & Drop supporteras för Chrome, Safari., Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "Filstorleken måste vara mindra än %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Uppdatera %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Mindre än %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Ny katalog"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Katalognamn"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Ny fil"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Accepterad filtyp"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Klicka för att välja"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "on-line Rich Text format"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "simple markup format."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Filnamn"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Nuvarande katalog"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Andra kataloger"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Klicka och välj katalog"
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Döp om %(name)s till: "
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Synka %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "En underkatalog kommer skapas från denna katalog. Den kommer listas i din desktop-klient, och di kan ladda ner den precis som en vanlig katalog."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Skapa"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Denna katalog är krypterad. Ange lösenord om du vill komma åt den on-line. Lösenordet kommer sparas i browsern endast en timme."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Filen är för stor"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Filen är för liten"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Filtypen stöds ej"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Maxantal filer överskridet"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Uppladdade bytes överskrider filstorleken"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Uppladdning resulterade i en tom fil"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Fel"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Starta"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Ta bort objekt"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Är du säker att du vill ta bort valda objekt?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Arbetar..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Tog bort %(name)s och %(amount)s andra objekt."
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Tog bort %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Intent fel. Misslyckades att ta bort %(name)s och %(amount)s andra objekt"
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Internt fel. Misslyckades att ta bort %(name)s."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Flytta valda kataloger/filer till:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Kopiera valda kataloger/filer till:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Felaktig destination"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Flyttade %(name)s och %(amount)s andra objekt."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Flyttade %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Kopierade %(name)s och %(amount)s andra objekt."
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Kopierade %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Internt fel. Misslyckades att flytta %(name)s och %(amount)s andra objekt."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Internt fel. Misslyckades att flytta %(name)s."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Internt fel. Misslyckades att kopiera %(name)s och %(amount)s andra objekt"
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Internt fel. Misslyckades att kopiera %(name)s."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Krypterar fil..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Fel vid kryptering"
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Krypterar, %(num)s färdigt."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Laddar upp..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Klar!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Laddar ner..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Laddar ner, %(num)s färdigt."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Avkrypterar..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Avkrypterade %(num)s."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Tog bort %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Döp om fil"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Döp om katalog"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Kopiera fil"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Flytta fil"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Kopiera Katalog"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Flytta Katalog"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "Kopiera %(name)s till:"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Flytta %(name)s till:"
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Denna katalog kan inte laddas ned"
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "favorit borttagen"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "favorit skapad"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Underkatalog skapad"
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Det krävs"
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Bara en ändelse, vänligen ange ett namn"
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Skapar..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Du har inte döpt om det"
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Döpte om %(old_name)s till %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Vänligen ange minst en kontakt"
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Vänligen ange email eller grupper, eller välj"
 
@@ -4052,11 +4323,12 @@ msgstr "Ett Snapshot kommer skapas vid förändring."
 msgid "View Snapshot"
 msgstr "Visa Snapshot"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "Per sida: "
@@ -4097,34 +4369,78 @@ msgstr "alla"
 msgid "Delete Time"
 msgstr "Raderad tid"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Kataloginställningar"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Spara full historik"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Spara inte historik"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Spara endast historiken "
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "dagar"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Överför ägarskap"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Överför denna katalog till annan användare"
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Tillbaka till förändringshistoriken"
@@ -4133,6 +4449,10 @@ msgstr "Tillbaka till förändringshistoriken"
 msgid "Create Time"
 msgstr "Skapad tid"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Senast ändrad av"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4175,8 +4495,14 @@ msgstr "Din Seafile-klient är inte uppdaterad. Vänligen uppdatera till den sen
 msgid "Click to download."
 msgstr "Klicka för att ladda ner."
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Delad av:"
 
@@ -4188,25 +4514,26 @@ msgstr "Spara till..."
 msgid "Save To:"
 msgstr "Spara till:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Du har fått detta mail för att %(email)s delar en fil med dig på %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Vänligen gå till denna sida för att öppna filen:"
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Du har fått detta mail för att %(email)s har delat en uppladdningslänk med dig på %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Du kan gå till följande sida och ladda upp dina filer"
 
@@ -4218,8 +4545,8 @@ msgstr "Favoriter"
 msgid "icon"
 msgstr "ikon"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Ta bort favorit"
 
@@ -4274,49 +4601,49 @@ msgstr "till"
 msgid "Sorry, this user is not registered yet."
 msgstr "Ledsen, denna användare är inte registrerad"
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Favorit"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "uppdaterade denna fil"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] "en deltagare"
 msgstr[1] "%(counter)s deltagare"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Favorit borttagen"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Favorit skapad"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "du kan också trycka  ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "föregående"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "du kan också trycka → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "nästa"
 
@@ -4335,7 +4662,7 @@ msgid "auto detect"
 msgstr "upptäck automatiskt"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Fullskärm"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "laddar..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Du kan använda IE 10 eller andra browsers, t.ex. firefox, för att visa den on-line."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "För att visa den on-line, kan du användaTo view it online, firefox, chrome eller IE 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Denna typ av filer kan inte öppnas on-line"
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4382,41 +4709,55 @@ msgstr "Ladda upp filer till %(dir_name)s"
 msgid "shared by:"
 msgstr "delat av:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Logga in"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(glömt lösenord)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Inte tydligt nog? Uppdatera "
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Felaktigt användarnamn eller lösenord"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Kom ihåg mig i %(remember_days)s dagar "
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Registrera"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Misslyckades att uppdatera CAPTCHA. Försök igen senare."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "Email måste anges"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Lösenordet måste anges"
 
@@ -4470,13 +4811,13 @@ msgstr "Återställning lyckades"
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Återställ lösenord"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Ange nytt lösenord"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4487,23 +4828,19 @@ msgid "Password Reset Successfully"
 msgstr "Lösenordet återställdes"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Vi har skickat ett email om återställning av ditt lösenord."
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Du har fått detta email eftersom du begärde en återställning av ditt lösenord på %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Gå till följande sida och välj ett nytt lösenord"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Ditt användarnamn, om du har glömt: "
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4533,23 +4870,31 @@ msgstr "Registrering är klar. Nu behöver du vänta tills en administratör akt
 msgid "Register"
 msgstr "Registrera"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Välkommen tillbaka. Du är redan inloggad."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Verifiera lösenord"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Ange lösenord igen"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Lösenorden överensstämmer inte"
 
@@ -4569,12 +4914,6 @@ msgstr " är för stor. Tillåten maxstorlek är 1Mb"
 msgid "Discuss"
 msgstr "Diskutera"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Grupp"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Vänligen ange minst en grupp"
@@ -4583,10 +4922,6 @@ msgstr "Vänligen ange minst en grupp"
 msgid "Please input a discussion."
 msgstr "Skapa diskussion"
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Systemgenererad"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4605,42 +4940,66 @@ msgstr "Uppladdningslänk"
 msgid "Private Share"
 msgstr "Privat delning"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Lösenord igen"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Generera"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Länk:"
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Skicka"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Skicka till:"
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Email, separerade med ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Skickar..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Du kan dela den genererade länken med andra och de kan ladda upp filer till denna katalog via länken."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Uppladdningslänk"
 
@@ -4693,7 +5052,7 @@ msgid "Sub-libraries"
 msgstr "Underkataloger"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Delade"
 
@@ -4724,29 +5083,23 @@ msgid ""
 " library."
 msgstr "Du kan skapa en underkatalog från en katalog inuti en katalog. En undekatalog kan delas separat och synkas. Filer i undekatalogen kommer automatiskt synkas med filerna i orginalkatalogen."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Inga kataloger delas med dig"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Inga kataloger delas till din grupp"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Filen hanteras, vänta..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "dölj kontur"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "visa kontur"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Misslyckades konvertera dokumentet"
 
@@ -4763,27 +5116,29 @@ msgstr "Kryptera"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(minst %(repo_password_min_length)s tecken)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Lösenord igen"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Namn krävs"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Beskrivning krävs"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Ange lösenord"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Lösenordet är för kort"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Lösenordet är för långt (max 35 tecken)"
 
@@ -4796,7 +5151,7 @@ msgstr "Borttagen"
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Är du säker att du önskar radera %(lib_name)s ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -4923,15 +5278,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Ange minst en filtyp eller minst en filändelse"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Välj kontakter"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Ange email"
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4944,7 +5307,7 @@ msgstr "Själv"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "Delning"
 
@@ -4956,6 +5319,22 @@ msgstr "Trafik denna månad"
 msgid "Payment"
 msgstr "Betalning"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Användare"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Meddelanden"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Överför Katalog"
@@ -4966,74 +5345,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Överför %(lib_name)s till:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Ägare"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Alla grupper"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Skapad av"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Skapad"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Ta bort grupp"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "Databas"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Sök"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Skapad / Senast inloggning"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Använt utrymme"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Alla"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Utan ägare"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "System"
 
@@ -5049,96 +5428,117 @@ msgstr "URL-prefix"
 msgid "Delete Organization"
 msgstr "Ta bort Organisation"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Alla publika länkar"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Antal"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Sök katalog"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Tips: du kan söka med sökord i namn eller ägare, eller båda"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Resultat"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Inget resultat"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Lägg till ny användare"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Aktiverar..., vänligen vänta"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Lösenorden överensstämmer inte"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Du har fått detta email eftersom %(user)s lade till dig till organisation \"%(org.org_name)s\" på %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Du har fått detta email eftersom %(user)s lade till dig till %(site_name)s"
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "Detta är din kontoinformation: "
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "Email: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Lösenord: %(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Vänligen gå till följande sida och logga in: "
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Du har fått detta email eftersom ditt lösenord på %(site_name)s har återställts."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Ditt nya lösenord är %(password)s, vänligen ändra ditt lösenord så snart som möjligt."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Sök användare"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Tips: Använd * för att matcha valfritt antal tecken"
 
@@ -5152,7 +5552,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Är du säker på att du vill återställa lösenord för %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Degradera admin"
 
@@ -5162,7 +5562,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Är du säker att du vill ta bort adminbehörighet från %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Tilldela admin"
 
@@ -5181,437 +5580,466 @@ msgid ""
 "configuration."
 msgstr "Ändring genomförd, men email kunde inte skickas, kontrollera email-konfiguration"
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Status"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Aktiv"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "ResetPwd"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Total"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Använt"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Sätt Quota"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Sätt användarutrymme"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Tips: 0 betyder standardbegränsning"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Ägare"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "Du har ingen privat Wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "personlig wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Privata Wiki-sidor"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "behörighetsfel"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Misslyckades att visa papperskorgen"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Katalogen existerar inte"
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "Du har inte behörighet att göra detta"
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Misslyckades att ändra kataloginformation"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Misslyckades att spara inställningar"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Inställningar sparade"
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Användarnamnet %s är inte giltigt"
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Kan inte hitta användare %s"
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "Katalog %(repo_name)s har flyttats till %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr ""
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Filnamnet innehåller ogiltiga tecken"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Filnamnet finns redan"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "Filstorleken överstiger tillåten storlek"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "Ägarens utrymme är slut. Uppladdning misslyckades"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Ett fel uppstod under filöverföring"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Ogiltig URL"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Misslyckades läsa katalogändringar"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Misslyckades läsa snapshots"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "Du har inte behörighet att läsa tillbaka katalog"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Ange historik-ID"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Katalogen existerar inte"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "Historiken du angett existerar inte"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Ingen konflikt i sammanslagningen"
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Min katalog"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Kan inte sluta dela en katalog som inte finns"
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Tog bort delning för \"%s\"."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Misslyckades att sluta dela \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Misslyckades att ta bort fil"
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s togs bort."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Internt fel. Misslyckades ta bort %s."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Misslyckades att komma åt filen"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Misslyckades att ladda ner katalogen, hittar ej servern"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Felaktig serverinställning"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Läste tillbaka %(path)s till root-katalog."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Läste tillbaka %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Läste tillbaka %(path)s till root-katalog."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Kan inte ladda ner katalog \"%s\": Den är för stor."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Kan inte ladda ner \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Skapade Personlig Wiki \"Personal Wiki\"."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Inaktiverade \"Personlig Wiki\"."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "Du har inte behörighet för denna katalog"
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "Ingen sökväg."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Gruppen finns ej"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Åtkomst nekas"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Katalogen är krypterad"
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Fel: ingen sökväg."
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Argument saknas"
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Destinationens sökväg är för lång"
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Flyttade %(name)s view"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Kopierade %(name)s view"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Kan inte flytta katalog %(src)s till dess underkatalog %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Kan inte kopiera katalog %(src)s till dess underkatalog %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Målsökvägen är för lång för %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Det gick inte att få filblockerings lista"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Fel repo id"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "System bibliotek kan inte raderas."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTP-Fel: Misslyckades att öppna filen on-line"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URL-Fel: Misslyckades att öppna filen on-line"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "Krypteringen du har valt är inte korrekt."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Okänd fil-kodning"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Filen är stötte än %s, och kan inte öppnas on-line."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Kan inte läsa fil"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Fel filformat"
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "Katalogen existerar inte."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "Katalogen är krypterad."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Det går inte att redigera filen"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Filen finns inte."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "DEt går inte att ändra denna typ av filer on-line."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Misslyckades sätta Quota: internt fel"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Tog bort %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Misslyckades ta bort: användaren existerar inte"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "Användaren %s är nu admin"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Misslyckades sätta adminbehörighet: användaren existerar inte"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Tog bort adminbehörighet för %s"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Misslyckades ta bort adminbehörighet för %s"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Aktiverade \"%s\"."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Misslyckades aktivera användare: användaren finns inte."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Inaktiverade användare \"%s\"."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Misslyckades att inaktivera: användaren finns inte"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Återställde lösenordet till %(passwd)s, ett email har skickats till %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Återställde lösenordet till %(passwd)s, men misslyckades skicka email till %(user)s, kontrollera dina email-inställningar."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Återställde lösenord till %(passwd)s för användare %(user)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5619,47 +6047,53 @@ msgid ""
 "configured."
 msgstr "Återställde lösenordet till %(passwd)s för användare %(user)s. Men email kan inte skickas, eftersom email-service inte är korrekt konfigurerad."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Misslyckades återställa lösenordet: användaren finns inte"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Seafile registreringsinformation"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Skapade användare %s. Ett email har sänts."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Skapade användare %s. Ett fel uppstod när email skulle skickas. Vänligen kontrollera email-inställningarna."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Skapade användare %s"
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "Skapade användare %s. Men email kunde inte skickas, eftersom email-service inte är korrekt konfigurerad."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Överfördes"
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Misslyckades med överföring, användare %s hittades inte."
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Misslyckades med överföring, ogiltiga argument-"
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po
index ae0971ae1d..e55b3f3c3d 100644
--- a/locale/uk/LC_MESSAGES/django.po
+++ b/locale/uk/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-02-11 21:18+0000\n"
-"Last-Translator: laskavtsev \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 09:55+0000\n"
+"Last-Translator: kvita1590 \n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/seahub/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,175 +21,207 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "Користувач з такою электронною адресою вже існує"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "Паролі не збігаються."
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "Поле \"Ім'я\" не може бути порожнім"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "Дуже довге им'я (максимум 255 символів)"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "Опис не може бути порожнім"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "Опис дуже довгий (максимум 100 символів)"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "Ім'я %s неприпустиме"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "Відсутній аргумент"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "Потрібне старе имя"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "Дуже довге"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "Потрібен Email."
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "Ім’я %s неприпустиме."
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "Потрібен Repo ID"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "Необхідно ввести ім'я користувача"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "Пароль не може бути порожнім"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "Невірний формат URL"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "Невірний пароль"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "Внутрішня помилка серверу"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "Помилка розшифровки бібліотеки"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "Потрібен Email"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "Значення квоти не може бути порожнім"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "Квота занадто мала (мінімальне значення 0)"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "Потрібна назва бібліотеки"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "Потрібен опис бібліотеки"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "Будь ласка, введіть число"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr "Будь ласка введіть правильний пароль."
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr "català"
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr "Argentinian Spanish"
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr "français"
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr "עברית"
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr "Íslenska"
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr "한국어"
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr "Nederlands"
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr "Polski"
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr "Svenska"
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr "українська мова"
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -198,8 +230,9 @@ msgid "File Collaboration Team Organization"
 msgstr "Спільний файл команди спільноти"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "Обговорення"
 
@@ -211,16 +244,17 @@ msgstr "Обговорення"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -230,13 +264,13 @@ msgstr "Файл"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -245,9 +279,9 @@ msgstr "Значок каталогу"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s відповідей"
@@ -258,43 +292,48 @@ msgstr "Нема обговорень."
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "Не вдалося. Будь ласка, перевірте мережеве з'єднання."
 
@@ -343,6 +382,25 @@ msgstr "Будь ласка, перевірте мережеве з’єднан
 msgid "New Replies"
 msgstr "Нові відповіді"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "Повідомлення"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "Повідомлення від %(name)s"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr "Повідомлень немає."
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "Особиста інформація"
@@ -356,10 +414,11 @@ msgid "Important dates"
 msgstr "Ключові дати"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "Групи"
 
@@ -372,72 +431,74 @@ msgstr "Пароль успішно змінено"
 msgid "Change password: %s"
 msgstr "Змінити пароль: %s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "Пароль"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "Будь ласка, введіть правильне ім'я користувача та пароль. Зверніть увагу, що обидва поля чутливі до регістру."
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "Цей обліковий запис неактивний."
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "У вашому веб-браузері не активовані cookies, необхідні для входу."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "E-mail"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "Не вдалося надіслати email. Сервіс електронної пошти не налаштований. Будь ласка, зв'яжіться з адміністратором."
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "Ця адреса електронної пошти не асоційована з користувачем. Ви впевнені що зареєструвалися?"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
+msgid "Reset Password on %s"
 msgstr "Пароль змінено на %s"
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "Новий пароль"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "Підтвердження нового паролю"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваш старий пароль було введено невірно. Будь ласка, введіть його знову."
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "Пароль (ще раз)"
 
@@ -475,7 +536,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "У вас вже є %(nb_avatars)d аватар, максимально дозволено%(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "Аватар для %s"
@@ -543,57 +604,62 @@ msgstr "Поточний аватар: "
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "Готово"
@@ -610,7 +676,7 @@ msgstr "%(avatar_creator)s оновив свій а
 msgid "You have updated your avatar %(avatar)s."
 msgstr "Ви оновили свій аватар %(avatar)s."
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "Аватар за замовчанням"
 
@@ -642,7 +708,7 @@ msgstr "телефон"
 msgid "note"
 msgstr "примітка"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "Розмір файлу перевищує 10M і він не може бути переглянутий в он-лайн."
 
@@ -699,7 +765,7 @@ msgstr "Статус файлу \"%(file)s\" відновлено за %(time)s.
 msgid "Recovered deleted directory"
 msgstr "Відновлений видалений каталог"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "Змінено назву або опис бібліотеки"
 
@@ -709,9 +775,9 @@ msgstr "Автоматичне злиття системою seafile"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "Просто зараз"
 
@@ -751,42 +817,48 @@ msgstr[2] "%(seconds)d секунд тому"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "Читання+Запис"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "Тільки для читання"
 
@@ -795,33 +867,33 @@ msgstr "Тільки для читання"
 msgid "Email is required."
 msgstr "Потрібен email."
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s неприпустима адреса email."
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s вже присутній у ваших контактах."
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "Успішно доданий %s до списку контактів."
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "Не вдалося додати %s до списку контактів."
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "Успішно змінено %s."
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "Успішно видалено %s"
@@ -846,10 +918,10 @@ msgstr "Email "
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -857,45 +929,46 @@ msgstr "Email "
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "Им'я"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "Примітка"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -904,56 +977,64 @@ msgstr "Примітка"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "Операції"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "Редагувати"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "Видалити"
 
@@ -969,17 +1050,19 @@ msgstr "Додайте контакти, щоб ви могли швидко о
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "Email"
 
@@ -1004,8 +1087,8 @@ msgid "Delete Contact"
 msgstr "Видалити контакт"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1081,62 +1164,63 @@ msgstr "Перевірочне повідомлення занадто довг
 msgid "\"%s\" is not a valid name"
 msgstr "\"%s\" неприпустиме ім'я"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "Ви можете створити %d груп.Оновлення аккаунту."
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "Група з таким ім'ям вже існує"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "Зміна назви групи на %s\" виконано успішно."
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "Не вдалося перейменувати групу. Назва групи може містити тільки букви, цифри або підкреслення"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "%s неприпустима адреса email."
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "Тільки адміністратори можуть зробити групу публічною"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "Повідомлення, не існує"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "У вас немає прав доступу."
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "Ви можете запросити %d учасників.Оновлення аккаунту."
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "Ваш друг додав вас до групи на Seafile."
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr "Ви запрошені приєднатися до групи  %s"
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "Не вдалося додати, %s не зареєстрований."
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
@@ -1144,338 +1228,352 @@ msgstr[0] "Успішно додано. Повідомлення було над
 msgstr[1] "Успішно додані. %(count)s повідомлень було надіслано."
 msgstr[2] "Успішно додані. %(count)s повідомлень було надіслано."
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "Успішно додано."
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "Не вдалося додати, %s неприпустимий email."
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "Не вдалося додати, %s не зареєстрований."
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "Операція виконана успішно."
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "Не вдалося：%s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "Не вдалося заборонити спільний доступ: група не існує."
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "Операція не вдалася:тільки адміністратори або власники бібліотек можуть заборонити їх спільне використання."
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "Не вдалося заборонити спільне використання: внутрішня помилка."
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "Помилка: невірний ідентифікатор групи"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "Помилка: група не існує."
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "Успішно розміщений у %(groups)s."
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "Помилка: ви не учасник групи %s."
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "Помилка: бібліотека не існує."
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "Помилка: невірний шлях."
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "Неможливо створити: група не існує."
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "Неможливо створити: ви не в групі."
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "Неможливо створити"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "Неможливо створити: внутрішня помилка."
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "Ви вже в групі."
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "Успішно відправлено на розгляд адміністрації."
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr "Обговорення потрібно."
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "Файл не існує"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "Успішно закритий доступ до \"%s\"."
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "Успішно закритий доступ до \"%s\"."
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "Не вдалося створити wiki-сторінку. Повторіть спробу пізніше."
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "Внутрішня помилка сервера"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Файл wiki не існує"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "Не вдалося створити домашню сторінку. Повторіть спробу пізніше."
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr "Невдало встановлено wiki бібліотеку."
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki не знайдена."
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "Сторінка \"%s\" вже існує."
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s запрошує Вас приєднатися до групи %(group.group_name)s. Будь ласка, перейдіть на наступну сторінку і зареєструйтесь: "
+msgid "Successfully deleted \"%s\"."
+msgstr "Успішно видалене \"%s\"."
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "Дякуємо за використання нашого сайту!"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "Команда %(site_name)s"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr "Помилка при видалені \"%s\". Будь ласка, повторіть пізніше."
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr "Доброго дня,"
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "Приховати відповіді"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "Відповідь"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "Додати відповідь..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "Значення не може бути порожнім і має бути не більше 150 символів."
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "Це публічна група"
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "Неможливо змінити файл."
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "Вихід"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "Це публічна група"
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "Бібліотеки"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "Wiki"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "Файли"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "Учасники"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "Адміністратор"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "Вийти з групи"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "Ви впевнені що хочете вийти з групи?"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "Додати обговорення..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "Додати файл"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "Після авторизації Ви можете брати участь в обговореннях."
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "Назад"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "Вперед"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑ Вгору"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "Ви дійсно хочете видалити це обговорення?"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "Так"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "Ні"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "Успішно видалено"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "Не вдалося видалити: "
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "Невдало."
 
@@ -1484,6 +1582,7 @@ msgid "Recent Changes"
 msgstr "Недавні зміни"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1492,77 +1591,58 @@ msgstr "Нова бібліотека"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "Опис"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "Останнє оновлення"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "Доступно для"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "Значок каталогу"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "Завантажити та синхронізувати"
 
@@ -1578,7 +1658,7 @@ msgstr "Завантажити та синхронізувати"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "Закрити спільний доступ"
 
@@ -1615,15 +1695,16 @@ msgid "Modified at"
 msgstr "Модифіковано у "
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "Модифіковано"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1632,23 +1713,23 @@ msgid "Details"
 msgstr "Деталі"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "Ні"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "Не визначено"
 
@@ -1667,15 +1748,43 @@ msgstr "Пароль: "
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "Пароль буде зберігатися на сервері протягом 1 години."
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "Скасувати спільний доступ до бібліотеки"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "Ви впевнені, що хочете заборонитиспільний  доступ до %s ?"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "Значок каталогу"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "Немає загальнодоступних бібліотек у цій групі"
@@ -1692,14 +1801,25 @@ msgid ""
 "message: "
 msgstr "%(user)s хоче вступити в групу \"%(group_name)s\". Повідомлення для перевірки: "
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "Дякуємо за використання нашого сайту!"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Команда %(site_name)s"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "Адміністратори"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -1707,7 +1827,7 @@ msgstr "Налаштування"
 msgid "Add Members"
 msgstr "Додати учасників"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "Додати Адміністраторів"
 
@@ -1716,7 +1836,7 @@ msgid "Avatar"
 msgstr "Аватар"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "Змінити"
 
@@ -1735,7 +1855,7 @@ msgid "Make Public"
 msgstr "Опублікувати"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "Перенесення"
 
@@ -1759,29 +1879,41 @@ msgstr "Врахуйте: email повинен бути вже зареєстр
 msgid "Rename Group To"
 msgstr "Змінити назву групи на "
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "Виключити групу"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "Ви дійсно хочете видалити цю групу?"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "Видалити учасника"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "Дійсно хочете видалити %s ?"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "Вихід"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "Додати в контакти"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "Вийти з групи"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "Ви впевнені що хочете вийти з групи?"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "Приєднатися до групи"
@@ -1808,12 +1940,29 @@ msgstr "Користувачі: "
 msgid "Verification Message"
 msgstr "Перевірочне повідомлення"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr "Індекс Wiki"
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "Створити"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "Для цієї групи в даний час немає wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1821,82 +1970,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile wiki дозволяє вам організувати базу знань. Зміст wiki зберігається як звичайна бібліотека в структурі зумовленого файлу або каталогу. Це дозволяє редагувати wiki на робочому столі, а потім синхронізувати з сервером."
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "Створити Wiki зараз"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr "Оберіть бібліотеку для wiki"
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "Створити Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wiki сторінки"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr "Оберіть бібліотеку для wiki:"
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "Будь ласка, клікніть та оберіть бібліотеку."
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "Головна"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "Сторінки"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki історія"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "Нова сторінка"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "Видалити сторінку"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "Редагувати сторінку"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "Сторінка історії"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "Остання модифікація: %(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr "Ви впевнені, що бажаєте видалити сторінку?"
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "Потрібене старе ім'я"
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "Потрібен опис бібліотеки"
 
@@ -1943,10 +2115,12 @@ msgstr "Додати користувачів"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "Введення"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "email(и), розділені ','"
 
@@ -1962,7 +2136,8 @@ msgstr "Врахуйте: email повинен бути вже зареєстр
 msgid "Add administrators"
 msgstr "Додати Адміністраторів"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "Будь ласка, введіть електронну пошту, або виберіть деякі."
 
@@ -2241,135 +2416,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Сервери Seafile не зберігають пароль до зашифрованої бібліотеки. Щоб переглянути зашифровану бібліотеку онлайн, вам потрібно надати пароль до бібліотеки. Ваш пароль зберігаєтся тільки в зашифрованій пам'яті серверу. Його буде видалено з пам'яті за годину. Після цього, якщо ви бажаете переглянути бібліотеку, вам знову потрібно ввести пароль."
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "потрібно повідомлення"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "потрібен контакт"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "Ви не можете посилати повідомлення самому собі."
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "Неможливо надіслати повідомлення для %s, користувач не знайдений."
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "Повідомлення"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "Нове повідомлення"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "Повідомлення"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "Час"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "Повідомлення ..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "Додати файл"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "щоб надіслати: клікніть для вибору контактів"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "спочатку виберіть контакти"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "Неможливо отримати ваші контакти для відправки повідомлення."
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "Ви ще не позначили жодного файлу"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "Повідомлення від %(name)s"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "Надіслати повідомлення..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "Файл %(file_name)s було завантажено до вашого каталогу %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s надав вам доступ до бібліотеки %(repo_name)s."
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s надав вам доступ до файла %(file_name)s."
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "Отримано нове повідомлення від %(user)s."
+msgid "You have received a new message from %(user)s."
+msgstr "Ви отримали нове повідомлення від %(user)s."
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s відкрито нове обговорення"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s опублікував нове обговорення в %(group_name)s"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "групове обговорення має нову відповідь"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s відповів у груповому обговоренні"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s зап
 msgid "Successfully cleared all notices."
 msgstr "Всі записи успішно видалені."
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "Додати нове повідомлення"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr ""
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr ""
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "Всі повідомлення"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "Додати нове повідомлення"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "Повідомлення докладно"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "(поточне повідомлення)"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "Встановити як поточне"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "Пусто"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "Видалити Повідомлення"
 
@@ -2432,27 +2612,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "Будь ласка оберіть яким чином переглядати зашифровані бібліотеки онлайн:"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "Надсилати паролі на сервер."
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "Файли буде розшифровано на сервері перед відправкою до вас."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "Зберігати паролі у вашому браузері."
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "Файли буде розшифровано у вашому браузері під час завантаження."
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2484,81 +2664,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "\"%s\" успішно призначена вашою бібліотекою за замовчанням."
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "Налаштування профілю"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "Профіль"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr "Мова"
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "Зашифровані бібліотеки"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "Суб-бібліотека"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "Бібліотека за замовчанням"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "Видалити контакт"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "Аватар:"
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "Пароль: "
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "Оновити"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "Про себе: "
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "Відділ:"
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "Телефон:"
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr "Встановлення мови"
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "Налаштування зашифрованих бібліотек"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "Як переглядати зашифровані бібліотеки онлайн:"
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "Налаштування суб-бібліотеки"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "Активувати суб-бібліотеку"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2567,7 +2754,7 @@ msgid ""
 "library."
 msgstr "Ця опція дозволяє вам вибірково синхронізувати каталоги всередині бібліотеки. Суб-бібліотека може бути створена з будь якого каталогу. Після створення вона потрапить до списку у вашому клієнті на комп'ютері і ви матимете змогу завантажити її так само як і звичайну бібліотеку. Вона буде автоматично синхронізуватися з батьківською бібліотекою."
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2575,37 +2762,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "Суб-бібліотека також використовується при наданні спільного доступу до каталогу групі або іншому користувачеві. З увімкненою опцією ці приховані суб-бібліотеки також потраплять до ваших списків, що дозволить вам працювати з ними."
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "Налаштування бібліотеки за замовчанням"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "Бібліотека за замовчанням:"
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "Бібліотека за замовчанням - це місце за замовчанням, куди зберігаються ваші особисті документи і зображення."
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "Оберіть бібліотеку за замовчанням"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "Цю операцію неможливо скасувати. Будь ласка, подумайте двічі!"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "Обрати бібліотеку за замовчанням:"
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "Будь ласка, клікніть та оберіть бібліотеку."
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "Дійсно хочете видалити %s ?"
 
@@ -2618,25 +2801,25 @@ msgid "Info"
 msgstr "Інформація"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "Им'я"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "Про себе"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "Відділ:"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "Телефон:"
 
@@ -2644,169 +2827,171 @@ msgstr "Телефон:"
 msgid "Email is not longer than 512 characters"
 msgstr "E-mail не довше 512 символів"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "Неможливо відкрити спільний доступ для всіх учасників. Повторіть спробу пізніше."
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "Успішно надано спільний доступ для всіх учасників, для перевірки.  Перейдіть до Спільного доступу."
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\" вже в групі %(group)s. Переглянути"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "Спільний доступ не надано %(repo)s у %(group)s, повторіть спробу пізніше."
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "Спільний доступ успішно надано для %(group)s для перевірки перейдіть до Спільний доступ."
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "Ви не можете відкрити спільний доступ самому собі"
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "Не вдалося відкрити спільний доступ %s, будь ласка, повторіть спробу пізніше."
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "Спільний доступ %(email)s успішно наданий, для перевірки перейдіть доСпільний доступ."
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "Не вдалося відкрити спільний доступ %s, такий email не зареєстрований."
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "Тільки власник бібліотеки має право дати спільний доступ до неї."
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "Спільний доступ до \"%s\" не можливий, тому що обмежений квотою. Оновлення облікового запису."
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "Аргумент неприпустимий"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "Не вдалося закрити спільний доступ"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "ідентифікатор групи не є дійсним"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "Спільний доступ успішно закрито"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "усі учасники"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "Неприпустимі аргументи"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "У вас немає доступу до цієї бібліотеці"
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "Помилка при отриманні посилання. Будь ласка, повторіть пізніше."
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "Успішно виключено"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "Група не існує"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "Відправка посилання до спільного доступу не вдалося. Послуги електронної пошти не налаштовані належним чином. Будь ласка, зв'яжіться з адміністрацією."
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "Ваш друг дав вам спільний доступ до файу на Seafile"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "Внутрішня помилка серверу. Надіслати не вдалося."
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "Успішно надіслано."
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "Будь ласка, оберіть каталог."
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "Успішно збережено."
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "Неможливо надіслати повідомлення для %s, користувач не знайдений."
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "Успішно відкрито доступ до %s."
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "Успішно закритий доступ до \"%s\"."
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "У вас немає дозволу на доступ до %s."
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "У вас немає дозволу на доступ до %s."
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "Помилка при отриманні посилання. Будь ласка, повторіть пізніше."
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "Відправка посилання до спільного доступу не вдалося. Послуги електронної пошти не налаштовані належним чином. Будь ласка, зв'яжіться з адміністрацією."
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "Ваш друг надав вам спільний доступ до файлу на Seafile"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr ""
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2827,14 +3012,15 @@ msgstr "Відвідування"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "Перегляд"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "Виключено"
 
@@ -2863,7 +3049,7 @@ msgid "Folders - Share"
 msgstr "Каталоги - Спільний доступ"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "Каталоги"
 
@@ -2888,13 +3074,13 @@ msgid ""
 msgstr "Ви можете відкрити спільний доступ до окремого каталогу для зареєстрованого користувача, якщо не бажаєте відкривати доступ до всієї бібліотеки."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "Редагування успішне."
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "Редагування не успішне."
@@ -2961,7 +3147,7 @@ msgstr "Спільнодоступні"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "Базова інформація"
 
@@ -2974,7 +3160,8 @@ msgid "Add to contacts"
 msgstr "Додати в контакти"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "Залишити спільний доступ"
 
@@ -2995,56 +3182,24 @@ msgstr "Дії"
 msgid "Exit System Admin"
 msgstr "Вийти з консолі адміністратора"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "Користувачі"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "Сповіщення"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "Посилання"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "Системний адміністратор"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "непрочитані повідомлення"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "Вхід"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "Реєстрація"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "Вихід"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "Версія серверу: "
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "Системний адміністратор"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "Seafile"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "Зворотній зв'язок"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "Всі групи"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "Клієнти"
 
@@ -3052,7 +3207,7 @@ msgstr "Клієнти"
 msgid "Client Name"
 msgstr "Ім'я клієнта"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3093,28 +3248,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "Ця бібліотека зашифрована. Введіть пароль, якщо ви хочете її переглянути.пароль буде зберігатися на сервері тільки протягом 1 години."
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "Пароль: "
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "Ви можете змінити режим онлайн перегляду зашифрованих бібліотек here."
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "Будь ласка, введіть пароль"
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr "Пристрої"
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr "Платформа"
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr "Назва приладу"
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr "Останній доступ"
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr "# Біблотеки"
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr "Операція"
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr "Посилання видалено "
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr "Дійсно хочете видалити посилання  %s?"
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr "Синхронізація буде негайно припинена."
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr "Ви не маєте підключених пристроїв"
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr "Ваш клієнт   (Desktop/Android/iOS) буде наведено нижче."
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr "Успішно розсинхронізовано."
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3124,8 +3331,7 @@ msgstr "Завантажити"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "Поточний шлях: "
 
@@ -3440,9 +3646,9 @@ msgid "Password is required."
 msgstr "Потрібен пароль."
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "Історія"
@@ -3461,16 +3667,11 @@ msgstr "Врахуйте: нова версія буде генеруватис
 msgid "Current Path:"
 msgstr "Поточний шлях:"
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "Автор зміни"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "Розмір"
 
@@ -3478,38 +3679,55 @@ msgstr "Розмір"
 msgid "(current version)"
 msgstr "(поточна версія)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr "(Перейменовані або переміщені з %(old_path)s)"
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "Відновити"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "Різниця"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "Документи"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "Про систему"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "Допомога"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "Програма-клієнт"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Завантажити для Windows, Mac або Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "Версія серверу: "
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "Seafile"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "Зворотній зв'язок"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3538,12 +3756,13 @@ msgstr "кошик"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "Назад до бібліотеки"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3558,36 +3777,57 @@ msgstr "Особисті"
 msgid "Starred"
 msgstr "Позначені"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "Персональна Wiki"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "Спільний доступ"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "Посилання"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "Група"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "Жодна бібліотека не надана вашим групам у спільний доступ"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "Жодна бібліотека не надана вам у спільний доступ"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "Ласкаво просимо до Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile організує файли в бібліотеках. Кожна бібліотека може бути синхронізована і надана у спільний доступ окремо. Ми створили персональну бібліотеку для вас. В подальшому ви можете створювати інші бібліотеки."
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "Закрити"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "Моя сторінка"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "Спільноти"
@@ -3598,11 +3838,11 @@ msgid ""
 "current account."
 msgstr "Спільноти будуть видалені в наступній версії, дані будуть внесені в ваш поточний обліковий запис."
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3624,420 +3864,452 @@ msgstr "Ніхто не створив жодної групи"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "Щоб створити групу, клікніть \"Нова група\" в розділі \"Групи\"."
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "Загальний доступ від"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "Немає публічних бібліотек"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "Ви можете створити публічну бібліотеку натиснувши кнопку \"Нова бібліотека\", інші користувачі зможуть переглядати і завантажувати цю бібліотеку."
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "Кошик"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr "Пошук учасників..."
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "Розмір: "
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "Кошик"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "Перемістити"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "Копіювати"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "Завантажити файл"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "Власник цієї бібліотеки перевищив допустимий ліміт."
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "Будь ласка, виберіть файл в першу чергу."
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "Додати файл"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "Позначити"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "Вихід"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "Перетягування підтримується Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "Розмір файлу повинен бути менше за %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "Збереження..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "Оновити файл %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "Вибрати файл"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "Менше, ніж %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "Новий каталог"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "Ім'я каталогу"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "Новий файл"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "Рекомендовані типи файлів"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "Натисніть для вибору"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "Онлайновий Rich Text формат."
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "формат простий розмітки."
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "Файл"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "Поточна бібліотека"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "Інші бібліотеки"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "Клікніть для вибору каталогу"
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "Rename у %(name)s"
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "Синхронізувати %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "Суб-бібліотека буде створена з цього каталогу. Вона буде відображатися у вашому клієнті і ви матимете змогу завантажити ії так само як і звичайну бібліотеку."
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "Створити"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "Ця бібліотека зашифрована. Введіть пароль, якщо ви хочете її переглянути. Пароль буде зберігатися на сервері тільки протягом 1 години."
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "Файл занадто великий"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "Файл занадто малий"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "Заборонений тип файлів"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "Перевищення максимального числа файлів"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "Перевищення ліміту розміру файлу"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "Результат завантаження порожнього файлу"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "Помилка"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "Позначити"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "Видалити"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "Ви впевнені, що хочете видалити %s ?"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "Обробка ..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "Успішно видалено  %(name)s та %(amount)s інших"
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "Успішно видалено %(name)s."
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "Внутрішня помилка. Збій видалення  файлу %(name)s та %(amount)s інших ."
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "Внутрішня помилка. Файл %(name)s не видалений."
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "Перемістити вибрані каталоги/файли до:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "Копіювати вибрані каталоги/файли до:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "Невірний шлях призначення"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "Успішне переміщення %(name)s та %(amount)s інших."
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "Успішно переміщено %(name)s."
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "Успішне копіювання  %(name)s та %(amount)s інших"
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "Успішне копіювання %(name)s."
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "Внутрішня помилка. Не переміщено файл %(name)s та %(amount)s інших."
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "Внутрішня помилка. Файл %(name)s не переміщено."
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "Внутрішня помилка. Не виконано копіювання файлу %(name)s та %(amount)s інших."
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "Внутрішня помилка. Файл %(name)s не скопійовано."
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr "Переміщення..."
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr "Копіювання..."
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "Шифрування файлу..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "Помилка під час шифрування."
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "Шифрування, %(num)s% виконано."
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "Завантаження ..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "Виконано!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "Завантаження ..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "Завантаження, %(num)s% виконано."
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "Розшифрувати ..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "Розшифрування, %(num)s% закінчено."
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "Успішно видалено %(name)s"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "Перейменувати файл"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "Перейменувати каталог"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "Копіювати"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "Перемістити"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "Каталог"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "Переміщено каталогів"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "у %(name)s"
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "Перемістити %(name)s  до: "
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "Завантаження каталогу не підтримується у цій бібліотеці."
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "Зняти відмітку"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "Позначити"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "Суб-бібліотеку створено."
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "Потрібен Email."
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "Тут тільки розширення, будь ласка, введіть значення."
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "Витяг ..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "Ви ще не завантажили"
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "Успішне перейменування%(old_name)s до %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "Будь ласка, оберіть принаймні один контакт."
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "Будь ласка, введіть emails, або назви груп, або що небудь."
 
@@ -4059,11 +4331,12 @@ msgstr "Врахуйте: знімок буде створюватись піс
 msgid "View Snapshot"
 msgstr "Перегляд знімка"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "На сторінку: "
@@ -4104,34 +4377,78 @@ msgstr "все"
 msgid "Delete Time"
 msgstr "Видалити час"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "Налаштування бібліотеки"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "Зберігати повну історію"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "Не зберігати історію"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "Зберегти лише період історії: "
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "днів"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "Передавати право власності"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "Передавати бібліотеку іншому користувачу."
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr "Змініть пароль цієї бібліотеки:"
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr "Новий пароль дуже короткий"
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr "Новий пароль дуже довгий (максимум 35 символів)"
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr "Будь ласка, введіть знову новий пароль "
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr "Нові паролі не співпадають"
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "Назад до історії версій"
@@ -4140,6 +4457,10 @@ msgstr "Назад до історії версій"
 msgid "Create Time"
 msgstr "Дата створення"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "Автор зміни"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4182,8 +4503,14 @@ msgstr "Ваш клієнт Seafile застарів, будь ласка, по
 msgid "Click to download."
 msgstr "Клікніть для завантаження"
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "Спільний доступ: "
 
@@ -4195,25 +4522,26 @@ msgstr "Зберегти до..."
 msgid "Save To:"
 msgstr "Записати до:"
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "Ви отримали цей лист, тому що %(email)s надав вам спільний доступ до файлу на %(site_name)s."
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "Будь ласка, перейдіть на сторінку і подивіться файл: "
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "Ви отримали цей e-mail тому що %(email)s надав вам посилання з правами запису на %(site_name)s."
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "Ви можете перейти до наступної сторінки та завантажити ваші файли:"
 
@@ -4225,8 +4553,8 @@ msgstr "Позначки"
 msgid "icon"
 msgstr "іконка"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "Зняти відмітку"
 
@@ -4281,18 +4609,18 @@ msgstr "для"
 msgid "Sorry, this user is not registered yet."
 msgstr "На жаль, цей користувач не зареєстрований."
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "Позначити"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "оновити цей файл"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
@@ -4300,31 +4628,31 @@ msgstr[0] " %(counter)s учасник"
 msgstr[1] " %(counter)s учасника (ів)"
 msgstr[2] " %(counter)s учасника (ів)"
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "Відмітка успішно знята"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "Успішно відзначено"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "Ви також можете натиснути ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "Попередній"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "Ви також можете натиснути → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "Вперед"
 
@@ -4343,7 +4671,7 @@ msgid "auto detect"
 msgstr "автовизначення"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   / "
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "Повний екран"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "Завантаження ..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "Ви можете використати IE 10 або інші браузери, наприклад, Firefox, для перегляду в режимі он-лайн."
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "Для перегляду в режимі он-лайн, ви можете використовувати Firefox, Chrome абоIE 9."
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "Цей тип файлу не може бути переглянутий в режимі он-лайн."
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4390,41 +4718,55 @@ msgstr "Завантажити файли до %(dir_n
 msgid "shared by:"
 msgstr "надано:"
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "Вхід"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "(забув пароль)"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "CAPTCHA"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "Не видно? Поновіть."
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "Неправильний email або пароль"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "Пам’ятати мене %(remember_days)s діб"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "Реєстрація"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "Не вдалося поновити CAPTCHA, спробуйте ще раз."
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "E-mail не може бути порожнім"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "Пароль не може бути порожнім"
 
@@ -4478,13 +4820,13 @@ msgstr "Пароль успішно змінено."
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "Змінити пароль"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "Введіть новий пароль"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4495,23 +4837,19 @@ msgid "Password Reset Successfully"
 msgstr "Пароль успішно змінено"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "Ми відправили лист про зміну пароля на електронну пошту."
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "Ви отримали цей лист, тому що ви змінили свій пароль на сайті %(site_name)s. "
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "Будь ласка, перейдіть на наступну сторінку і введіть новий пароль:"
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "Ваше ім'я користувача, якщо ви забули:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4541,23 +4879,31 @@ msgstr "Реєстрація завершена. Зачекайте актива
 msgid "Register"
 msgstr "Зареєструвався"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "Ласкаво просимо! Ви вже увійшли в систему."
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "Підтвердіть пароль"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "Будь ласка підтвердіть пароль"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "Паролі не збігаються"
 
@@ -4577,12 +4923,6 @@ msgstr "дуже великий. Дозволений максимальний 
 msgid "Discuss"
 msgstr "Обговорення"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "Група"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "Будь ласка, виберіть принаймні, одну групу."
@@ -4591,10 +4931,6 @@ msgstr "Будь ласка, виберіть принаймні, одну гр
 msgid "Please input a discussion."
 msgstr "Будь ласка, почніть обговорення."
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "Створено за допомогою системи"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4613,42 +4949,66 @@ msgstr "Посилання з правами запису"
 msgid "Private Share"
 msgstr "Приватний спільний доступ"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "Підтвердіть пароль"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "Створити"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "Посилання: "
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "Надіслати"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "Надіслати: "
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "Email (и), розділені ','"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "Відправка ..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "Ви можете передати згенеровані посилання іншим, і вони матимуть змогу завантажувати файли до цього каталогу."
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "Посилання з правами запису:"
 
@@ -4701,7 +5061,7 @@ msgid "Sub-libraries"
 msgstr "Суб-бібліотеки"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "Спільні"
 
@@ -4732,29 +5092,23 @@ msgid ""
 " library."
 msgstr "Ви можете створити суб-бібліотеку з каталогу всередині бібліотеки. Суб-бібліотеку можна надавати у спільний доступ та синхронізувати незалежно. Файли суб-бібліотеки будуть автоматично синхронізовані з файлами в каталозі батьківської бібліотеки."
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "Жодна бібліотека не надана вам у спільний доступ"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "Жодна бібліотека не надана вашим групам у спільний доступ"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "Файл обробляється, будь ласка, почекайте ..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "приховати контур"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "показати контур"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "Помилка конвертації."
 
@@ -4771,27 +5125,29 @@ msgstr "Шифрувати"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(не менше %(repo_password_min_length)s символів)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "Підтвердіть пароль"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "Потрібене старе ім'я"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "Потрібен опис бібліотеки"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "Будь ласка, введіть пароль"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "Пароль дуже короткий"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "Пароль дуже довгий (максимум 35 символів)"
 
@@ -4804,7 +5160,7 @@ msgstr "Видалення виконано успішно."
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "Дійсно хочете видалити %(lib_name)s  ?"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "Завантажити"
 
@@ -4931,15 +5287,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "Будь ласка, оберіть принаймні 1 тип файлу або введіть не менше 1 розширення файлу"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "Вибрати контакти"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "Будь ласка, введіть принаймні, email."
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4952,7 +5316,7 @@ msgstr "Мною"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "У загальному доступі"
 
@@ -4964,6 +5328,22 @@ msgstr "Трафік в цьому місяці:"
 msgid "Payment"
 msgstr "Оплата"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "Користувачі"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "Сповіщення"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "Перенос бібліотеки"
@@ -4974,74 +5354,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "Передано %(lib_name)s до:"
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "Власник"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "Всі групи"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "Автор"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "Створити як"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "Видалити групу"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "База даних"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "Пошук"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "Створено / Останній вхід"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "Дисковий простір, що використовується"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "Всі"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "Висячий рядок"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "Система"
 
@@ -5057,96 +5437,117 @@ msgstr "Префикс URL"
 msgid "Delete Organization"
 msgstr "Видалити спільноту"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "Всі публічні посилання"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "Count"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "Пошук бібліотеки"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "Підказка: Ви можете здійснювати пошук за ключовими словами в імені або власника чи обох."
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "Результат"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "Немає результату"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "Додати нового користувача"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "Активація..., зачекайте будь ласка"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "Паролі не співпадають"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "Ви отримали цей лист, тому що %(user)s додав вас до спільноти \"%(org.org_name)s\" на сайті %(site_name)s."
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "Ви отримали цей лист, тому що %(user)s додав вас на сайт %(site_name)s."
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "Нижче наводиться інформації про обліковий запис: "
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "E-Mail: %(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "Пароль: %(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "Для входу, перейдіть будь ласка на сторінку: "
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "Ви отримали цей лист, тому що штатно, в цілях безпеки, був змінений ваш пароль на сайті %(site_name)s."
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "Ваш новий пароль %(password)s, будь ласка, змініть пароль, як тільки у вас буде можливість."
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "Пошук користувача"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "Порада: Використовуйте * відповідно до будь-якої кількісті символів."
 
@@ -5160,7 +5561,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "Ви впевнені, що хочете змінити пароль %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "Відкликати Адміністратора"
 
@@ -5170,7 +5571,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "Ви впевнені, що хочете відкликати права адміністратора %s ?"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "Призначити адміністратора"
 
@@ -5189,437 +5589,466 @@ msgid ""
 "configuration."
 msgstr "Пароль успішно змінено, але повідомлення не було відправлено, будь ласка, перевірте налаштування електронної пошти."
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "Статус"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "Активний"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "Змінити пароль"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "Всього"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "Використовується"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "Встановити квоту"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "Встановіть ліміт кількості даних користувача"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "Врахуйте: 0 - без обмежень (за замовчуванням)"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "Належить"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "У вас немає особистої wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "персональна wiki"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "Персональні Wiki сторінки"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "помилка прав доступу"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "Не вдається переглянути сторінку"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "Бібліотека не існує"
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "у вас немає дозволу на відновлення бібліотеки"
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "Не вдається переглянути бібліотеку"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "Не вдалося зберегти налаштування на сервері"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "Налаштування збережені."
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "Ім’я користувача %s неприпустиме."
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "Користувача  %s не знайдено."
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "Бібліотека  %(repo_name)s була передана до %(new_owner)s."
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr "Вдало змінено пароль до бібліотеки %(repo_name)s."
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "Назва файлу містить неприпустимий символ"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "Дублікат файлу"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "Розмір файлу перевищує ліміт"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "Дисковий простір власника вичерпано, завантаження не вдалася"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "Сталася помилка під час передачі файлів"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "Неправильний URL"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "Не вдається переглянути бібліотеку"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "Не вдається переглянути бібліотеки snapshots"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "у вас немає прав на відновлення бібліотеки"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "Будь ласка визначте ID історії"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "Бібліотека не існує"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "Вказана історія не існує"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "Немає конфлікту при злитті."
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "Моя бібліотека"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "Не вдалося заборонити спільне використання бібліотек, оскільки де вони існує."
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "Заборонено спільне використання \"%s\"."
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "Не вдалося заборонити спільне використання \"%s\"."
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "Не вдалося видалити файл."
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s успішно видалено."
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "Внутрішня помилка. Файл %s не видалено."
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "Неможливо отримати доступ до файлу."
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "Не вдалося завантажити бібліотеку, неможливо знайти сервер."
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "Невірні налаштування сервера."
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Успішно відновлено %(path)s до основної директорії."
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "Успішно відновлено %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "Успішно відновлено %(path)s до основної директорії."
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "Внутрішня помилка"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "Не вдається завантажити каталог \"%s\": занадто великий розмір."
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "Не вдається завантажити \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "Успішно закритий доступ до \"%s\"."
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "Успішно закритий доступ до \"%s\"."
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "У вас немає дозволу на доступ до бібліотеки."
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "No path."
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "Група не існує"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "Доступ заборонено"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "Бібліотека зашифрована."
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "Error: no head commit id"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "Аргумент пропущений."
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "Шлях призначення занадто довгий."
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "Успішне переміщення %(name)s переглянути"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "Успішне копіювання %(name)s переглянути"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "Не можливо перемістити каталог %(src)s до свого підкаталогу %(des)s"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "Не моливо зробити копію каталогу %(src)s до свого підкаталогу %(des)s"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "Шлях призначення занадто довгий  для %s."
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "Збій отримання переліку бкованих файлів."
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "Невірний repo id"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr "Системна бібліотека не може  бути видалена."
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTP помилка: файл не може бути відкритий в он-лайн режимі."
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URL помилка: файл не може бути відкритий в он-лайн режимі."
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "Обраний режим шифрування не є правильним."
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "Шевідомий алгоритм шифрування файлу."
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "Розмір файлу перевищує %s, і не може бути відкритий в онлайн режимі."
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "Не вдається переглянути файл"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "Невірний формат файла."
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "Бібліотека не існує."
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "Бібліотека зашифрована."
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "Неможливо редагувати файл."
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "Файл не існує."
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "Редагування онлайн не передбачається для цього типу файлів."
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "Не вдалося встановити квоту: внутрішня помилка"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "Успішно видалено %s"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "Не вдалося видалити: користувач не існує"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "%s успішно призначений адміністратором"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "Не вдалося призначити адміністратора: користувач не існує"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "Права адміністратора %s успішно відкликані"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "Не вдалося відкликати адміністратора: користувач не існує"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "Успішно активовано %s."
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "Неможливо активувати: користувач не існує."
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "Успішно деактивовано %s."
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "Неможливо деактивувати: користувач не існує."
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "Пароль успішно змінено на %(passwd)s, повідомлення було надіслано %(user)s."
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "Пароль успішно змінено на %(passwd)s, але повідомлення не було надіслано %(user)s, будь ласка, перевірте налаштування електронної пошти."
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "Пароль успішно змінено на %(passwd)s для користувача %(user)s."
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5627,47 +6056,53 @@ msgid ""
 "configured."
 msgstr "Пароль успішно змінено на %(passwd)s для користувача %(user)s. Але повідомлення не було надіслано, бо не правильно налаштована поштова служба."
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "Не вдалося змінити пароль: користувач не існує."
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Реєстраційна інформація Seafile"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "Успішно додано користувача %s. Повідомлення було надіслано електронною поштою."
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "Успішно додано користувача %s. Але сталася помилка при відправці email, будь ласка, перевірте налаштування email."
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "Успішно доданий користувач %s."
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "Успішно доданий користувач %s. Але повідомлення не було надіслано, томущо неправильно налаштована поштова служба."
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "Успішно передано."
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "Неможливо наділати повідомлення для %s, користувач не знайдений."
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "Не вдалося передати, неприпустимі аргументи."
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 3b886ac204..20136eba32 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,21 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-15 12:04+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-21 03:14+0000\n"
+"Last-Translator: xiez \n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/seahub/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
@@ -52,7 +52,7 @@ msgstr "名称 %s 含有无效字符"
 #: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
 #: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
 #: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
-#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1144
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
 #: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
 #: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
@@ -91,7 +91,7 @@ msgstr "密码不能为空"
 msgid "Bad url format"
 msgstr "错误的 url 格式"
 
-#: seahub/forms.py:153 seahub/templates/repo.html:348
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "密码错误"
 
@@ -252,7 +252,7 @@ msgstr "讨论"
 #: seahub/templates/repo_recycle_view.html:78
 #: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
-#: seahub/templates/snippets/repo_dirents.html:54
+#: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
 msgstr "文件"
 
@@ -300,24 +300,24 @@ msgstr "加载中..."
 #: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:254
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:196
-#: seahub/message/templates/message/user_msg_list.html:178
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
 #: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
-#: seahub/templates/myhome.html:111 seahub/templates/myhome.html.py:138
-#: seahub/templates/repo.html:289 seahub/templates/repo.html.py:704
-#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1732
-#: seahub/templates/repo.html:1757 seahub/templates/repo.html.py:1786
-#: seahub/templates/repo.html:1892 seahub/templates/repo.html.py:1964
-#: seahub/templates/repo_settings.html:118
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
 #: seahub/templates/repo_settings.html:154
 #: seahub/templates/repo_settings.html:219
-#: seahub/templates/view_file_base.html:157
-#: seahub/templates/snippets/add_file_js.html:20
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
+#: seahub/templates/snippets/msg_form_js.html:30
 #: seahub/templates/snippets/office_convert_js.html:177
 #: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
@@ -328,7 +328,7 @@ msgstr "加载中..."
 #: seahub/templates/snippets/shared_link_js.html:437
 #: seahub/templates/snippets/shared_link_js.html:462
 #: seahub/templates/snippets/spreadsheet_convert_js.html:32
-#: seahub/templates/sysadmin/sys_useradmin.html:130
+#: seahub/templates/sysadmin/sys_useradmin.html:132
 #: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "操作失败。请检查网络是否已连接。"
@@ -443,8 +443,8 @@ msgstr "密码"
 
 #: seahub/auth/forms.py:39
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct username and password. Note that both fields are "
+"case-sensitive."
 msgstr "请输入正确的用户名和密码。字母请注意区分大小写。"
 
 #: seahub/auth/forms.py:41
@@ -579,10 +579,9 @@ msgstr "请选择要删除的头像。"
 #: seahub/avatar/templates/avatar/confirm_delete.html:11
 #, python-format
 msgid ""
-"You have no avatars to delete. Please upload one now."
-msgstr ""
-"你还没有上传自己的头像。现在 上传一个。"
+"You have no avatars to delete. Please upload one now."
+msgstr "你还没有上传自己的头像。现在 上传一个。"
 
 #: seahub/avatar/templates/avatar/confirm_delete.html:18
 msgid "Delete These"
@@ -616,8 +615,7 @@ msgstr "当前头像："
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
 #: seahub/group/templates/group/new_msg_reply.html:67
-#: seahub/message/templates/message/all_msg_list.html:47
-#: seahub/message/templates/message/all_msg_list.html:59
+#: seahub/message/templates/message/all_msg_list.html:51
 #: seahub/message/templates/message/user_msg_list.html:21
 #: seahub/message/templates/message/user_msg_list.html:33
 #: seahub/notifications/templates/notifications/notification_list.html:14
@@ -629,11 +627,11 @@ msgstr "当前头像："
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:52 seahub/templates/myhome.html:56
-#: seahub/templates/repo.html:63 seahub/templates/repo.html.py:113
-#: seahub/templates/repo.html:143 seahub/templates/repo.html.py:167
-#: seahub/templates/repo.html:188 seahub/templates/repo.html.py:204
-#: seahub/templates/repo.html:219 seahub/templates/repo_settings.html:31
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
 #: seahub/templates/repo_settings.html:39
 #: seahub/templates/repo_settings.html:53
 #: seahub/templates/share_access_validation.html:10
@@ -674,7 +672,7 @@ msgstr ""
 msgid "You have updated your avatar %(avatar)s."
 msgstr ""
 
-#: seahub/avatar/templatetags/avatar_tags.py:58
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr ""
 
@@ -774,8 +772,8 @@ msgstr "系统自动合并修改"
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
 #: seahub/group/templates/group/group_discuss.html:154
-#: seahub/templates/repo.html:1604
-#: seahub/templates/snippets/my_owned_repos.html:137
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "刚才"
 
@@ -821,11 +819,11 @@ msgstr[0] "%(seconds)d 秒前"
 #: seahub/templates/pubrepo.html.py:29
 #: seahub/templates/snippets/my_group_repos.html:25
 #: seahub/templates/snippets/my_group_repos.html:28
-#: seahub/templates/snippets/my_owned_repos.html:36
-#: seahub/templates/snippets/my_owned_repos.html:38
-#: seahub/templates/snippets/my_owned_repos.html:82
-#: seahub/templates/snippets/my_owned_repos.html:84
-#: seahub/templates/snippets/my_owned_repos.html:134
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
 #: seahub/templates/snippets/my_shared_repos.html:17
 #: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
@@ -927,9 +925,9 @@ msgstr "邮箱"
 #: seahub/templates/view_shared_dir.html:27
 #: seahub/templates/registration/registration_form.html:13
 #: seahub/templates/snippets/my_group_repos.html:8
-#: seahub/templates/snippets/my_owned_repos.html:27
-#: seahub/templates/snippets/my_owned_repos.html:74
-#: seahub/templates/snippets/my_owned_repos.html:128
+#: seahub/templates/snippets/my_owned_repos.html:20
+#: seahub/templates/snippets/my_owned_repos.html:67
+#: seahub/templates/snippets/my_owned_repos.html:121
 #: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
 #: seahub/templates/snippets/repo_dir_data.html:40
@@ -972,9 +970,9 @@ msgstr "备注"
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
 #: seahub/templates/view_shared_dir.html:29
-#: seahub/templates/snippets/my_owned_repos.html:30
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:131
+#: seahub/templates/snippets/my_owned_repos.html:23
+#: seahub/templates/snippets/my_owned_repos.html:70
+#: seahub/templates/snippets/my_owned_repos.html:124
 #: seahub/templates/snippets/my_shared_repos.html:10
 #: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
@@ -1010,15 +1008,15 @@ msgstr "编辑"
 #: seahub/message/templates/message/user_msg_list.html:52
 #: seahub/notifications/templates/notifications/notification_list.html:33
 #: seahub/profile/templates/profile/set_profile.html:113
-#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:254
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
 #: seahub/templates/snippets/file_share_popup.html:55
 #: seahub/templates/snippets/file_share_popup.html:88
-#: seahub/templates/snippets/my_owned_repos.html:53
-#: seahub/templates/snippets/my_owned_repos.html:101
-#: seahub/templates/snippets/my_owned_repos.html:143
-#: seahub/templates/snippets/repo_dirents.html:32
-#: seahub/templates/snippets/repo_dirents.html:86
+#: seahub/templates/snippets/my_owned_repos.html:46
+#: seahub/templates/snippets/my_owned_repos.html:94
+#: seahub/templates/snippets/my_owned_repos.html:136
+#: seahub/templates/snippets/repo_dirents.html:35
+#: seahub/templates/snippets/repo_dirents.html:89
 #: seahub/templates/sysadmin/repoadmin_table.html:24
 #: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
@@ -1414,17 +1412,15 @@ msgstr "输入不能为空且应少于2048个字符。"
 #: seahub/group/templates/group/group_info.html:131
 #: seahub/group/templates/group/group_wiki.html:62
 #: seahub/group/templates/group/new_msg_reply.html:68
-#: seahub/message/templates/message/all_msg_list.html:48
-#: seahub/message/templates/message/all_msg_list.html:60
+#: seahub/message/templates/message/all_msg_list.html:52
 #: seahub/message/templates/message/user_msg_list.html:22
 #: seahub/message/templates/message/user_msg_list.html:34
 #: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/myhome.html:57
-#: seahub/templates/repo.html:144 seahub/templates/repo.html.py:168
-#: seahub/templates/repo.html:189 seahub/templates/repo.html.py:196
-#: seahub/templates/repo.html:205 seahub/templates/repo.html.py:253
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
 #: seahub/templates/snippets/file_share_popup.html:63
 #: seahub/templates/snippets/file_share_popup.html:96
@@ -1474,6 +1470,7 @@ msgid "Members"
 msgstr "成员"
 
 #: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "管理"
 
@@ -1482,13 +1479,12 @@ msgid "Add a discussion..."
 msgstr "添加一个讨论..."
 
 #: seahub/group/templates/group/group_discuss.html:19
-#: seahub/message/templates/message/all_msg_list.html:49
+#: seahub/message/templates/message/all_msg_list.html:46
 #: seahub/message/templates/message/user_msg_list.html:23
 msgid "Add files"
 msgstr "添加文件"
 
 #: seahub/group/templates/group/group_discuss.html:25
-#: seahub/message/templates/message/all_msg_list.html:55
 #: seahub/message/templates/message/user_msg_list.html:29
 msgid "Choose a file or files:"
 msgstr "请选择一个或多个文件："
@@ -1530,40 +1526,40 @@ msgstr "下一页"
 msgid "↑Top"
 msgstr ""
 
-#: seahub/group/templates/group/group_discuss.html:271
-#: seahub/message/templates/message/user_msg_list.html:193
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "确定要删除这条讨论？"
 
-#: seahub/group/templates/group/group_discuss.html:271
-#: seahub/message/templates/message/user_msg_list.html:193
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 #: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
 #: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "确定"
 
-#: seahub/group/templates/group/group_discuss.html:271
-#: seahub/message/templates/message/user_msg_list.html:193
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 #: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
 #: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "取消"
 
-#: seahub/group/templates/group/group_discuss.html:286
-#: seahub/message/templates/message/user_msg_list.html:208
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "删除成功。"
 
-#: seahub/group/templates/group/group_discuss.html:288
-#: seahub/message/templates/message/user_msg_list.html:210
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "删除失败："
 
-#: seahub/group/templates/group/group_discuss.html:292
-#: seahub/message/templates/message/user_msg_list.html:214
-#: seahub/templates/repo.html:830 seahub/templates/repo.html.py:1718
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "操作失败"
 
@@ -1573,8 +1569,7 @@ msgstr "最近修改"
 
 #: seahub/group/templates/group/group_info.html:14
 #: seahub/templates/pubrepo.html:10
-#: seahub/templates/snippets/my_owned_repos.html:15
-#: seahub/templates/snippets/my_owned_repos.html:18
+#: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
 msgstr "新建资料库"
@@ -1591,8 +1586,8 @@ msgstr "新建资料库"
 #: seahub/templates/repo_history.html:23
 #: seahub/templates/repo_settings.html:19
 #: seahub/templates/snippets/my_group_repos.html:9
-#: seahub/templates/snippets/my_owned_repos.html:28
-#: seahub/templates/snippets/my_owned_repos.html:129
+#: seahub/templates/snippets/my_owned_repos.html:21
+#: seahub/templates/snippets/my_owned_repos.html:122
 #: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
@@ -1610,9 +1605,9 @@ msgstr "描述"
 #: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
 #: seahub/templates/starred.html:15
 #: seahub/templates/snippets/my_group_repos.html:10
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:76
-#: seahub/templates/snippets/my_owned_repos.html:130
+#: seahub/templates/snippets/my_owned_repos.html:22
+#: seahub/templates/snippets/my_owned_repos.html:69
+#: seahub/templates/snippets/my_owned_repos.html:123
 #: seahub/templates/snippets/my_shared_repos.html:8
 #: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
@@ -1630,9 +1625,9 @@ msgstr "共享来源"
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
 #: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
-#: seahub/templates/snippets/my_owned_repos.html:50
-#: seahub/templates/snippets/my_owned_repos.html:96
-#: seahub/templates/snippets/my_owned_repos.html:140
+#: seahub/templates/snippets/my_owned_repos.html:43
+#: seahub/templates/snippets/my_owned_repos.html:89
+#: seahub/templates/snippets/my_owned_repos.html:133
 #: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "下载和同步"
@@ -1661,17 +1656,14 @@ msgstr "还没有资料库共享到当前群组"
 msgid ""
 "You can share libraries by clicking the \"New Library\" button above or the "
 "\"Share\" icon on your libraries list."
-msgstr ""
-"你可以通过点击上方的“新建资料库”按钮或资料库列表里的“共享”图标来共享资料库。"
+msgstr "你可以通过点击上方的“新建资料库”按钮或资料库列表里的“共享”图标来共享资料库。"
 
 #: seahub/group/templates/group/group_info.html:65
 msgid ""
 "Libraries shared as writable can be downloaded and synced by other group "
 "members. Read only libraries can only be downloaded, updates by others will "
 "not be uploaded."
-msgstr ""
-"以可读写方式共享的资料库可以被其他群组成员下载和同步，而以只读方式共享的资料"
-"库只能被下载，其他人的修改将不会被上传。"
+msgstr "以可读写方式共享的资料库可以被其他群组成员下载和同步，而以只读方式共享的资料库只能被下载，其他人的修改将不会被上传。"
 
 #: seahub/group/templates/group/group_info.html:75
 #: seahub/group/templates/group/group_info.html:124
@@ -1767,11 +1759,11 @@ msgstr "确定要取消共享 %s 吗？"
 #: seahub/templates/snippets/my_group_repos.html:25
 #: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_group_repos.html:30
-#: seahub/templates/snippets/my_owned_repos.html:36
-#: seahub/templates/snippets/my_owned_repos.html:38
-#: seahub/templates/snippets/my_owned_repos.html:82
-#: seahub/templates/snippets/my_owned_repos.html:84
-#: seahub/templates/snippets/my_owned_repos.html:134
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
 #: seahub/templates/snippets/my_shared_repos.html:17
 #: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/my_shared_repos.html:22
@@ -1784,7 +1776,8 @@ msgid "No public library is in this group"
 msgstr "当前群组没有公开的资料库"
 
 #: seahub/group/templates/group/group_info_for_pub.html:47
-msgid "A library can be made public in its settings page.(Not implemented yet)"
+msgid ""
+"A library can be made public in its settings page.(Not implemented yet)"
 msgstr "一个资料库可以在设置页面设为公开。（未实现）"
 
 #: seahub/group/templates/group/group_join_email.html:2
@@ -1806,7 +1799,6 @@ msgid "The %(site_name)s team"
 msgstr "%(site_name)s 团队"
 
 #: seahub/group/templates/group/group_manage.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admins"
 msgstr "管理员"
 
@@ -1835,8 +1827,8 @@ msgid "Change"
 msgstr "修改"
 
 #: seahub/group/templates/group/group_manage.html:81
-#: seahub/templates/snippets/repo_dirents.html:33
-#: seahub/templates/snippets/repo_dirents.html:87
+#: seahub/templates/snippets/repo_dirents.html:36
+#: seahub/templates/snippets/repo_dirents.html:90
 msgid "Rename"
 msgstr "重命名"
 
@@ -1947,7 +1939,7 @@ msgid "No index now."
 msgstr "暂无索引"
 
 #: seahub/group/templates/group/group_wiki.html:16
-#: seahub/templates/wiki/personal_wiki.html:17
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
 msgid "Create"
 msgstr "创建"
 
@@ -1962,9 +1954,7 @@ msgid ""
 "contents of wiki is stored in a normal library with pre-defined file/folder "
 "structure. This enables you to edit your wiki in your desktop and then sync "
 "back to the server."
-msgstr ""
-"Seafile Wiki 能让你以一种非常简单的方式管理你的知识。Wiki 的内容以预定义的文"
-"件/目录结构存储在一个普通的资料库中，这样便可以在本地编辑，然后同步回服务器。"
+msgstr "Seafile Wiki 能让你以一种非常简单的方式管理你的知识。Wiki 的内容以预定义的文件/目录结构存储在一个普通的资料库中，这样便可以在本地编辑，然后同步回服务器。"
 
 #: seahub/group/templates/group/group_wiki.html:38
 #: seahub/templates/wiki/personal_wiki.html:34
@@ -2099,9 +2089,7 @@ msgstr "你还没有创建或参加群组"
 msgid ""
 "You can create a group by clicking \"New Group\" button. Group is a place "
 "for you and your friends leaving messages and collaborating on libraries."
-msgstr ""
-"你可以点击“新建群组”按钮来创建群组。在群组里，你可以和你的朋友交流，协同维护"
-"资料库。"
+msgstr "你可以点击“新建群组”按钮来创建群组。在群组里，你可以和你的朋友交流，协同维护资料库。"
 
 #: seahub/group/templates/group/groups_right_panel.html:34
 msgid "Group Name"
@@ -2135,7 +2123,7 @@ msgid "Add administrators"
 msgstr "添加管理员"
 
 #: seahub/group/templates/group/grpmember_add_js.html:33
-#: seahub/templates/sysadmin/sys_useradmin.html:165
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "请输入邮箱，或选择一些。"
 
@@ -2188,30 +2176,17 @@ msgstr "查看加密的资料库"
 
 #: seahub/help/templates/help/help_colab.html:8
 msgid ""
-"Once you and your friends sync a shared library onto your computers, you may "
-"add, delete or edit files in the library together.  Every change you make to "
-"the library will be automatically synced to others' computers."
-msgstr ""
-"一旦你和你的朋友们同步了一个共享的资料库到你们的电脑上，你们便可以一起添加，"
-"删除，或者修改这个资料库中的文件。你对该资料库的每个修改都将会自动同步到其他"
-"人的电脑上。"
+"Once you and your friends sync a shared library onto your computers, you may"
+" add, delete or edit files in the library together.  Every change you make "
+"to the library will be automatically synced to others' computers."
+msgstr "一旦你和你的朋友们同步了一个共享的资料库到你们的电脑上，你们便可以一起添加，删除，或者修改这个资料库中的文件。你对该资料库的每个修改都将会自动同步到其他人的电脑上。"
 
 #: seahub/help/templates/help/help_colab.html:10
 msgid ""
 "\n"
-"    Sometimes you and your friends may edit the same file at the same time. "
-"Your changes may conflict with each other's. In this case, Seafile would "
-"keep your version unchanged, while save your friends' versions as \"conflict "
-"files\". A conflict file's name ends with its author's email address, plus "
-"the current time, e.g. test.txt (name@example.com 2013-10-01-00-12-24).\n"
-"\t"
-msgstr ""
-"\n"
-"有时，你和你的朋友们可能同时编辑了同一个文件。你们的修改可能互相冲突。这种情"
-"况下， Seafile 会保留你的版本，并把你朋友们的版本保存为 \"冲突文件\"。一个冲"
-"突文件的名字会以该修改的作者的邮箱加上当前时间作为后缀，例如，test.txt "
-"(name@example.com 2013-10-01-00-12-24).\n"
+"    Sometimes you and your friends may edit the same file at the same time. Your changes may conflict with each other's. In this case, Seafile would keep your version unchanged, while save your friends' versions as \"conflict files\". A conflict file's name ends with its author's email address, plus the current time, e.g. test.txt (name@example.com 2013-10-01-00-12-24).\n"
 "\t"
+msgstr "\n有时，你和你的朋友们可能同时编辑了同一个文件。你们的修改可能互相冲突。这种情况下， Seafile 会保留你的版本，并把你朋友们的版本保存为 \"冲突文件\"。一个冲突文件的名字会以该修改的作者的邮箱加上当前时间作为后缀，例如，test.txt (name@example.com 2013-10-01-00-12-24).\n\t"
 
 #: seahub/help/templates/help/help_delete.html:7
 msgid "Deleting a file library"
@@ -2221,26 +2196,20 @@ msgstr "删除资料库"
 msgid ""
 "To maximize your data security, deletion of file libraries on the website "
 "and on your computer are not \"synced\" automatically. "
-msgstr ""
-"为了最大程度地保证你的数据的安全性， 网站上和你的电脑上的资料库的删除不会自动"
-"同步。"
+msgstr "为了最大程度地保证你的数据的安全性， 网站上和你的电脑上的资料库的删除不会自动同步。"
 
 #: seahub/help/templates/help/help_delete.html:11
 msgid ""
 "After a file library is deleted on the website, the library downloaded to "
 "your computer won't be deleted. But it won't be synced with the website any "
 "more."
-msgstr ""
-"一个资料库在网站上被删除后，已经下载到你的电脑上的该资料库不会被删除。但是之"
-"后它将和网站取消同步。"
+msgstr "一个资料库在网站上被删除后，已经下载到你的电脑上的该资料库不会被删除。但是之后它将和网站取消同步。"
 
 #: seahub/help/templates/help/help_delete.html:12
 msgid ""
-"After a file library is deleted on your computer, the library on the website "
-"won't be deleted. You may download and sync it again later."
-msgstr ""
-"一个资料库在你的电脑上被删除后，网站上的该资料库不会被删除。之后你也可以下载"
-"和同步它。"
+"After a file library is deleted on your computer, the library on the website"
+" won't be deleted. You may download and sync it again later."
+msgstr "一个资料库在你的电脑上被删除后，网站上的该资料库不会被删除。之后你也可以下载和同步它。"
 
 #: seahub/help/templates/help/help_group_share.html:7
 msgid "Sharing a library to a group"
@@ -2269,10 +2238,7 @@ msgid ""
 "folder of this library. In this special file, you specify the files and "
 "folders that Seafile should not sync. Each line in this file specifies a "
 "pattern. The following pattern format are supported."
-msgstr ""
-"有的时候你不想同步一个资料库中的某些文件或者目录。为此，你可以在该资料库的根"
-"目录中创建一个名为 seafile-ignore.txt 的文件。在这个文件中，你可以指定哪些文"
-"件和目录将不被同步。文件中的每一行都指定一个模式。目前支持的模式格式如下。"
+msgstr "有的时候你不想同步一个资料库中的某些文件或者目录。为此，你可以在该资料库的根目录中创建一个名为 seafile-ignore.txt 的文件。在这个文件中，你可以指定哪些文件和目录将不被同步。文件中的每一行都指定一个模式。目前支持的模式格式如下。"
 
 #: seahub/help/templates/help/help_ignore.html:13
 msgid "A blank line matches no files."
@@ -2285,31 +2251,26 @@ msgstr "以 # 开头的一行会被作为注释"
 #: seahub/help/templates/help/help_ignore.html:15
 msgid ""
 "Seafile supports wildcards in the pattern. For example, \"foo/*\" matches "
-"\"foo/1\" and \"foo/hello\". \"foo/?\" matches \"foo/1\" but not \"foo/hello"
-"\". Note that the wildcard character * recursively matches all the paths "
-"under a folder. For instance, \"foo/*.html\" matches \"foo/a.html\" and "
-"\"foo/templates/b.html\"."
-msgstr ""
-"支持通配符。比如， \"foo/*\" 匹配 \"foo/1\" and \"foo/hello\"。\"foo/?\" 匹"
-"配 \"foo/1\" 但是不匹配 \"foo/hello\"。通配符 * 会递归匹配目录下的所有路径。"
-"比如 \"foo/*.html\" 会匹配文件 \"foo/a.html\" 以及 \"foo/templates/b.html\"。"
+"\"foo/1\" and \"foo/hello\". \"foo/?\" matches \"foo/1\" but not "
+"\"foo/hello\". Note that the wildcard character * recursively matches all "
+"the paths under a folder. For instance, \"foo/*.html\" matches "
+"\"foo/a.html\" and \"foo/templates/b.html\"."
+msgstr "支持通配符。比如， \"foo/*\" 匹配 \"foo/1\" and \"foo/hello\"。\"foo/?\" 匹配 \"foo/1\" 但是不匹配 \"foo/hello\"。通配符 * 会递归匹配目录下的所有路径。比如 \"foo/*.html\" 会匹配文件 \"foo/a.html\" 以及 \"foo/templates/b.html\"。"
 
 #: seahub/help/templates/help/help_ignore.html:16
 msgid ""
 "If the pattern ends with a slash, it would only match a folder. In other "
 "words, foo/ will match a folder \"foo\" and paths underneath it, but will "
 "not match a regular file or a symbolic link \"foo\"."
-msgstr ""
-"如果一个模式以斜杠结尾，那么它只会匹配目录。比如，foo/ 匹配目录 \"foo\" 以及"
-"它下面的路径， 但是不会匹配一个常规文件或是一个符号链接 foo。"
+msgstr "如果一个模式以斜杠结尾，那么它只会匹配目录。比如，foo/ 匹配目录 \"foo\" 以及它下面的路径， 但是不会匹配一个常规文件或是一个符号链接 foo。"
 
 #: seahub/help/templates/help/help_ignore.html:17
 msgid ""
 "If a pattern doesn't end with a slash or a wildcard, it would not match a "
 "folder. For example, \"foo\" can only match regular file \"foo\" or a "
-"symbolic link; while \"foo/\" and \"foo*\" match a folder and paths under it."
-msgstr ""
-"如果一个模式不以斜杠或者通配符结尾，那么它只能匹配文件，而不能匹配目录。"
+"symbolic link; while \"foo/\" and \"foo*\" match a folder and paths under "
+"it."
+msgstr "如果一个模式不以斜杠或者通配符结尾，那么它只能匹配文件，而不能匹配目录。"
 
 #: seahub/help/templates/help/help_ignore.html:20
 msgid "Example"
@@ -2324,36 +2285,27 @@ msgid ""
 "The seafile-ignore.txt file only controls which files to exclude on the "
 "client side. You can still create a file from seahub web interface that's "
 "excluded on the client. In this case,"
-msgstr ""
-"seafile-ignore.txt 只能控制在客户端需要忽略哪些文件。你依然可以在 seahub 的 "
-"web 界面创建这些被客户端忽略的文件。在这种情况下，"
+msgstr "seafile-ignore.txt 只能控制在客户端需要忽略哪些文件。你依然可以在 seahub 的 web 界面创建这些被客户端忽略的文件。在这种情况下，"
 
 #: seahub/help/templates/help/help_ignore.html:43
 msgid ""
 "The created file will still be synced back to clients. But any later local "
 "changes to those files will be ignored."
-msgstr ""
-"这些文件会被同步到客户端，但是用户在客户端对这些文件的后续修改会被忽略，不会"
-"被同步回服务器。"
+msgstr "这些文件会被同步到客户端，但是用户在客户端对这些文件的后续修改会被忽略，不会被同步回服务器。"
 
 #: seahub/help/templates/help/help_ignore.html:44
 msgid ""
 "If the file is modified on seahub, the new version will also be synced back "
-"to clients; If the file on the client is also modified, a conflict file will "
-"be generated on the client."
-msgstr ""
-"文件在服务器端的后续更改会被同步到客户端，如果客户端也同时修改了这些文件，系"
-"统会生成冲突文件。"
+"to clients; If the file on the client is also modified, a conflict file will"
+" be generated on the client."
+msgstr "文件在服务器端的后续更改会被同步到客户端，如果客户端也同时修改了这些文件，系统会生成冲突文件。"
 
 #: seahub/help/templates/help/help_ignore.html:47
 msgid ""
 "seafile-ignore.txt only ignores files that are not synced yet. If a file is "
 "already synced, and some time later you add it to the ignore list, its "
 "existing versions won't be removed."
-msgstr ""
-"seafile-ignore.txt 只能忽略还没有被同步的文件。对于已经被同步的文件，如果后来"
-"把它添加到 seafile-ignore.txt 中，系统只会忽略后续更改，已经上传的版本不会受"
-"影响。"
+msgstr "seafile-ignore.txt 只能忽略还没有被同步的文件。对于已经被同步的文件，如果后来把它添加到 seafile-ignore.txt 中，系统只会忽略后续更改，已经上传的版本不会受影响。"
 
 #: seahub/help/templates/help/help_install_v2.html:8
 msgid "Installing and Using Seafile Client"
@@ -2361,8 +2313,8 @@ msgstr "客户端安装使用"
 
 #: seahub/help/templates/help/help_install_v2.html:10
 msgid ""
-"After downloading Seafile client program, you have 3 steps left to get it up "
-"and running."
+"After downloading Seafile client program, you have 3 steps left to get it up"
+" and running."
 msgstr "在您下载完 Seafile 客户端后，只需下面的步骤来安装使用："
 
 #: seahub/help/templates/help/help_install_v2.html:12
@@ -2408,9 +2360,7 @@ msgid ""
 "Seafile supports encryption of file libraries to strengthen your data "
 "security. To encrypt a file library, you need to set a password when you "
 "create a library."
-msgstr ""
-"Seafile 提供资料库的加密来加强你的数据安全。 要加密一个资料库， 你需要在创建"
-"该资料库时指定一个密码。"
+msgstr "Seafile 提供资料库的加密来加强你的数据安全。 要加密一个资料库， 你需要在创建该资料库时指定一个密码。"
 
 #: seahub/help/templates/help/help_security.html:10
 msgid "The password won't be stored on Seafile cloud platform."
@@ -2427,9 +2377,7 @@ msgid ""
 "To download and sync an encrypted library to your computer, you need to "
 "provide the password.  Seafile client program will download the encrypted "
 "data and decrypt it on your computer."
-msgstr ""
-"当你把一个加密的资料库下载到你的电脑上时，你需要提供密码。Seafile 客户端程序"
-"会把加密的数据下载到你的电脑之后再用密码解密。"
+msgstr "当你把一个加密的资料库下载到你的电脑上时，你需要提供密码。Seafile 客户端程序会把加密的数据下载到你的电脑之后再用密码解密。"
 
 #: seahub/help/templates/help/help_security.html:13
 msgid "The password can only be set when you create the library."
@@ -2450,20 +2398,17 @@ msgid ""
 "Seafile servers don't store the password for an encrypted library. To view "
 "an encrypted library online, you need to provide the password for the "
 "library. Your password is only stored in the server's encrypted memory. It "
-"would be cleared from the memory in an hour. After that, if you want to view "
-"the library, you'll have to enter password again."
-msgstr ""
-"Seafile 服务器不会保存一个加密资料库的密码。要在线查看一个加密资料库，你需要"
-"提供该资料库的密码。你的密码将会保存在服务器的内存中。一小时后就会被清除。之"
-"后如果还想浏览改资料库，则需要重新输入密码。"
+"would be cleared from the memory in an hour. After that, if you want to view"
+" the library, you'll have to enter password again."
+msgstr "Seafile 服务器不会保存一个加密资料库的密码。要在线查看一个加密资料库，你需要提供该资料库的密码。你的密码将会保存在服务器的内存中。一小时后就会被清除。之后如果还想浏览改资料库，则需要重新输入密码。"
 
 #: seahub/message/views.py:156
-#: seahub/message/templates/message/all_msg_list.html:150
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "消息是必填项"
 
 #: seahub/message/views.py:159
-#: seahub/message/templates/message/all_msg_list.html:154
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "联系人是必填项"
 
@@ -2496,18 +2441,23 @@ msgstr "时间"
 msgid "message..."
 msgstr "消息..."
 
-#: seahub/message/templates/message/all_msg_list.html:104
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "发送给：点击选择联系人"
 
-#: seahub/message/templates/message/all_msg_list.html:110
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "请先添加联系人"
 
-#: seahub/message/templates/message/all_msg_list.html:114
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "获取联系人失败，无法发送消息。"
 
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
+msgid "You don't have any library at present"
+msgstr "你目前还没有资料库"
+
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "发送消息..."
@@ -2517,9 +2467,7 @@ msgstr "发送消息..."
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
-msgstr ""
-"文件 %(file_name)s 已经上传到你的文件夹 %(folder)s"
+msgstr "文件 %(file_name)s 已经上传到你的文件夹 %(folder)s"
 
 #: seahub/notifications/models.py:473
 #, python-format
@@ -2531,7 +2479,8 @@ msgstr "%(user)s 共享了资料库%(repo_name)s给你"
 #: seahub/notifications/models.py:491
 #, python-format
 msgid ""
-"%(user)s has shared a file named %(file_name)s to you."
+"%(user)s has shared a file named %(file_name)s to "
+"you."
 msgstr "%(user)s 共享了文件%(file_name)s给你"
 
 #: seahub/notifications/models.py:507
@@ -2571,9 +2520,7 @@ msgid ""
 "User %(username)s has asked to join group %(group_name)s, verification message: "
 "%(join_request_msg)s"
-msgstr ""
-"用户 %(username)s 请求加入到群组 %(group_name)s，验证信息：%(join_request_msg)s"
+msgstr "用户 %(username)s 请求加入到群组 %(group_name)s，验证信息：%(join_request_msg)s"
 
 #: seahub/notifications/views.py:120
 msgid "Successfully cleared all notices."
@@ -2673,9 +2620,7 @@ msgstr "文件会一边下载一边在浏览器里解密。"
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
-msgstr ""
-"提示：后一种更安全，但并不是被所有浏览器所支持。我们建议使用最新的Chrome或"
-"Firefox。"
+msgstr "提示：后一种更安全，但并不是被所有浏览器所支持。我们建议使用最新的Chrome或Firefox。"
 
 #: seahub/profile/views.py:37
 msgid "Successfully edited profile."
@@ -2743,7 +2688,7 @@ msgid "Password:"
 msgstr "密码："
 
 #: seahub/profile/templates/profile/set_profile.html:36
-#: seahub/templates/snippets/repo_dirents.html:76
+#: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "更新"
 
@@ -2788,13 +2733,10 @@ msgstr "启用子资料库"
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
-"listed in your desktop client, and you can download it just like downloading "
-"a normal library. It will be automatically kept in sync with its origin "
+"listed in your desktop client, and you can download it just like downloading"
+" a normal library. It will be automatically kept in sync with its origin "
 "library."
-msgstr ""
-"这个功能能让你选择性的同步一个资料库里的文件夹。你可以从任意文件夹创建子资料"
-"库。创建完后，它会显示在你的桌面客户端。你可以像普通的资料库一样下载它。同"
-"时，它会自动跟源资料库保持同步。"
+msgstr "这个功能能让你选择性的同步一个资料库里的文件夹。你可以从任意文件夹创建子资料库。创建完后，它会显示在你的桌面客户端。你可以像普通的资料库一样下载它。同时，它会自动跟源资料库保持同步。"
 
 #: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
@@ -2802,10 +2744,7 @@ msgid ""
 "Without this option on, a hidden sub-library will be created automatically "
 "in such case. With this option on, those hidden sub-libraries will also be "
 "listed, which enables you to manage them."
-msgstr ""
-"子资料库也用来实现共享一个文件夹给群组或其他用户。未开启子资料库选项的时候，"
-"一个隐藏的资料库会被创建出来。开启这个功能后，这些隐藏的资料库也会被列出来，"
-"方便你来管理。"
+msgstr "子资料库也用来实现共享一个文件夹给群组或其他用户。未开启子资料库选项的时候，一个隐藏的资料库会被创建出来。开启这个功能后，这些隐藏的资料库也会被列出来，方便你来管理。"
 
 #: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
@@ -2879,13 +2818,13 @@ msgstr "共享到公共资料失败，请稍后再试"
 #: seahub/share/views.py:59
 #, python-format
 msgid ""
-"Shared to all members successfully, go check it at Shares."
+"Shared to all members successfully, go check it at Shares."
 msgstr "共享到公共资料成功，请前往 共享 查看。"
 
 #: seahub/share/views.py:71
 #, python-format
-msgid ""
-"\"%(repo)s\" is already in group %(group)s. View"
+msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\"在群组 %(group)s 中已存在。查看"
 
 #: seahub/share/views.py:81
@@ -2896,8 +2835,8 @@ msgstr "共享 %(repo)s 到 %(group)s失败，请稍后重试。"
 #: seahub/share/views.py:85
 #, python-format
 msgid ""
-"Shared to %(group)s successfully，go check it at Shares."
+"Shared to %(group)s successfully，go check it at Shares."
 msgstr "共享到 %(group)s 成功， 请前往 共享 查看。"
 
 #: seahub/share/views.py:95
@@ -2912,8 +2851,8 @@ msgstr "共享给 %s 失败，请稍后尝试。"
 #: seahub/share/views.py:111
 #, python-format
 msgid ""
-"Shared to %(email)s successfully，go check it at Shares."
+"Shared to %(email)s successfully，go check it at Shares."
 msgstr "共享给 %(email)s 成功，请前往 共享 查看。"
 
 #: seahub/share/views.py:115
@@ -2928,10 +2867,9 @@ msgstr "只有资料库拥有者才有共享权限。"
 #: seahub/share/views.py:204
 #, python-format
 msgid ""
-"Failed to share \"%s\", no enough quota. Upgrade account."
-msgstr ""
-"共享\"%s\"失败，空间不足。升级帐号。"
+"Failed to share \"%s\", no enough quota. Upgrade account."
+msgstr "共享\"%s\"失败，空间不足。升级帐号。"
 
 #: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
@@ -2974,8 +2912,8 @@ msgstr "链接不存在"
 
 #: seahub/share/views.py:764
 msgid ""
-"Sending shared link failed. Email service is not properly configured, please "
-"contact administrator."
+"Sending shared link failed. Email service is not properly configured, please"
+" contact administrator."
 msgstr "由于邮箱服务未正确配置，发送共享链接失败，请联系管理员。"
 
 #: seahub/share/views.py:787
@@ -3030,8 +2968,8 @@ msgstr "获取分享链接失败，请稍后重试。"
 
 #: seahub/share/views.py:1033
 msgid ""
-"Sending shared upload link failed. Email service is not properly configured, "
-"please contact administrator."
+"Sending shared upload link failed. Email service is not properly configured,"
+" please contact administrator."
 msgstr "由于邮箱服务未正确配置，发送上传外链失败，请联系管理员。"
 
 #: seahub/share/views.py:1056
@@ -3058,8 +2996,8 @@ msgstr "访问次数"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:611
-#: seahub/templates/repo.html.py:689
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "查看"
@@ -3076,11 +3014,9 @@ msgstr "你还没有下载外链"
 
 #: seahub/share/templates/share/links.html:46
 msgid ""
-"You can generate a download link for a folder or a file. People receive this "
-"link can view the folder or the file online."
-msgstr ""
-"你可以给文件或文件夹生成下载外链。别人通过这个链接就可以在线查看你的文件或文"
-"件夹。"
+"You can generate a download link for a folder or a file. People receive this"
+" link can view the folder or the file online."
+msgstr "你可以给文件或文件夹生成下载外链。别人通过这个链接就可以在线查看你的文件或文件夹。"
 
 #: seahub/share/templates/share/links.html:76
 msgid "You don't have any upload link"
@@ -3090,8 +3026,7 @@ msgstr "你还没有上传链接"
 msgid ""
 "You can generate an upload link from any folder. People receive this link "
 "can upload files to this folder."
-msgstr ""
-"你可以给任意文件夹生成上传链接。别人通过这个链接就可以上传文件到你的文件夹。"
+msgstr "你可以给任意文件夹生成上传链接。别人通过这个链接就可以上传文件到你的文件夹。"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:5
 msgid "Folders - Share"
@@ -3156,8 +3091,8 @@ msgstr "还没有文件共享给你"
 
 #: seahub/share/templates/share/priv_shared_files.html:43
 msgid ""
-"Single files shared to you will be listed here, and you can download them or "
-"save them to some libraries."
+"Single files shared to you will be listed here, and you can download them or"
+" save them to some libraries."
 msgstr "这里会列出共享给你的文件，你可以选择下载或保存到你的资料库里。"
 
 #: seahub/share/templates/share/priv_shared_files.html:55
@@ -3184,12 +3119,10 @@ msgstr "你还没有共享任何资料库"
 
 #: seahub/share/templates/share/repos.html:66
 msgid ""
-"You can share libraries to your friends and colleagues by clicking the share "
-"icon of your own libraries in your home page or creating a new library in "
+"You can share libraries to 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 ""
-"你可以通过在你的个人页面点击你自己的资料库的共享图标, 或是在你所在的小组里创"
-"建一个新的资料库来将你的资料库共享给你的朋友和同事。"
+msgstr "你可以通过在你的个人页面点击你自己的资料库的共享图标, 或是在你所在的小组里创建一个新的资料库来将你的资料库共享给你的朋友和同事。"
 
 #: seahub/share/templates/share/user_share_list.html:4
 #: seahub/share/templates/share/user_share_list.html:25
@@ -3284,12 +3217,10 @@ msgstr "你还没有连接的客户端"
 
 #: seahub/templates/client_mgmt.html:61
 msgid ""
-"The libraries synced to desktop clients are listed in this page. You can see "
-"the client's name and its IP address. You may unsync a client from a library "
-"if you no longer want to sync it."
-msgstr ""
-"这里会列出所有通过桌面客户端同步的资料库。你可以查看客户端的名称和IP地址。你"
-"也可以断开一个资料库所连接的客户端。"
+"The libraries synced to desktop clients are listed in this page. You can see"
+" the client's name and its IP address. You may unsync a client from a "
+"library if you no longer want to sync it."
+msgstr "这里会列出所有通过桌面客户端同步的资料库。你可以查看客户端的名称和IP地址。你也可以断开一个资料库所连接的客户端。"
 
 #: seahub/templates/client_mgmt.html:101
 msgid "Successfully unsynced."
@@ -3299,25 +3230,21 @@ msgstr "取消同步成功。"
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept on the server for only 1 hour."
-msgstr ""
-"该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂"
-"存1小时。"
+msgstr "该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。"
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:217
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
 #: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "密码："
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:222
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
-msgstr ""
-"你可以在这"
-"里改变加密资料库的查看方式"
+msgstr "你可以在这里改变加密资料库的查看方式"
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:324
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
 #: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "请输入密码。"
@@ -3373,18 +3300,14 @@ msgid "Successfully unlinked."
 msgstr "断开连接成功。"
 
 #: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
-#: seahub/templates/history_file_view.html:63
-#: seahub/templates/history_file_view.html:77 seahub/templates/repo.html:26
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/shared_file_view.html:61
 #: seahub/templates/view_file_base.html:75
-#: seahub/templates/view_file_base.html:102
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_history_file.html:48
 #: seahub/templates/view_shared_dir.html:41
 #: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
-#: seahub/templates/snippets/repo_dirents.html:74
+#: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
 msgstr "下载"
 
@@ -3710,7 +3633,7 @@ msgstr "密码为必填项"
 #: seahub/templates/repo_settings.html:23
 #: seahub/templates/view_file_base.html:67
 #: seahub/templates/snippets/current_commit.html:15
-#: seahub/templates/snippets/repo_dirents.html:90
+#: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "历史"
 
@@ -3722,8 +3645,7 @@ msgstr " 版本历史"
 msgid ""
 "Tip:a new version will be generated after each modification, and you can "
 "restore the file to a previous version."
-msgstr ""
-"Tip：每次修改后都会生成一个新的版本, 你可以将当前文件恢复到之前的某个版本。"
+msgstr "Tip：每次修改后都会生成一个新的版本, 你可以将当前文件恢复到之前的某个版本。"
 
 #: seahub/templates/file_revisions.html:12 seahub/templates/text_diff.html:10
 msgid "Current Path:"
@@ -3879,27 +3801,12 @@ msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
-msgstr ""
-"Seafile把文件组织到资料库里。每个资料库可以被单独的同步和共享。我们已经为你创"
-"建了一个私人资料库。你之后可以再创建其他的资料库。"
+msgstr "Seafile把文件组织到资料库里。每个资料库可以被单独的同步和共享。我们已经为你创建了一个私人资料库。你之后可以再创建其他的资料库。"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "关闭"
 
-#: seahub/templates/myhome.html:49
-msgid "Choose a directory:"
-msgstr "请选择一个目录："
-
-#: seahub/templates/myhome.html:106
-#: seahub/templates/snippets/add_file_js.html:15
-msgid "You don't have any library at present"
-msgstr "你目前还没有资料库"
-
-#: seahub/templates/myhome.html:121
-msgid "Please choose a directory"
-msgstr "请选择一个目录。"
-
 #: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "我的页面"
@@ -3916,12 +3823,12 @@ msgid ""
 msgstr "团体将在下个版本移除，相关数据会迁移到你当前的帐号下。"
 
 #: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
-#: seahub/templates/snippets/my_owned_repos.html:52
-#: seahub/templates/snippets/my_owned_repos.html:99
-#: seahub/templates/snippets/my_owned_repos.html:142
+#: seahub/templates/snippets/my_owned_repos.html:45
+#: seahub/templates/snippets/my_owned_repos.html:92
+#: seahub/templates/snippets/my_owned_repos.html:135
 #: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
-#: seahub/templates/snippets/repo_dirents.html:80
+#: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
 msgstr "共享"
 
@@ -3938,8 +3845,7 @@ msgid "No one has created any groups yet"
 msgstr "还没有群组被创建"
 
 #: seahub/templates/pubgrp.html:25
-msgid ""
-"You can click \"Add Group\" button under \"Group\" label to create a group. "
+msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "你可以到“群组”页面点击“新建群组”按钮创建一个群组。"
 
 #: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
@@ -3954,9 +3860,7 @@ msgstr "当前没有公共资料"
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
-msgstr ""
-"你可以点击“新建资料库”按钮创建一个公开的资料库，网站内的其他人都可以查看下载"
-"这个资料库。"
+msgstr "你可以点击“新建资料库”按钮创建一个公开的资料库，网站内的其他人都可以查看下载这个资料库。"
 
 #: seahub/templates/pubuser.html:10
 msgid "Search members..."
@@ -3971,14 +3875,14 @@ msgid "Trash"
 msgstr "回收站"
 
 #: seahub/templates/repo.html:50
-#: seahub/templates/snippets/repo_dirents.html:34
-#: seahub/templates/snippets/repo_dirents.html:88
+#: seahub/templates/snippets/repo_dirents.html:37
+#: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "移动"
 
 #: seahub/templates/repo.html:51
-#: seahub/templates/snippets/repo_dirents.html:35
-#: seahub/templates/snippets/repo_dirents.html:89
+#: seahub/templates/snippets/repo_dirents.html:38
+#: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "复制"
 
@@ -4014,8 +3918,7 @@ msgstr "取消全部"
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
-msgstr ""
-"在以下浏览器中支持文件拖放：Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
+msgstr "在以下浏览器中支持文件拖放：Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
 #: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
@@ -4024,7 +3927,7 @@ msgid "File size should be smaller than %(max_file_size)s"
 msgstr "单个文件大小应小于 %(max_file_size)s"
 
 #: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
-#: seahub/templates/repo.html:1701
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "保存中..."
@@ -4094,292 +3997,302 @@ msgstr "请点击选择目标目录。"
 msgid "Rename %(name)s as:"
 msgstr "将 %(name)s 重命名为："
 
-#: seahub/templates/repo.html:216
+#: seahub/templates/repo.html:210
+#, python-format
+msgid "Sync %(dir_name)s"
+msgstr "同步 %(dir_name)s"
+
+#: seahub/templates/repo.html:211
+msgid ""
+"A sub-library will be created from this directory. It will be listed in your"
+" desktop client, and you can download it just like downloading a normal "
+"library."
+msgstr "一个子资料库会从这个目录创建。它会在你的桌面客户端列出来，你可以像普通的资料库一样去下载。"
+
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
-msgstr ""
-"该资料库已加密。如需在线查看，请输入解密密码。密码将在浏览器中暂存1小时。"
+msgstr "该资料库已加密。如需在线查看，请输入解密密码。密码将在浏览器中暂存1小时。"
 
-#: seahub/templates/repo.html:244
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "文件太大"
 
-#: seahub/templates/repo.html:245
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "文件太小"
 
-#: seahub/templates/repo.html:246
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "不支持的文件类型"
 
-#: seahub/templates/repo.html:247
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "文件太多"
 
-#: seahub/templates/repo.html:248
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "上传大小超过了文件大小"
 
-#: seahub/templates/repo.html:249
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "空文件"
 
-#: seahub/templates/repo.html:251
+#: seahub/templates/repo.html:261
 #: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "错误"
 
-#: seahub/templates/repo.html:252
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "上传"
 
-#: seahub/templates/repo.html:367
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "删除条目"
 
-#: seahub/templates/repo.html:367
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "确定要删除选中的条目吗？"
 
-#: seahub/templates/repo.html:371 seahub/templates/repo.html.py:554
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "处理中..."
 
-#: seahub/templates/repo.html:401
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 个条目已删除成功。"
 
-#: seahub/templates/repo.html:403
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "%(name)s 删除成功。"
 
-#: seahub/templates/repo.html:412
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "内部错误。%(name)s 和其他 %(amount)s 个条目删除失败。"
 
-#: seahub/templates/repo.html:414
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "内部错误。%(name)s 删除失败。"
 
-#: seahub/templates/repo.html:514
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "移动选中的文件/目录到:"
 
-#: seahub/templates/repo.html:517
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "复制选中的文件/目录到:"
 
-#: seahub/templates/repo.html:543 seahub/templates/repo.html.py:1641
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
 #: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "目标路径无效"
 
-#: seahub/templates/repo.html:598
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 个条目移动成功。"
 
-#: seahub/templates/repo.html:600
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s 移动成功。"
 
-#: seahub/templates/repo.html:605
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 个条目复制成功。"
 
-#: seahub/templates/repo.html:607
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s 复制成功。"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "内部错误。%(name)s 和其他 %(amount)s 个条目移动失败。"
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "内部错误。%(name)s 移动失败。"
 
-#: seahub/templates/repo.html:625
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "内部错误。%(name)s 和其他 %(amount)s 个条目复制失败。"
 
-#: seahub/templates/repo.html:627
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "内部错误。%(name)s 复制失败。"
 
-#: seahub/templates/repo.html:648 seahub/templates/repo.html.py:1682
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
 msgid "Moving..."
 msgstr "移动中..."
 
-#: seahub/templates/repo.html:650 seahub/templates/repo.html.py:1684
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
 msgid "Copying..."
 msgstr "复制中..."
 
-#: seahub/templates/repo.html:677
+#: seahub/templates/repo.html:687
 #, python-format
 msgid "Successfully moved %(s_num)s items."
 msgstr "成功移动 %(s_num)s 个条目。"
 
-#: seahub/templates/repo.html:679
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
 #, python-format
 msgid "Failed to move %(f_num)s items."
 msgstr "%(f_num)s 个条目移动失败"
 
-#: seahub/templates/repo.html:682
+#: seahub/templates/repo.html:692
 #, python-format
 msgid "Successfully copied %(s_num)s items."
 msgstr "成功复制 %(s_num)s 个条目。"
 
-#: seahub/templates/repo.html:684
-#, python-format
-msgid "Failed to copy %(f_num)s items."
-msgstr "%(f_num)s 个条目复制失败"
-
-#: seahub/templates/repo.html:693 seahub/views/ajax.py:1023
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
 msgid "Failed"
 msgstr "操作失败"
 
-#: seahub/templates/repo.html:767
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "文件加密中..."
 
-#: seahub/templates/repo.html:789
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "加密出错"
 
-#: seahub/templates/repo.html:796
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "加密中， %(num)s% 已完成。"
 
-#: seahub/templates/repo.html:813
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "上传中..."
 
-#: seahub/templates/repo.html:825 seahub/templates/repo.html.py:1112
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "完成!"
 
-#: seahub/templates/repo.html:1122
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "下载中..."
 
-#: seahub/templates/repo.html:1155
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "下载中，%(num)s% 已完成。"
 
-#: seahub/templates/repo.html:1176
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "解密中..."
 
-#: seahub/templates/repo.html:1193
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "解密中, %(num)s% 已完成。"
 
-#: seahub/templates/repo.html:1296
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "%(name)s 删除成功。"
 
-#: seahub/templates/repo.html:1318
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: seahub/templates/repo.html:1320
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "重命名目录"
 
-#: seahub/templates/repo.html:1338
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "复制文件"
 
-#: seahub/templates/repo.html:1340
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "移动文件"
 
-#: seahub/templates/repo.html:1342
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "复制目录"
 
-#: seahub/templates/repo.html:1344
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "移动目录"
 
-#: seahub/templates/repo.html:1349
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "复制 %(name)s 到："
 
-#: seahub/templates/repo.html:1352
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "移动 %(name)s 到："
 
-#: seahub/templates/repo.html:1375
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "该资料库不支持目录下载。"
 
-#: seahub/templates/repo.html:1491 seahub/templates/repo.html.py:1611
-#: seahub/templates/snippets/repo_dirents.html:51
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
+#: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "未加星标"
 
-#: seahub/templates/repo.html:1493
-#: seahub/templates/snippets/repo_dirents.html:49
+#: seahub/templates/repo.html:1503
+#: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "已加星标"
 
-#: seahub/templates/repo.html:1539 seahub/templates/repo.html.py:1579
+#: seahub/templates/repo.html:1551
+msgid "Sub-library is created."
+msgstr "子资料库已创建。"
+
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "必填项。"
 
-#: seahub/templates/repo.html:1545
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "请输入完整的文件名。"
 
-#: seahub/templates/repo.html:1555
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "创建中..."
 
-#: seahub/templates/repo.html:1583
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "你还没重命名。"
 
-#: seahub/templates/repo.html:1620
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s 已重命名为 %(new_name)s"
 
-#: seahub/templates/repo.html:1720 seahub/templates/repo.html.py:1748
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
 msgid "Canceled."
 msgstr "已取消。"
 
-#: seahub/templates/repo.html:1835
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "请至少选择一个联系人。"
 
-#: seahub/templates/repo.html:1946
+#: seahub/templates/repo.html:1989
 #: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "请输入邮箱或群组，或选择一些。"
@@ -4489,9 +4402,8 @@ msgid "Old Password"
 msgstr "旧密码"
 
 #: seahub/templates/repo_settings.html:48
-#, python-format
-msgid "New Password(at least %(repo_password_min_length)s characters)"
-msgstr "新密码(至少 %(repo_password_min_length)s 个字符)"
+msgid "New Password(at least 6 characters)"
+msgstr ""
 
 #: seahub/templates/repo_settings.html:50
 msgid "New Password Again"
@@ -4626,7 +4538,7 @@ msgid "icon"
 msgstr "图标"
 
 #: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
-#: seahub/templates/view_file_base.html:148
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "取消星标"
 
@@ -4636,11 +4548,9 @@ msgstr "你还没有星标文件"
 
 #: seahub/templates/starred.html:35
 msgid ""
-"You can star important files by clicking the \"Star\" button on file viewing "
-"page, and they will be listed here."
-msgstr ""
-"你可以在文件浏览页面点击“添加星标”按钮给重要的文件加上星标，这些文件会显示在"
-"这里。"
+"You can star important files by clicking the \"Star\" button on file viewing"
+" page, and they will be listed here."
+msgstr "你可以在文件浏览页面点击“添加星标”按钮给重要的文件加上星标，这些文件会显示在这里。"
 
 #: seahub/templates/starred.html:59
 msgid "Successfully unstarred."
@@ -4684,7 +4594,7 @@ msgid "Sorry, this user is not registered yet."
 msgstr "抱歉，该用户还未注册。"
 
 #: seahub/templates/view_file_base.html:39
-#: seahub/templates/view_file_base.html:144
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "添加星标"
 
@@ -4700,11 +4610,11 @@ msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] " %(counter)s 个贡献者 "
 
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "星标取消成功"
 
-#: seahub/templates/view_file_base.html:146
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "星标添加成功"
 
@@ -4745,13 +4655,10 @@ msgstr "自动检测"
 #: seahub/templates/view_file_pdf.html:30
 #: seahub/templates/snippets/file_content_js.html:89
 msgid ""
-"  / "
-msgstr ""
-"  /  页"
+"  / "
+msgstr "  /  页"
 
 #: seahub/templates/view_file_pdf.html:30
 #: seahub/templates/snippets/file_content_js.html:89
@@ -4766,7 +4673,8 @@ msgstr "加载中..."
 #: seahub/templates/view_file_pdf.html:77
 #: seahub/templates/snippets/file_content_js.html:136
 msgid ""
-"You can use IE 10 or other browsers, for example, firefox, to view it online."
+"You can use IE 10 or other browsers, for example, firefox, to view it "
+"online."
 msgstr "如果您想在线查看该文件，您可以使用 IE 10 或其他浏览器比如 firefox 。"
 
 #: seahub/templates/view_file_svg.html:7
@@ -4834,13 +4742,13 @@ msgstr "刷新验证码失败，请稍后尝试。"
 #: seahub/templates/registration/login.html:94
 #: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:92
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "邮箱不能为空"
 
 #: seahub/templates/registration/login.html:98
 #: seahub/templates/registration/registration_form.html:53
-#: seahub/templates/sysadmin/sys_useradmin.html:96
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "密码不能为空"
 
@@ -4919,8 +4827,7 @@ msgstr "我们已经给你发了一封密码重置邮件，请查收。"
 msgid ""
 "To reset the password of your account %(account)s on %(site_name)s, please "
 "click the following link: "
-msgstr ""
-"要重置你在 %(site_name)s 上的帐户 %(account)s 的密码， 请点击下面的链接："
+msgstr "要重置你在 %(site_name)s 上的帐户 %(account)s 的密码， 请点击下面的链接："
 
 #: seahub/templates/registration/password_reset_email.html:17
 msgid "If you did not request it, just skip it."
@@ -4971,7 +4878,7 @@ msgstr "注册"
 #: seahub/templates/snippets/repo_create_js.html:53
 #: seahub/templates/snippets/shared_link_js.html:235
 #: seahub/templates/snippets/shared_link_js.html:404
-#: seahub/templates/sysadmin/sys_useradmin.html:100
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "请再次输入密码"
 
@@ -5031,10 +4938,8 @@ msgstr "使用密码"
 
 #: seahub/templates/snippets/file_share_popup.html:36
 #: seahub/templates/snippets/file_share_popup.html:77
-#: seahub/templates/snippets/repo_create_form.html:20
-#, python-format
-msgid "(at least %(repo_password_min_length)s characters)"
-msgstr "(至少%(repo_password_min_length)s个字符)"
+msgid "(at least 6 characters)"
+msgstr ""
 
 #: seahub/templates/snippets/file_share_popup.html:38
 #: seahub/templates/snippets/file_share_popup.html:79
@@ -5081,10 +4986,9 @@ msgstr "发送中..."
 
 #: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
-"You can share the generated link to others and then they can upload files to "
-"this directory via the link."
-msgstr ""
-"你可以共享生成好的链接给别人，他们就能通过这个链接上传文件到这个文件夹。"
+"You can share the generated link to others and then they can upload files to"
+" this directory via the link."
+msgstr "你可以共享生成好的链接给别人，他们就能通过这个链接上传文件到这个文件夹。"
 
 #: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
@@ -5143,40 +5047,32 @@ msgstr "子资料库"
 msgid "Shared"
 msgstr "共享给我的"
 
-#: seahub/templates/snippets/my_owned_repos.html:16
-msgid "New Sub-library"
-msgstr "新子资料库"
-
-#: seahub/templates/snippets/my_owned_repos.html:62
+#: seahub/templates/snippets/my_owned_repos.html:55
 msgid "You have not created any libraries"
 msgstr "你还未创建资料库"
 
-#: seahub/templates/snippets/my_owned_repos.html:63
+#: seahub/templates/snippets/my_owned_repos.html:56
 msgid ""
-"You can create a library to organize your files. For example, you can create "
-"one for each of your projects. Each library can be synchronized and shared "
+"You can create a library to organize your files. For example, you can create"
+" one for each of your projects. Each library can be synchronized and shared "
 "separately."
-msgstr ""
-"你可以新建一个资料库来组织你的文件资料，比如为每个项目创建一个资料库，每个资"
-"料库可以单独地同步和共享。"
+msgstr "你可以新建一个资料库来组织你的文件资料，比如为每个项目创建一个资料库，每个资料库可以单独地同步和共享。"
 
-#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:68
 msgid "Origin"
 msgstr "源资料库"
 
-#: seahub/templates/snippets/my_owned_repos.html:109
+#: seahub/templates/snippets/my_owned_repos.html:102
 msgid "You have not created any sub-libraries"
 msgstr "你还未创建任何子资料库"
 
-#: seahub/templates/snippets/my_owned_repos.html:110
+#: seahub/templates/snippets/my_owned_repos.html:103
 msgid ""
 "You can create a sub-library from a directory inside a library. A sub-"
 "library can be independently synced and shared. Files in the sub-library "
-"will be automatically kept in sync with those in the directory of the origin "
-"library."
-msgstr ""
-"你可以从一个资料库中的一个目录创建一个子资料库。一个子资料库可被独立地同步和"
-"共享。子资料库中的文件将和源资料库相应目录中的文件自动保持同步。"
+"will be automatically kept in sync with those in the directory of the origin"
+" library."
+msgstr "你可以从一个资料库中的一个目录创建一个子资料库。一个子资料库可被独立地同步和共享。子资料库中的文件将和源资料库相应目录中的文件自动保持同步。"
 
 #: seahub/templates/snippets/office_convert_html.html:4
 #: seahub/templates/snippets/spreadsheet_convert_html.html:4
@@ -5206,6 +5102,11 @@ msgstr "共享权限"
 msgid "Encrypt"
 msgstr "加密"
 
+#: seahub/templates/snippets/repo_create_form.html:20
+#, python-format
+msgid "(at least %(repo_password_min_length)s characters)"
+msgstr "(至少%(repo_password_min_length)s个字符)"
+
 #: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "名称为必填项"
@@ -5246,15 +5147,19 @@ msgid "Upload"
 msgstr "上传"
 
 #: seahub/templates/snippets/repo_dirents.html:18
-#: seahub/templates/snippets/repo_dirents.html:68
+#: seahub/templates/snippets/repo_dirents.html:71
 msgid "Fetch failed"
 msgstr "获取失败"
 
-#: seahub/templates/snippets/repo_dirents.html:30
+#: seahub/templates/snippets/repo_dirents.html:28
+msgid "Sync"
+msgstr "同步"
+
+#: seahub/templates/snippets/repo_dirents.html:33
 msgid "More operations"
 msgstr "更多操作"
 
-#: seahub/templates/snippets/repo_dirents.html:84
+#: seahub/templates/snippets/repo_dirents.html:87
 msgid "More Operations"
 msgstr "更多操作"
 
@@ -5406,7 +5311,6 @@ msgid "Payment"
 msgstr "支付"
 
 #: seahub/templates/sysadmin/base.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:15
 msgid "Users"
 msgstr "用户"
 
@@ -5550,6 +5454,7 @@ msgid "Month:"
 msgstr "月份:"
 
 #: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
 msgid "User"
 msgstr "用户"
 
@@ -5579,7 +5484,7 @@ msgstr "提示：应是已添加的用户。"
 msgid "Activating..., please wait"
 msgstr "正在激活...，请稍候"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:104
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "两次输入的密码不一致"
 
@@ -5884,8 +5789,7 @@ msgstr "服务器设置错误"
 
 #: seahub/views/__init__.py:1644
 #, python-format
-msgid ""
-"Successfully revert %(path)s to root directory."
+msgid "Successfully revert %(path)s to root directory."
 msgstr "成功还原 %(path)s 到根目录。"
 
 #: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
@@ -6119,9 +6023,7 @@ msgstr "密码已重置为 %(passwd)s, 通知邮件已发送给 %(user)s。"
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
-msgstr ""
-"成功将用户密码重置为 %(passwd)s, 但发送通知邮件到 %(user)s 失败，请检查你的邮"
-"件配置。"
+msgstr "成功将用户密码重置为 %(passwd)s, 但发送通知邮件到 %(user)s 失败，请检查你的邮件配置。"
 
 #: seahub/views/sysadmin.py:485
 #, python-format
@@ -6134,9 +6036,7 @@ msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
 "notification can not be sent, because Email service is not properly "
 "configured."
-msgstr ""
-"成功将用户 %(user)s 的密码重置为 %(passwd)s, 但是由于邮箱服务未正确配置，通知"
-"邮件无法发送。"
+msgstr "成功将用户 %(user)s 的密码重置为 %(passwd)s, 但是由于邮箱服务未正确配置，通知邮件无法发送。"
 
 #: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
@@ -6155,8 +6055,8 @@ msgstr "成功添加用户 %s。通知邮件已发送。"
 #: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
-"Successfully added user %s. An error accurs when sending email notification, "
-"please check your email configuration."
+"Successfully added user %s. An error accurs when sending email notification,"
+" please check your email configuration."
 msgstr "成功添加用户 %s。但发送通知邮件出错，请检查邮箱配置。"
 
 #: seahub/views/sysadmin.py:551
diff --git a/locale/zh_TW/LC_MESSAGES/django.po b/locale/zh_TW/LC_MESSAGES/django.po
index 334b2bd634..ccfc708e3a 100644
--- a/locale/zh_TW/LC_MESSAGES/django.po
+++ b/locale/zh_TW/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seahub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 13:47+0800\n"
-"PO-Revision-Date: 2014-01-31 20:41+0000\n"
-"Last-Translator: carylorrk \n"
+"POT-Creation-Date: 2014-04-10 11:01+0800\n"
+"PO-Revision-Date: 2014-04-10 03:05+0000\n"
+"Last-Translator: xiez \n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/seahub/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,175 +18,207 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: seahub/forms.py:26 seahub/base/accounts.py:410
+#: seahub/forms.py:27 seahub/base/accounts.py:410
 msgid "A user with this email already"
 msgstr "該電子信箱已被註冊"
 
-#: seahub/forms.py:40 seahub/auth/forms.py:129 seahub/auth/forms.py:171
+#: seahub/forms.py:41 seahub/auth/forms.py:122 seahub/auth/forms.py:164
 #: seahub/base/accounts.py:427
 msgid "The two password fields didn't match."
 msgstr "兩次輸入的密碼不一致"
 
-#: seahub/forms.py:49 seahub/group/forms.py:56 seahub/wiki/forms.py:16
+#: seahub/forms.py:50 seahub/group/forms.py:56 seahub/wiki/forms.py:16
 msgid "Name can't be empty"
 msgstr "名稱不能為空"
 
-#: seahub/forms.py:50 seahub/group/forms.py:57 seahub/wiki/forms.py:17
+#: seahub/forms.py:51 seahub/group/forms.py:57 seahub/wiki/forms.py:17
 msgid "Name is too long (maximum is 255 characters)"
 msgstr "名稱太長（不超過255個漢字）"
 
-#: seahub/forms.py:53 seahub/group/forms.py:60 seahub/wiki/forms.py:20
+#: seahub/forms.py:54 seahub/group/forms.py:60 seahub/wiki/forms.py:20
 msgid "Description can't be empty"
 msgstr "描述不能為空"
 
-#: seahub/forms.py:54 seahub/group/forms.py:61 seahub/wiki/forms.py:21
+#: seahub/forms.py:55 seahub/group/forms.py:61 seahub/wiki/forms.py:21
 msgid "Description is too long (maximum is 100 characters)"
 msgstr "描述太長（不超過100個漢字）"
 
-#: seahub/forms.py:63
+#: seahub/forms.py:64
 #, python-format
 msgid "Name %s is not valid"
 msgstr "名稱 %s 含有無效字元"
 
-#: seahub/forms.py:77 seahub/message/views.py:127 seahub/share/views.py:729
-#: seahub/share/views.py:762 seahub/views/__init__.py:1074
-#: seahub/views/ajax.py:334 seahub/views/ajax.py:393 seahub/views/ajax.py:484
-#: seahub/views/ajax.py:619 seahub/views/ajax.py:779 seahub/views/ajax.py:977
-#: seahub/views/ajax.py:1045 seahub/views/ajax.py:1049
-#: seahub/views/ajax.py:1053
+#: seahub/forms.py:78 seahub/message/views.py:149 seahub/share/views.py:708
+#: seahub/share/views.py:741 seahub/views/__init__.py:1107
+#: seahub/views/__init__.py:1158 seahub/views/ajax.py:356
+#: seahub/views/ajax.py:415 seahub/views/ajax.py:506 seahub/views/ajax.py:641
+#: seahub/views/ajax.py:832 seahub/views/ajax.py:948 seahub/views/ajax.py:980
+#: seahub/views/ajax.py:1013 seahub/views/ajax.py:1145
+#: seahub/views/ajax.py:1213 seahub/views/ajax.py:1217
+#: seahub/views/ajax.py:1221 seahub/views/ajax.py:1455
 msgid "Argument missing"
 msgstr "參數缺失"
 
-#: seahub/forms.py:91
+#: seahub/forms.py:92
 msgid "Oldname is required"
 msgstr "需要 oldname"
 
-#: seahub/forms.py:94 seahub/forms.py:115
+#: seahub/forms.py:95 seahub/forms.py:116
 msgid "It's too long."
 msgstr "太長。"
 
-#: seahub/forms.py:95 seahub/forms.py:116
+#: seahub/forms.py:96 seahub/forms.py:117
 msgid "It's required."
 msgstr "必填項。"
 
-#: seahub/forms.py:102 seahub/forms.py:123
+#: seahub/forms.py:103 seahub/forms.py:124
 #, python-format
 msgid "Name \"%s\" is not valid"
 msgstr "名稱 \"%s\" 含有無效字元"
 
-#: seahub/forms.py:134
+#: seahub/forms.py:135
 msgid "Repo id is required"
 msgstr "repo id 為必填項"
 
-#: seahub/forms.py:135
+#: seahub/forms.py:136
 msgid "Username is required"
 msgstr "用戶名為必填項"
 
-#: seahub/forms.py:136
+#: seahub/forms.py:137 seahub/forms.py:181
 msgid "Password can't be empty"
 msgstr "密碼不能為空"
 
-#: seahub/forms.py:147
+#: seahub/forms.py:148
 msgid "Bad url format"
 msgstr "錯誤的 url 格式"
 
-#: seahub/forms.py:152 seahub/templates/repo.html:361
+#: seahub/forms.py:153 seahub/templates/repo.html:358
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
-#: seahub/forms.py:154 seahub/views/__init__.py:1083
+#: seahub/forms.py:155 seahub/views/__init__.py:1113
+#: seahub/views/__init__.py:1167 seahub/views/ajax.py:680
+#: seahub/views/ajax.py:709 seahub/views/ajax.py:747 seahub/views/ajax.py:784
 msgid "Internal server error"
 msgstr "伺服器內部錯誤"
 
-#: seahub/forms.py:156
+#: seahub/forms.py:157
 msgid "Decrypt library error"
 msgstr "解密資料庫出錯"
 
-#: seahub/forms.py:162 seahub/share/forms.py:19 seahub/share/forms.py:29
+#: seahub/forms.py:163 seahub/share/forms.py:19 seahub/share/forms.py:29
 msgid "Email is required"
 msgstr "請輸入電子信箱"
 
-#: seahub/forms.py:164 seahub/templates/sysadmin/userinfo.html:135
+#: seahub/forms.py:165 seahub/templates/sysadmin/userinfo.html:129
 msgid "Quota can't be empty"
 msgstr "容量不能為空"
 
-#: seahub/forms.py:165
+#: seahub/forms.py:166
 msgid "Quota is too low (minimum value is 0)"
 msgstr "容量太小（最小為0）"
 
-#: seahub/forms.py:171
+#: seahub/forms.py:172
 msgid "Library name is required"
 msgstr "資料庫名稱為必填項"
 
-#: seahub/forms.py:172
+#: seahub/forms.py:173
 msgid "Library description is required"
 msgstr "資料庫描述為必填項"
 
-#: seahub/forms.py:174
+#: seahub/forms.py:175
 msgid "Please enter a number"
 msgstr "請輸入數字"
 
+#: seahub/forms.py:188
+msgid "Please enter a correct password."
+msgstr ""
+
 #: seahub/settings.py:133
+msgid "català"
+msgstr ""
+
+#: seahub/settings.py:134
 msgid "Deutsch"
 msgstr "Deutsch"
 
-#: seahub/settings.py:134
+#: seahub/settings.py:135
 msgid "English"
 msgstr "English"
 
-#: seahub/settings.py:135
+#: seahub/settings.py:136
 msgid "Español"
 msgstr "Español"
 
-#: seahub/settings.py:136
+#: seahub/settings.py:137
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: seahub/settings.py:138
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: seahub/settings.py:137
-msgid "Français"
-msgstr "Français"
-
-#: seahub/settings.py:138
-msgid "Hebrew"
-msgstr "Hebrew"
-
 #: seahub/settings.py:139
+msgid "français"
+msgstr ""
+
+#: seahub/settings.py:140
+msgid "עברית"
+msgstr ""
+
+#: seahub/settings.py:141
 msgid "Magyar"
 msgstr "Magyar"
 
-#: seahub/settings.py:140
+#: seahub/settings.py:142
+msgid "Íslenska"
+msgstr ""
+
+#: seahub/settings.py:143
 msgid "Italiano"
 msgstr "Italiano"
 
-#: seahub/settings.py:141
+#: seahub/settings.py:144
+msgid "한국어"
+msgstr ""
+
+#: seahub/settings.py:145
 msgid "Latvian"
 msgstr "Latvian"
 
-#: seahub/settings.py:142
-msgid "Dutch"
-msgstr "Dutch"
+#: seahub/settings.py:146
+msgid "Nederlands"
+msgstr ""
 
-#: seahub/settings.py:143
+#: seahub/settings.py:147
+msgid "Polski"
+msgstr ""
+
+#: seahub/settings.py:148
 msgid "Portuguese, Brazil"
 msgstr "Portuguese, Brazil"
 
-#: seahub/settings.py:144
+#: seahub/settings.py:149
 msgid "Русский"
 msgstr "Русский"
 
-#: seahub/settings.py:145
+#: seahub/settings.py:150
 msgid "Slovak"
 msgstr "Slovak"
 
-#: seahub/settings.py:146
-msgid "Ukrainian"
-msgstr "Ukrainian"
+#: seahub/settings.py:151
+msgid "Svenska"
+msgstr ""
 
-#: seahub/settings.py:147
+#: seahub/settings.py:152
+msgid "українська мова"
+msgstr ""
+
+#: seahub/settings.py:153
 msgid "简体中文"
 msgstr "简体中文"
 
-#: seahub/settings.py:148
+#: seahub/settings.py:154
 msgid "繁體中文"
 msgstr "繁體中文"
 
@@ -195,8 +227,9 @@ msgid "File Collaboration Team Organization"
 msgstr "文件 合作 團隊 團體"
 
 #: seahub/api2/templates/api2/discussion.html:6
-#: seahub/group/templates/group/group_base.html:25
+#: seahub/group/templates/group/group_base.html:23
 #: seahub/group/templates/group/groups_right_panel.html:17
+#: seahub/templates/base.html:160
 msgid "Discussion"
 msgstr "討論"
 
@@ -208,16 +241,17 @@ msgstr "討論"
 #: seahub/api2/templates/api2/discussions_body.html:37
 #: seahub/api2/templates/api2/new_msg_reply.html:27
 #: seahub/api2/templates/api2/new_msg_reply.html:43
-#: seahub/group/templates/group/group_discuss.html:45
-#: seahub/group/templates/group/group_discuss.html:61
-#: seahub/group/templates/group/new_msg_reply.html:26
-#: seahub/group/templates/group/new_msg_reply.html:35
-#: seahub/message/templates/message/user_msg_list.html:47
+#: seahub/api2/templates/api2/user_msg_body.html:20
+#: seahub/group/templates/group/group_discuss.html:74
+#: seahub/group/templates/group/new_msg_reply.html:27
+#: seahub/group/templates/group/new_msg_reply.html:36
+#: seahub/message/templates/message/user_msg.html:17
+#: seahub/message/templates/message/user_msg_list.html:62
 #: seahub/share/templates/share/links.html:28
 #: seahub/share/templates/share/priv_shared_files.html:61
 #: seahub/templates/repo_history_view.html:66
 #: seahub/templates/repo_recycle_view.html:78
-#: seahub/templates/view_shared_dir.html:53
+#: seahub/templates/view_shared_dir.html:48
 #: seahub/templates/snippets/group_recommend_form.html:28
 #: seahub/templates/snippets/repo_dirents.html:57
 msgid "File"
@@ -227,13 +261,13 @@ msgstr "文件"
 #: seahub/api2/templates/api2/discussion_posted.html:29
 #: seahub/api2/templates/api2/discussions_body.html:31
 #: seahub/api2/templates/api2/new_msg_reply.html:37
-#: seahub/group/templates/group/group_discuss.html:55
-#: seahub/group/templates/group/new_msg_reply.html:29
+#: seahub/group/templates/group/group_discuss.html:68
+#: seahub/group/templates/group/new_msg_reply.html:30
 #: seahub/share/templates/share/links.html:31
 #: seahub/share/templates/share/links.html:63
 #: seahub/share/templates/share/priv_shared_files.html:64
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
-#: seahub/templates/pubrepo.html:28 seahub/templates/view_shared_dir.html:39
+#: seahub/templates/pubrepo.html:26 seahub/templates/pubrepo.html.py:29
+#: seahub/templates/pubrepo.html:31 seahub/templates/view_shared_dir.html:34
 #: seahub/templates/snippets/group_recommend_form.html:22
 #: seahub/templates/snippets/repo_dirents.html:8
 msgid "Directory icon"
@@ -242,9 +276,9 @@ msgstr "目錄圖示"
 #: seahub/api2/templates/api2/discussion_posted.html:46
 #: seahub/api2/templates/api2/discussions_body.html:48
 #: seahub/group/templates/group/discussion_list.html:17
-#: seahub/group/templates/group/group_discuss.html:71
-#: seahub/group/templates/group/group_discuss.html:147
-#: seahub/group/templates/group/new_msg_reply.html:45
+#: seahub/group/templates/group/group_discuss.html:85
+#: seahub/group/templates/group/group_discuss.html:160
+#: seahub/group/templates/group/new_msg_reply.html:47
 #, python-format
 msgid "%(amount)s replies"
 msgstr "%(amount)s 個回復"
@@ -255,43 +289,48 @@ msgstr "暫無討論"
 
 #: seahub/api2/templates/api2/discussions.html:29
 #: seahub/api2/templates/api2/events.html:13
+#: seahub/api2/templates/api2/user_msg_list.html:25
 #: seahub/notifications/templates/notifications/user_notification_list.html:26
-#: seahub/templates/activities.html:13 seahub/templates/repo.html:957
-#: seahub/templates/snippets/list_commit_detail.html:3
-#: seahub/templates/snippets/repo_dir_data.html:46
+#: seahub/templates/activities.html:13
+#: seahub/templates/snippets/repo_dir_data.html:48
 msgid "Loading..."
 msgstr "載入中..."
 
 #: seahub/api2/templates/api2/discussions.html:75
 #: seahub/api2/templates/api2/events_js.html:34
+#: seahub/api2/templates/api2/user_msg_list.html:72
 #: seahub/contacts/templates/contacts/contact_list.html:107
 #: seahub/contacts/templates/contacts/contact_list.html:153
-#: seahub/group/templates/group/group_discuss.html:231
+#: seahub/group/templates/group/group_discuss.html:244
 #: seahub/group/templates/group/msg_js.html:155
-#: seahub/message/templates/message/all_msg_list.html:141
-#: seahub/message/templates/message/all_msg_list.html:208
-#: seahub/message/templates/message/user_msg_list.html:156
+#: seahub/message/templates/message/all_msg_list.html:143
+#: seahub/message/templates/message/all_msg_list.html:219
+#: seahub/message/templates/message/user_msg_list.html:168
 #: seahub/notifications/templates/notifications/user_notification_list.html:66
-#: seahub/templates/base.html:139 seahub/templates/file_edit.html:592
-#: seahub/templates/repo.html:302 seahub/templates/repo.html.py:1406
-#: seahub/templates/repo.html:1454 seahub/templates/repo.html.py:1628
-#: seahub/templates/repo.html:1734 seahub/templates/repo.html.py:1806
-#: seahub/templates/repo_settings.html:100
-#: seahub/templates/repo_settings.html:136
-#: seahub/templates/view_file_base.html:151
+#: seahub/templates/base.html:123 seahub/templates/file_edit.html:592
+#: seahub/templates/repo.html:299 seahub/templates/repo.html.py:714
+#: seahub/templates/repo.html:1511 seahub/templates/repo.html.py:1559
+#: seahub/templates/repo.html:1775 seahub/templates/repo.html.py:1800
+#: seahub/templates/repo.html:1829 seahub/templates/repo.html.py:1935
+#: seahub/templates/repo.html:2007 seahub/templates/repo_settings.html:118
+#: seahub/templates/repo_settings.html:154
+#: seahub/templates/repo_settings.html:219
+#: seahub/templates/view_file_base.html:153
 #: seahub/templates/snippets/bottom_bar.html:109
 #: seahub/templates/snippets/events_js.html:56
-#: seahub/templates/snippets/office_convert_js.html:172
-#: seahub/templates/snippets/office_convert_js.html:197
+#: seahub/templates/snippets/msg_form_js.html:30
+#: seahub/templates/snippets/office_convert_js.html:177
+#: seahub/templates/snippets/office_convert_js.html:202
 #: seahub/templates/snippets/repo_decrypt_js.html:35
-#: seahub/templates/snippets/shared_link_js.html:154
-#: seahub/templates/snippets/shared_link_js.html:189
-#: seahub/templates/snippets/shared_link_js.html:213
-#: seahub/templates/snippets/shared_link_js.html:276
-#: seahub/templates/snippets/shared_link_js.html:306
-#: seahub/templates/snippets/shared_link_js.html:330
-#: seahub/templates/sysadmin/sys_useradmin.html:94
-#: seahub/templates/sysadmin/userinfo.html:158
+#: seahub/templates/snippets/shared_link_js.html:197
+#: seahub/templates/snippets/shared_link_js.html:283
+#: seahub/templates/snippets/shared_link_js.html:308
+#: seahub/templates/snippets/shared_link_js.html:371
+#: seahub/templates/snippets/shared_link_js.html:437
+#: seahub/templates/snippets/shared_link_js.html:462
+#: seahub/templates/snippets/spreadsheet_convert_js.html:32
+#: seahub/templates/sysadmin/sys_useradmin.html:132
+#: seahub/templates/sysadmin/userinfo.html:152
 msgid "Failed. Please check the network."
 msgstr "操作失敗。請檢查網絡是否已連接。"
 
@@ -340,6 +379,25 @@ msgstr "請檢查網絡是否已連接。"
 msgid "New Replies"
 msgstr "新回覆"
 
+#: seahub/api2/templates/api2/user_msg_list.html:6
+#: seahub/message/templates/message/all_msg_list.html:4
+#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/user_msg_list.html:4
+#: seahub/share/templates/share/user_share_list.html:24
+#: seahub/templates/home_base.html:22
+msgid "Messages"
+msgstr "訊息"
+
+#: seahub/api2/templates/api2/user_msg_list.html:10
+#: seahub/message/templates/message/user_msg_list.html:9
+#, python-format
+msgid "Messages with %(name)s"
+msgstr "與 %(name)s 的訊息"
+
+#: seahub/api2/templates/api2/user_msg_list.html:19
+msgid "No messages."
+msgstr ""
+
 #: seahub/auth/admin.py:29
 msgid "Personal info"
 msgstr "個人資訊"
@@ -353,10 +411,11 @@ msgid "Important dates"
 msgstr "重要日期"
 
 #: seahub/auth/admin.py:32 seahub/group/templates/group/groups.html:5
-#: seahub/templates/admin_base.html:16 seahub/templates/myhome_base.html:10
-#: seahub/templates/org_admin_base.html:14 seahub/templates/org_base.html:15
-#: seahub/templates/pub_base.html:13 seahub/templates/pubgrp.html:8
+#: seahub/templates/myhome_base.html:9 seahub/templates/org_admin_base.html:14
+#: seahub/templates/org_base.html:15 seahub/templates/pub_base.html:13
+#: seahub/templates/pubgrp.html:8
 #: seahub/templates/snippets/repo_share_form.html:7
+#: seahub/templates/sysadmin/base.html:15
 msgid "Groups"
 msgstr "群組"
 
@@ -369,72 +428,74 @@ msgstr "密碼修改成功"
 msgid "Change password: %s"
 msgstr "修改密碼：%s"
 
-#: seahub/auth/forms.py:19 seahub/base/accounts.py:396
+#: seahub/auth/forms.py:18 seahub/base/accounts.py:396
 msgid "Username"
 msgstr "用戶名"
 
-#: seahub/auth/forms.py:20 seahub/auth/forms.py:159
-#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:10
-#: seahub/templates/registration/registration_form.html:18
+#: seahub/auth/forms.py:19 seahub/auth/forms.py:152
+#: seahub/base/accounts.py:400 seahub/templates/registration/login.html:36
+#: seahub/templates/registration/registration_form.html:19
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
 #: seahub/templates/snippets/repo_create_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:26
+#: seahub/templates/sysadmin/sys_useradmin.html:31
 msgid "Password"
 msgstr "密碼"
 
-#: seahub/auth/forms.py:40
+#: seahub/auth/forms.py:39
 msgid ""
 "Please enter a correct username and password. Note that both fields are "
 "case-sensitive."
 msgstr "請輸入正確的用戶名和密碼。注意兩者皆需區分大小寫"
 
-#: seahub/auth/forms.py:42
+#: seahub/auth/forms.py:41
 msgid "This account is inactive."
 msgstr "該帳戶未啓動。"
 
-#: seahub/auth/forms.py:47
+#: seahub/auth/forms.py:46
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "你的瀏覽器似乎沒啟用 cookie. 登錄需要 cookie."
 
-#: seahub/auth/forms.py:63
+#: seahub/auth/forms.py:62
 msgid "E-mail"
 msgstr "電子信箱"
 
-#: seahub/auth/forms.py:70
+#: seahub/auth/forms.py:69
 msgid ""
 "Failed to send email, email service is not properly configured, please "
 "contact administrator."
 msgstr "郵件發送失敗， 電子信箱服務沒配置好，請聯繫管理員。"
 
-#: seahub/auth/forms.py:78
+#: seahub/auth/forms.py:77
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "該電子信箱沒有相關聯的用戶帳號。確定註冊了嗎？"
 
-#: seahub/auth/forms.py:108
+#: seahub/auth/forms.py:101
 #, python-format
-msgid "Password reset on %s"
-msgstr "密碼重置：%s"
+msgid "Reset Password on %s"
+msgstr ""
 
-#: seahub/auth/forms.py:116
+#: seahub/auth/forms.py:109
 msgid "New password"
 msgstr "新密碼"
 
-#: seahub/auth/forms.py:117
+#: seahub/auth/forms.py:110
 msgid "New password confirmation"
 msgstr "新密碼確認"
 
-#: seahub/auth/forms.py:143
+#: seahub/auth/forms.py:136
 msgid "Old password"
 msgstr "舊密碼"
 
-#: seahub/auth/forms.py:151
+#: seahub/auth/forms.py:144
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "舊密碼輸入錯誤。請重新輸入。"
 
-#: seahub/auth/forms.py:160 seahub/base/accounts.py:402
+#: seahub/auth/forms.py:153 seahub/base/accounts.py:402
 msgid "Password (again)"
 msgstr "請再次輸入密碼"
 
@@ -472,7 +533,7 @@ msgid ""
 "%(nb_max_avatars)d."
 msgstr "你已經有 %(nb_avatars)d 個頭像，最大上限爲%(nb_max_avatars)d."
 
-#: seahub/avatar/models.py:138 seahub/avatar/models.py:163
+#: seahub/avatar/models.py:137 seahub/avatar/models.py:165
 #, python-format
 msgid "Avatar for %s"
 msgstr "頭像給 %s"
@@ -540,57 +601,62 @@ msgstr "當前頭像："
 #: seahub/contacts/templates/contacts/contact_list.html:62
 #: seahub/group/templates/group/discussion_list.html:42
 #: seahub/group/templates/group/group_base.html:61
-#: seahub/group/templates/group/group_discuss.html:16
-#: seahub/group/templates/group/group_discuss.html:98
-#: seahub/group/templates/group/group_discuss.html:155
+#: seahub/group/templates/group/group_discuss.html:17
+#: seahub/group/templates/group/group_discuss.html:29
+#: seahub/group/templates/group/group_discuss.html:112
+#: seahub/group/templates/group/group_discuss.html:168
 #: seahub/group/templates/group/group_info.html:130
 #: seahub/group/templates/group/group_manage.html:100
 #: seahub/group/templates/group/group_manage.html:108
 #: seahub/group/templates/group/group_pubinfo.html:24
-#: seahub/group/templates/group/group_wiki.html:25
-#: seahub/group/templates/group/group_wiki.html:57
+#: seahub/group/templates/group/group_wiki.html:51
+#: seahub/group/templates/group/group_wiki.html:61
+#: seahub/group/templates/group/group_wiki.html:94
 #: seahub/group/templates/group/group_wiki_pages.html:33
 #: seahub/group/templates/group/groups_right_panel.html:37
 #: seahub/group/templates/group/grpmember_add_form.html:32
-#: seahub/group/templates/group/new_msg_reply.html:65
-#: seahub/message/templates/message/all_msg_list.html:50
-#: seahub/message/templates/message/user_msg_list.html:20
-#: seahub/notifications/templates/notifications/notification_list.html:15
+#: seahub/group/templates/group/new_msg_reply.html:67
+#: seahub/message/templates/message/all_msg_list.html:51
+#: seahub/message/templates/message/user_msg_list.html:21
+#: seahub/message/templates/message/user_msg_list.html:33
+#: seahub/notifications/templates/notifications/notification_list.html:14
 #: seahub/options/templates/options/set_user_options.html:14
-#: seahub/profile/templates/profile/set_profile.html:60
-#: seahub/profile/templates/profile/set_profile.html:75
+#: seahub/profile/templates/profile/set_profile.html:61
 #: seahub/profile/templates/profile/set_profile.html:86
-#: seahub/profile/templates/profile/set_profile.html:112
+#: seahub/profile/templates/profile/set_profile.html:97
+#: seahub/profile/templates/profile/set_profile.html:123
 #: seahub/templates/activities.html:25
 #: seahub/templates/decrypt_repo_form.html:13
 #: seahub/templates/file_edit.html:98 seahub/templates/file_edit.html:245
-#: seahub/templates/home_base.html:49 seahub/templates/repo.html:72
-#: seahub/templates/repo.html.py:122 seahub/templates/repo.html:152
-#: seahub/templates/repo.html.py:176 seahub/templates/repo.html:197
-#: seahub/templates/repo.html.py:206 seahub/templates/repo.html:231
-#: seahub/templates/repo_settings.html:28
-#: seahub/templates/repo_settings.html:36
+#: seahub/templates/home_base.html:52 seahub/templates/repo.html:63
+#: seahub/templates/repo.html.py:113 seahub/templates/repo.html:143
+#: seahub/templates/repo.html.py:167 seahub/templates/repo.html:188
+#: seahub/templates/repo.html.py:204 seahub/templates/repo.html:229
+#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:39
+#: seahub/templates/repo_settings.html:53
+#: seahub/templates/share_access_validation.html:10
 #: seahub/templates/shared_file_view.html:50
-#: seahub/templates/registration/login.html:34
 #: seahub/templates/registration/password_change_form.html:18
 #: seahub/templates/registration/password_reset_confirm.html:19
 #: seahub/templates/registration/password_reset_form.html:13
-#: seahub/templates/registration/registration_form.html:33
 #: seahub/templates/snippets/add_to_contacts_form.html:8
 #: seahub/templates/snippets/file_share_popup.html:24
-#: seahub/templates/snippets/file_share_popup.html:41
-#: seahub/templates/snippets/file_share_popup.html:61
+#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:95
 #: seahub/templates/snippets/group_recommend_form.html:19
 #: seahub/templates/snippets/repo_create_form.html:26
-#: seahub/templates/snippets/repo_share_form.html:52
+#: seahub/templates/snippets/repo_share_form.html:30
 #: seahub/templates/snippets/search_form.html:57
 #: seahub/templates/sysadmin/repo_transfer_form.html:8
-#: seahub/templates/sysadmin/sys_repo_search.html:11
-#: seahub/templates/sysadmin/sys_useradmin.html:31
-#: seahub/templates/sysadmin/user_search.html:10
-#: seahub/templates/sysadmin/userinfo.html:53
-#: seahub/templates/wiki/personal_wiki.html:24
-#: seahub/templates/wiki/personal_wiki.html:52
+#: seahub/templates/sysadmin/sys_repo_search.html:13
+#: seahub/templates/sysadmin/sys_useradmin.html:36
+#: seahub/templates/sysadmin/sys_useradmin.html:51
+#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/userinfo.html:47
+#: seahub/templates/wiki/personal_wiki.html:46
+#: seahub/templates/wiki/personal_wiki.html:56
+#: seahub/templates/wiki/personal_wiki.html:85
 #: seahub/templates/wiki/personal_wiki_pages.html:31
 msgid "Submit"
 msgstr "提交"
@@ -607,7 +673,7 @@ msgstr "%(avatar_creator)s 已更新頭像 %(avatar)s."
 msgstr "你已更新你的頭像 %(avatar)s。"
 
-#: seahub/avatar/templatetags/avatar_tags.py:46
+#: seahub/avatar/templatetags/avatar_tags.py:47
 msgid "Default Avatar"
 msgstr "預設頭像"
 
@@ -639,7 +705,7 @@ msgstr "電話"
 msgid "note"
 msgstr "備註"
 
-#: seahub/base/decorators.py:85
+#: seahub/base/decorators.py:102
 msgid "Files in this library can not be viewed online."
 msgstr "該資料庫中的文件無法在線查看。"
 
@@ -696,7 +762,7 @@ msgstr "文件\"%(file)s\"還原到%(time)s."
 msgid "Recovered deleted directory"
 msgstr "還原已刪除的目錄"
 
-#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:879
+#: seahub/base/templatetags/seahub_tags.py:120 seahub/views/__init__.py:965
 msgid "Changed library name or description"
 msgstr "修改了資料庫名稱或描述"
 
@@ -706,9 +772,9 @@ msgstr "系統自動合併修改"
 
 #: seahub/base/templatetags/seahub_tags.py:179
 #: seahub/base/templatetags/seahub_tags.py:213
-#: seahub/group/templates/group/group_discuss.html:140
-#: seahub/templates/repo.html:1543
-#: seahub/templates/snippets/my_owned_repos.html:226
+#: seahub/group/templates/group/group_discuss.html:154
+#: seahub/templates/repo.html:1647
+#: seahub/templates/snippets/my_owned_repos.html:130
 msgid "Just now"
 msgstr "剛才"
 
@@ -740,42 +806,48 @@ msgstr[0] "%(seconds)d 秒前"
 #: seahub/group/templates/group/group_info.html:31
 #: seahub/group/templates/group/group_info.html:34
 #: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/share/views.py:365 seahub/share/views.py:496
+#: seahub/share/views.py:362 seahub/share/views.py:493
 #: seahub/share/templates/share/list_priv_shared_folders.html:23
 #: seahub/share/templates/share/list_priv_shared_folders.html:36
 #: seahub/share/templates/share/repos.html:24
 #: seahub/share/templates/share/repos.html:26
 #: seahub/share/templates/share/repos.html:40
 #: seahub/share/templates/share/user_share_list.html:42
-#: seahub/templates/pubrepo.html:23 seahub/templates/pubrepo.html.py:26
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21 seahub/templates/pubrepo.html:26
+#: seahub/templates/pubrepo.html.py:29
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
 #: seahub/templates/snippets/my_owned_repos.html:29
 #: seahub/templates/snippets/my_owned_repos.html:31
 #: seahub/templates/snippets/my_owned_repos.html:75
 #: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:223
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
 #: seahub/templates/snippets/repo_create_form.html:11
-#: seahub/templates/snippets/repo_share_form.html:47
-#: seahub/templates/sysadmin/userinfo.html:78
-#: seahub/templates/sysadmin/userinfo.html:104
+#: seahub/templates/snippets/repo_share_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:72
+#: seahub/templates/sysadmin/userinfo.html:98
 msgid "Read-Write"
 msgstr "可讀寫"
 
 #: seahub/base/templatetags/seahub_tags.py:312
 #: seahub/group/templates/group/group_info.html:36
 #: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/views.py:367 seahub/share/views.py:498
+#: seahub/share/views.py:364 seahub/share/views.py:495
 #: seahub/share/templates/share/list_priv_shared_folders.html:34
 #: seahub/share/templates/share/repos.html:38
 #: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/pubrepo.html:28 seahub/templates/repo.html:22
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:190
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:23 seahub/templates/pubrepo.html:31
+#: seahub/templates/repo.html:20
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_shared_repos.html:22
 #: seahub/templates/snippets/repo_create_form.html:12
-#: seahub/templates/snippets/repo_share_form.html:48
+#: seahub/templates/snippets/repo_share_form.html:26
 msgid "Read-Only"
 msgstr "唯讀"
 
@@ -784,33 +856,33 @@ msgstr "唯讀"
 msgid "Email is required."
 msgstr "電子信箱為必填項。"
 
-#: seahub/contacts/views.py:62 seahub/contacts/views.py:99
-#: seahub/group/views.py:806
+#: seahub/contacts/views.py:64 seahub/contacts/views.py:101
+#: seahub/group/views.py:796
 #, python-format
 msgid "%s is not a valid email."
 msgstr "%s 是一個無效的電子信箱地址"
 
-#: seahub/contacts/views.py:67 seahub/contacts/views.py:103
+#: seahub/contacts/views.py:69 seahub/contacts/views.py:105
 #, python-format
 msgid "%s is already in your contacts."
 msgstr "%s 已在通訊錄中。"
 
-#: seahub/contacts/views.py:76 seahub/contacts/views.py:111
+#: seahub/contacts/views.py:78 seahub/contacts/views.py:113
 #, python-format
 msgid "Successfully added %s to contacts."
 msgstr "你已成功新增 %s 為聯絡人。"
 
-#: seahub/contacts/views.py:81 seahub/contacts/views.py:114
+#: seahub/contacts/views.py:83 seahub/contacts/views.py:116
 #, python-format
 msgid "Failed to add %s to contacts."
 msgstr "新增 %s 失敗。"
 
-#: seahub/contacts/views.py:136
+#: seahub/contacts/views.py:138
 #, python-format
 msgid "Successfully edited %s."
 msgstr "編輯 %s 成功。"
 
-#: seahub/contacts/views.py:149
+#: seahub/contacts/views.py:151
 #, python-format
 msgid "Successfully Deleted %s"
 msgstr "成功刪除 %s "
@@ -835,10 +907,10 @@ msgstr "電子信箱"
 #: seahub/contacts/templates/contacts/contact_list.html:18
 #: seahub/group/templates/group/group_info.html:21
 #: seahub/group/templates/group/group_info_for_pub.html:13
-#: seahub/group/templates/group/group_wiki.html:20
-#: seahub/group/templates/group/group_wiki.html:54
+#: seahub/group/templates/group/group_wiki.html:46
+#: seahub/group/templates/group/group_wiki.html:91
 #: seahub/group/templates/group/group_wiki_pages.html:30
-#: seahub/message/templates/message/all_msg_list.html:21
+#: seahub/message/templates/message/all_msg_list.html:22
 #: seahub/share/templates/share/links.html:20
 #: seahub/share/templates/share/links.html:56
 #: seahub/share/templates/share/list_priv_shared_folders.html:15
@@ -846,45 +918,46 @@ msgstr "電子信箱"
 #: seahub/share/templates/share/priv_shared_files.html:53
 #: seahub/share/templates/share/repos.html:15
 #: seahub/share/templates/share/user_share_list.html:33
-#: seahub/templates/pubrepo.html:13 seahub/templates/repo_history_view.html:52
+#: seahub/templates/my_group_repos.html:8
+#: seahub/templates/my_shared_repos.html:7 seahub/templates/pubrepo.html:16
+#: seahub/templates/repo_history_view.html:52
 #: seahub/templates/repo_recycle_view.html:53
-#: seahub/templates/repo_settings.html:15
-#: seahub/templates/view_shared_dir.html:32
-#: seahub/templates/registration/registration_form.html:12
+#: seahub/templates/repo_settings.html:17
+#: seahub/templates/view_shared_dir.html:27
+#: seahub/templates/registration/registration_form.html:13
+#: seahub/templates/snippets/my_group_repos.html:8
 #: seahub/templates/snippets/my_owned_repos.html:20
 #: seahub/templates/snippets/my_owned_repos.html:67
-#: seahub/templates/snippets/my_owned_repos.html:114
-#: seahub/templates/snippets/my_owned_repos.html:168
-#: seahub/templates/snippets/my_owned_repos.html:217
+#: seahub/templates/snippets/my_owned_repos.html:121
+#: seahub/templates/snippets/my_shared_repos.html:6
 #: seahub/templates/snippets/repo_create_form.html:4
-#: seahub/templates/snippets/repo_dir_data.html:38
+#: seahub/templates/snippets/repo_dir_data.html:40
 #: seahub/templates/sysadmin/repoadmin_table.html:4
-#: seahub/templates/sysadmin/sys_group_admin.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:20
+#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_list_system.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:11
-#: seahub/templates/sysadmin/sys_publink_admin.html:10
-#: seahub/templates/sysadmin/sys_repo_search.html:9
-#: seahub/templates/sysadmin/userinfo.html:71
-#: seahub/templates/sysadmin/userinfo.html:97
-#: seahub/templates/wiki/personal_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:49
+#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:11
+#: seahub/templates/sysadmin/userinfo.html:65
+#: seahub/templates/sysadmin/userinfo.html:91
+#: seahub/templates/wiki/personal_wiki.html:41
+#: seahub/templates/wiki/personal_wiki.html:82
 #: seahub/templates/wiki/personal_wiki_pages.html:28
 msgid "Name"
 msgstr "名稱"
 
 #: seahub/contacts/templates/contacts/contact_list.html:19
-#: seahub/templates/registration/registration_form.html:28
+#: seahub/templates/registration/registration_form.html:29
 msgid "Note"
 msgstr "備註"
 
 #: seahub/contacts/templates/contacts/contact_list.html:20
 #: seahub/group/templates/group/group_info.html:25
 #: seahub/group/templates/group/group_info_for_pub.html:17
-#: seahub/group/templates/group/group_manage.html:22
+#: seahub/group/templates/group/group_manage.html:25
 #: seahub/group/templates/group/group_manage.html:49
 #: seahub/group/templates/group/group_manage.html:79
-#: seahub/notifications/templates/notifications/notification_list.html:7
-#: seahub/notifications/templates/notifications/notification_list.html:26
+#: seahub/notifications/templates/notifications/notification_list.html:21
 #: seahub/share/templates/share/links.html:23
 #: seahub/share/templates/share/links.html:59
 #: seahub/share/templates/share/list_priv_shared_folders.html:19
@@ -893,56 +966,64 @@ msgstr "備註"
 #: seahub/share/templates/share/repos.html:19
 #: seahub/share/templates/share/user_share_list.html:36
 #: seahub/templates/client_mgmt.html:17
-#: seahub/templates/file_revisions.html:28 seahub/templates/pubrepo.html:17
+#: seahub/templates/file_revisions.html:28
+#: seahub/templates/my_shared_repos.html:11 seahub/templates/pubrepo.html:20
 #: seahub/templates/repo_recycle_view.html:56
 #: seahub/templates/repo_view_snapshot.html:18
-#: seahub/templates/view_shared_dir.html:34
+#: seahub/templates/view_shared_dir.html:29
 #: seahub/templates/snippets/my_owned_repos.html:23
 #: seahub/templates/snippets/my_owned_repos.html:70
-#: seahub/templates/snippets/my_owned_repos.html:118
-#: seahub/templates/snippets/my_owned_repos.html:220
-#: seahub/templates/snippets/repo_dir_data.html:41
+#: seahub/templates/snippets/my_owned_repos.html:124
+#: seahub/templates/snippets/my_shared_repos.html:10
+#: seahub/templates/snippets/repo_dir_data.html:43
 #: seahub/templates/sysadmin/repoadmin_table.html:8
-#: seahub/templates/sysadmin/sys_group_admin.html:15
+#: seahub/templates/sysadmin/sys_group_admin.html:16
 #: seahub/templates/sysadmin/sys_org_admin.html:15
-#: seahub/templates/sysadmin/sys_publink_admin.html:14
-#: seahub/templates/sysadmin/useradmin_table.html:8
-#: seahub/templates/sysadmin/userinfo.html:73
+#: seahub/templates/sysadmin/sys_publink_admin.html:16
+#: seahub/templates/sysadmin/useradmin_table.html:9
+#: seahub/templates/sysadmin/useradmin_table.html:74
+#: seahub/templates/sysadmin/userinfo.html:67
 msgid "Operations"
 msgstr "操作"
 
 #: seahub/contacts/templates/contacts/contact_list.html:29
+#: seahub/group/templates/group/group_wiki.html:22
 #: seahub/share/templates/share/list_priv_shared_folders.html:29
 #: seahub/share/templates/share/repos.html:33
 #: seahub/templates/file_edit.html:80
 #: seahub/templates/view_file_markdown.html:13
 #: seahub/templates/view_file_sf.html:6
 #: seahub/templates/view_file_text.html:24
-#: seahub/templates/sysadmin/useradmin_table.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:90
+#: seahub/templates/wiki/personal_wiki.html:21
 msgid "Edit"
 msgstr "編輯"
 
 #: seahub/contacts/templates/contacts/contact_list.html:30
-#: seahub/group/templates/group/group_discuss.html:33
-#: seahub/group/templates/group/group_discuss.html:138
-#: seahub/group/templates/group/group_manage.html:31
+#: seahub/group/templates/group/group_discuss.html:45
+#: seahub/group/templates/group/group_discuss.html:152
+#: seahub/group/templates/group/group_manage.html:34
 #: seahub/group/templates/group/group_manage.html:58
-#: seahub/notifications/templates/notifications/notification_list.html:38
-#: seahub/profile/templates/profile/set_profile.html:102
-#: seahub/templates/repo.html:58 seahub/templates/repo.html.py:267
+#: seahub/message/templates/message/user_msg.html:8
+#: seahub/message/templates/message/user_msg_list.html:52
+#: seahub/notifications/templates/notifications/notification_list.html:33
+#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/templates/repo.html:49 seahub/templates/repo.html.py:264
 #: seahub/templates/view_shared_upload_link.html:87
-#: seahub/templates/snippets/file_share_popup.html:34
-#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:55
+#: seahub/templates/snippets/file_share_popup.html:88
 #: seahub/templates/snippets/my_owned_repos.html:46
 #: seahub/templates/snippets/my_owned_repos.html:94
-#: seahub/templates/snippets/my_owned_repos.html:232
+#: seahub/templates/snippets/my_owned_repos.html:136
 #: seahub/templates/snippets/repo_dirents.html:35
 #: seahub/templates/snippets/repo_dirents.html:89
-#: seahub/templates/sysadmin/repoadmin_table.html:18
-#: seahub/templates/sysadmin/sys_group_admin.html:22
+#: seahub/templates/sysadmin/repoadmin_table.html:24
+#: seahub/templates/sysadmin/sys_group_admin.html:23
 #: seahub/templates/sysadmin/sys_org_admin.html:23
-#: seahub/templates/sysadmin/useradmin_table.html:46
-#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:115
+#: seahub/templates/sysadmin/userinfo.html:76
 msgid "Delete"
 msgstr "刪除"
 
@@ -958,17 +1039,19 @@ msgstr "聯絡人用來在共享資料庫和發送文件外鏈時的快速補全
 
 #: seahub/contacts/templates/contacts/contact_list.html:44
 #: seahub/contacts/templates/contacts/contact_list.html:55
-#: seahub/group/templates/group/group_manage.html:21
+#: seahub/group/templates/group/group_manage.html:24
 #: seahub/group/templates/group/group_manage.html:48
-#: seahub/templates/repo_settings.html:34
-#: seahub/templates/registration/login.html:8
-#: seahub/templates/registration/registration_form.html:16
+#: seahub/templates/repo_settings.html:37
+#: seahub/templates/registration/login.html:34
+#: seahub/templates/registration/registration_form.html:17
 #: seahub/templates/snippets/add_to_contacts_form.html:2
 #: seahub/templates/sysadmin/repo_transfer_form.html:5
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:18
-#: seahub/templates/sysadmin/sys_useradmin.html:24
-#: seahub/templates/sysadmin/user_search.html:9
-#: seahub/templates/sysadmin/useradmin_table.html:4
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:29
+#: seahub/templates/sysadmin/user_search.html:11
+#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:70
+#: seahub/templates/sysadmin/userinfo.html:11
 msgid "Email"
 msgstr "電子信箱"
 
@@ -993,8 +1076,8 @@ msgid "Delete Contact"
 msgstr "刪除聯絡人"
 
 #: seahub/contacts/templates/contacts/contact_list.html:115
-#: seahub/notifications/templates/notifications/notification_list.html:57
-#: seahub/templates/sysadmin/sys_group_admin.html:63
+#: seahub/notifications/templates/notifications/notification_list.html:52
+#: seahub/templates/sysadmin/sys_group_admin.html:64
 #: seahub/templates/sysadmin/sys_org_admin.html:63
 #: seahub/templates/sysadmin/useradmin_js.html:4
 #, python-format
@@ -1070,399 +1153,414 @@ msgstr "驗證資訊太長，不超過255個字元"
 msgid "\"%s\" is not a valid name"
 msgstr "名稱 %s 含有無效字符"
 
-#: seahub/group/views.py:145
+#: seahub/group/views.py:140
 #, python-format
 msgid ""
 "You can only create %d groups.Upgrade "
 "account."
 msgstr "你只能創建%d個群組。升級帳號。"
 
-#: seahub/group/views.py:160
+#: seahub/group/views.py:155
 msgid "There is already a group with that name."
 msgstr "已有同名群組"
 
-#: seahub/group/views.py:264
+#: seahub/group/views.py:259
 #, python-format
 msgid "Successfully renamed group to \"%s\"."
 msgstr "成功重命名群組為 \"%s\"。"
 
-#: seahub/group/views.py:266
+#: seahub/group/views.py:261
 msgid ""
 "Failed to rename group, group name can only contain letters, numbers or "
 "underscore"
 msgstr "重命名群組失敗，群組名稱只能包含中英文字元，數字及底線。"
 
-#: seahub/group/views.py:285
+#: seahub/group/views.py:280
 #, python-format
 msgid "Email %s is not valid."
 msgstr "電子信箱 %s 含有無效字元"
 
-#: seahub/group/views.py:314 seahub/group/views.py:336
+#: seahub/group/views.py:309 seahub/group/views.py:331
 msgid "Only administrators can make the group public"
 msgstr "只有管理員才能將群組公開。"
 
-#: seahub/group/views.py:382
+#: seahub/group/views.py:377 seahub/message/views.py:121
 msgid "The message doesn't exist"
 msgstr "該留言不存在"
 
-#: seahub/group/views.py:392
+#: seahub/group/views.py:387 seahub/message/views.py:130
 msgid "You don't have the permission."
 msgstr "你的權限不夠。"
 
-#: seahub/group/views.py:630 seahub/group/views.py:781
+#: seahub/group/views.py:626 seahub/group/views.py:771
 #, python-format
 msgid ""
 "You can only invite %d members.Upgrade "
 "account."
 msgstr "你只能邀請%d個成員。升級帳號。"
 
-#: seahub/group/views.py:655
-msgid "Your friend added you to a group at Seafile."
-msgstr "你的朋友在 Seafile 上把你加入到了一個群組中。"
+#: seahub/group/views.py:645
+#, python-format
+msgid "You are invited to join a group on %s"
+msgstr ""
 
-#: seahub/group/views.py:681
+#: seahub/group/views.py:671
 #, python-format
 msgid "Failed to add, %s is not registerd."
 msgstr "新增失敗，%s 未註冊。"
 
-#: seahub/group/views.py:695
+#: seahub/group/views.py:685
 #, python-format
 msgid "Successfully added. An email has been sent."
 msgid_plural "Successfully added. %(count)s emails have been sent."
 msgstr[0] "新增群組成員成功，%(count)s 封邀請郵件已發送。"
 
-#: seahub/group/views.py:703
+#: seahub/group/views.py:693
 msgid "Successfully added."
 msgstr "新增成功。"
 
-#: seahub/group/views.py:752
+#: seahub/group/views.py:742
 #, python-format
 msgid "Failed to add, %s is not a valid email."
 msgstr "新增失敗，%s 是一個無效的電子信箱地址"
 
-#: seahub/group/views.py:762
+#: seahub/group/views.py:752
 #, python-format
 msgid "Failed to add, %s is not registrated."
 msgstr "新增失敗，%s 還沒註冊。"
 
-#: seahub/group/views.py:794 seahub/group/views.py:811
-#: seahub/group/views.py:838
+#: seahub/group/views.py:784 seahub/group/views.py:801
+#: seahub/group/views.py:828
 msgid "Operation succeeded."
 msgstr "操作成功"
 
-#: seahub/group/views.py:840
+#: seahub/group/views.py:830
 #, python-format
 msgid "Failed：%s"
 msgstr "刪除失敗：%s"
 
-#: seahub/group/views.py:865
+#: seahub/group/views.py:855
 msgid "Failed to unshare: the group doesn't exist."
 msgstr "取消共享失敗，該群組不存在"
 
-#: seahub/group/views.py:870
+#: seahub/group/views.py:860
 msgid ""
 "Operation failed: only administrators and the owner of the library can "
 "unshare it."
 msgstr "操作失敗：只有管理員和資料庫擁有者才能取消共享。"
 
-#: seahub/group/views.py:873
+#: seahub/group/views.py:863
 msgid "Failed to unshare: internal error."
 msgstr "取消共享失敗：內部錯誤。"
 
-#: seahub/group/views.py:902
+#: seahub/group/views.py:892
 msgid "Error: wrong group id"
 msgstr "推薦失敗：群組id不正確"
 
-#: seahub/group/views.py:907
+#: seahub/group/views.py:897
 msgid "Error: the group does not exist."
 msgstr "錯誤：該群組不存在。"
 
-#: seahub/group/views.py:939
+#: seahub/group/views.py:929
 #, python-format
 msgid "Successfully posted to %(groups)s."
 msgstr "成功發送到 %(groups)s。"
 
-#: seahub/group/views.py:942
+#: seahub/group/views.py:932
 #, python-format
 msgid "Error: you are not in group %s."
 msgstr "推薦到 %s 失敗：你不在該群組中。"
 
-#: seahub/group/views.py:954
+#: seahub/group/views.py:944
 msgid "Error: the library does not exist."
 msgstr "錯誤：該資料庫不存在。"
 
-#: seahub/group/views.py:957
+#: seahub/group/views.py:947
 msgid "Error: no path."
 msgstr "錯誤：路徑不存在。"
 
-#: seahub/group/views.py:995
+#: seahub/group/views.py:985
 msgid "Failed to create: the group does not exist."
 msgstr "創建失敗：該群組不存在。"
 
-#: seahub/group/views.py:999
+#: seahub/group/views.py:989
 msgid "Failed to create: you are not in the group."
 msgstr "創建失敗：你不在該群組中。"
 
-#: seahub/group/views.py:1025 seahub/group/views.py:1056
-#: seahub/group/views.py:1436 seahub/views/wiki.py:127
+#: seahub/group/views.py:1015 seahub/group/views.py:1046
+#: seahub/group/views.py:1460 seahub/views/wiki.py:146
 msgid "Failed to create"
 msgstr "創建失敗"
 
-#: seahub/group/views.py:1039 seahub/group/views.py:1069
-#: seahub/group/views.py:1445
+#: seahub/group/views.py:1029 seahub/group/views.py:1059
+#: seahub/group/views.py:1469
 msgid "Failed to create: internal error."
 msgstr "創建團體群組失敗。"
 
-#: seahub/group/views.py:1093
+#: seahub/group/views.py:1083
 msgid "You are already in the group."
 msgstr "你已在該群組中。"
 
-#: seahub/group/views.py:1108
+#: seahub/group/views.py:1098
 msgid "Sent successfully, the group admin will handle it."
 msgstr "發送成功，請等候管理員處理。"
 
-#: seahub/group/views.py:1269 seahub/views/__init__.py:575
-#: seahub/views/ajax.py:1068 seahub/views/file.py:297 seahub/views/file.py:596
-#: seahub/views/file.py:686
+#: seahub/group/views.py:1174
+msgid "Discussion is required."
+msgstr ""
+
+#: seahub/group/views.py:1277 seahub/views/__init__.py:659
+#: seahub/views/ajax.py:1236 seahub/views/file.py:306 seahub/views/file.py:618
+#: seahub/views/file.py:710
 msgid "File does not exist"
 msgstr "文件不存在"
 
-#: seahub/group/views.py:1305
+#: seahub/group/views.py:1313
 msgid "Successfully enable \"Wiki\"."
 msgstr "\"維基\"模組已新增。"
 
-#: seahub/group/views.py:1310
+#: seahub/group/views.py:1318
 msgid "Successfully disable \"Wiki\"."
 msgstr "\"維基\"模組已刪除。"
 
-#: seahub/group/views.py:1346 seahub/group/views.py:1483
-#: seahub/views/wiki.py:54 seahub/views/wiki.py:161
+#: seahub/group/views.py:1357 seahub/group/views.py:1531
+#: seahub/views/wiki.py:60 seahub/views/wiki.py:202
 msgid "Failed to create wiki page. Please retry later."
 msgstr "創建維基頁面失敗，請稍後再試"
 
-#: seahub/group/views.py:1388 seahub/views/__init__.py:569
-#: seahub/views/__init__.py:1171 seahub/views/__init__.py:1448
-#: seahub/views/wiki.py:90
+#: seahub/group/views.py:1412 seahub/views/__init__.py:653
+#: seahub/views/__init__.py:1255 seahub/views/__init__.py:1532
+#: seahub/views/wiki.py:109
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: seahub/group/views.py:1390 seahub/views/wiki.py:92
+#: seahub/group/views.py:1414 seahub/views/wiki.py:111
 msgid "Wiki does not exists."
 msgstr "Wiki不存在"
 
-#: seahub/group/views.py:1452 seahub/views/wiki.py:134
+#: seahub/group/views.py:1476 seahub/group/views.py:1501
+#: seahub/views/wiki.py:153 seahub/views/wiki.py:176
 msgid "Failed to create home page. Please retry later"
 msgstr "創建首頁失敗，請稍後再試"
 
-#: seahub/group/views.py:1473 seahub/group/views.py:1499
-#: seahub/group/views.py:1517 seahub/views/wiki.py:151
-#: seahub/views/wiki.py:174 seahub/views/wiki.py:189
+#: seahub/group/views.py:1492 seahub/views/wiki.py:167
+msgid "Failed to set wiki library."
+msgstr ""
+
+#: seahub/group/views.py:1521 seahub/group/views.py:1547
+#: seahub/group/views.py:1565 seahub/views/wiki.py:192
+#: seahub/views/wiki.py:215 seahub/views/wiki.py:230
 msgid "Wiki is not found."
 msgstr "Wiki未找到。"
 
-#: seahub/group/views.py:1480 seahub/views/wiki.py:158
+#: seahub/group/views.py:1528 seahub/views/wiki.py:199
 #, python-format
 msgid "Page \"%s\" already exists."
 msgstr "頁面 \"%s\" 已存在。"
 
-#: seahub/group/templates/group/add_member_email.html:2
+#: seahub/group/views.py:1570
 #, python-format
-msgid ""
-"%(email)s invite you to join group %(group.group_name)s. Please go to the "
-"following page and sign up:"
-msgstr "%(email)s 邀請你加入到群組 %(group.group_name)s。請點擊以下連結註冊："
+msgid "Successfully deleted \"%s\"."
+msgstr ""
 
-#: seahub/group/templates/group/add_member_email.html:5
-#: seahub/group/templates/group/group_join_email.html:6
-#: seahub/templates/shared_link_email.html:7
-#: seahub/templates/shared_upload_link_email.html:7
-#: seahub/templates/registration/password_reset_email.html:10
-#: seahub/templates/sysadmin/user_add_email.html:14
-#: seahub/templates/sysadmin/user_reset_email.html:6
-msgid "Thanks for using our site!"
-msgstr "感謝使用！"
-
-#: seahub/group/templates/group/add_member_email.html:7
-#: seahub/group/templates/group/group_join_email.html:8
-#: seahub/templates/shared_link_email.html:9
-#: seahub/templates/shared_upload_link_email.html:9
-#: seahub/templates/registration/password_reset_email.html:12
-#: seahub/templates/sysadmin/user_add_email.html:16
-#: seahub/templates/sysadmin/user_reset_email.html:8
+#: seahub/group/views.py:1572
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s 團隊"
+msgid "Failed to delete \"%s\". Please retry later."
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:8
+msgid "Hi, "
+msgstr ""
+
+#: seahub/group/templates/group/add_member_email.html:11
+#, python-format
+msgid "%(email)s invited you to join group %(grp_name)s on %(site_name)s: "
+msgstr ""
 
 #: seahub/group/templates/group/discussion_list.html:18
-#: seahub/group/templates/group/group_discuss.html:72
-#: seahub/group/templates/group/group_discuss.html:148
-#: seahub/group/templates/group/new_msg_reply.html:46
+#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:161
+#: seahub/group/templates/group/new_msg_reply.html:48
 msgid "Hide replies"
 msgstr "收起回覆"
 
 #: seahub/group/templates/group/discussion_list.html:31
-#: seahub/group/templates/group/group_discuss.html:86
+#: seahub/group/templates/group/group_discuss.html:100
 #: seahub/group/templates/group/group_reply_list.html:11
-#: seahub/group/templates/group/new_msg_reply.html:56
+#: seahub/group/templates/group/new_msg_reply.html:58
 msgid "Reply"
 msgstr "回覆"
 
 #: seahub/group/templates/group/discussion_list.html:40
-#: seahub/group/templates/group/group_discuss.html:96
-#: seahub/group/templates/group/group_discuss.html:153
-#: seahub/group/templates/group/new_msg_reply.html:63
+#: seahub/group/templates/group/group_discuss.html:110
+#: seahub/group/templates/group/group_discuss.html:166
+#: seahub/group/templates/group/new_msg_reply.html:65
 msgid "Add a reply..."
 msgstr "新增回覆..."
 
 #: seahub/group/templates/group/discussion_list.html:41
-#: seahub/group/templates/group/group_discuss.html:97
-#: seahub/group/templates/group/group_discuss.html:154
-#: seahub/group/templates/group/new_msg_reply.html:64
+#: seahub/group/templates/group/group_discuss.html:111
+#: seahub/group/templates/group/group_discuss.html:167
+#: seahub/group/templates/group/new_msg_reply.html:66
 msgid "It can not be blank and should be no more than 2048 characters."
 msgstr "輸入不能為空且應少於2048個字元。"
 
 #: seahub/group/templates/group/discussion_list.html:43
-#: seahub/group/templates/group/group_discuss.html:17
-#: seahub/group/templates/group/group_discuss.html:99
-#: seahub/group/templates/group/group_discuss.html:156
+#: seahub/group/templates/group/group_discuss.html:18
+#: seahub/group/templates/group/group_discuss.html:30
+#: seahub/group/templates/group/group_discuss.html:113
+#: seahub/group/templates/group/group_discuss.html:169
 #: seahub/group/templates/group/group_info.html:131
-#: seahub/group/templates/group/new_msg_reply.html:66
-#: seahub/message/templates/message/all_msg_list.html:51
-#: seahub/message/templates/message/user_msg_list.html:21
-#: seahub/profile/templates/profile/set_profile.html:113
+#: seahub/group/templates/group/group_wiki.html:62
+#: seahub/group/templates/group/new_msg_reply.html:68
+#: seahub/message/templates/message/all_msg_list.html:52
+#: seahub/message/templates/message/user_msg_list.html:22
+#: seahub/message/templates/message/user_msg_list.html:34
+#: seahub/profile/templates/profile/set_profile.html:124
 #: seahub/templates/activities.html:26 seahub/templates/file_edit.html:99
-#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:153
-#: seahub/templates/repo.html.py:177 seahub/templates/repo.html:198
-#: seahub/templates/repo.html.py:207 seahub/templates/repo.html:266
-#: seahub/templates/shared_file_view.html:51
+#: seahub/templates/file_edit.html:246 seahub/templates/repo.html:144
+#: seahub/templates/repo.html.py:168 seahub/templates/repo.html:189
+#: seahub/templates/repo.html.py:196 seahub/templates/repo.html:205
+#: seahub/templates/repo.html.py:263 seahub/templates/shared_file_view.html:51
 #: seahub/templates/view_shared_upload_link.html:86
-#: seahub/templates/snippets/file_share_popup.html:42
-#: seahub/templates/snippets/file_share_popup.html:62
+#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:96
 #: seahub/templates/sysadmin/repo_transfer_form.html:9
+#: seahub/templates/wiki/personal_wiki.html:57
 msgid "Cancel"
 msgstr "取消"
 
-#: seahub/group/templates/group/group_base.html:13
-msgid "This group is public."
-msgstr "當前群組為公開群組。"
-
 #: seahub/group/templates/group/group_base.html:16
-#: seahub/group/templates/group/group_base.html:50
-#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:38
-#: seahub/templates/snippets/modules_toggle_tab.html:2
+#: seahub/group/templates/group/group_base.html:48
+#: seahub/templates/home_base.html:9 seahub/templates/home_base.html.py:39
 msgid "Enable Modules"
 msgstr "新增模組"
 
-#: seahub/group/templates/group/group_base.html:19
-msgid "Quit"
-msgstr "退出"
+#: seahub/group/templates/group/group_base.html:18
+msgid "This group is public."
+msgstr "當前群組為公開群組。"
 
-#: seahub/group/templates/group/group_base.html:23
+#: seahub/group/templates/group/group_base.html:21
 #: seahub/group/templates/group/group_info.html:11
 #: seahub/group/templates/group/group_info_for_pub.html:8
 #: seahub/group/templates/group/groups_right_panel.html:16
 #: seahub/share/templates/share/repos.html:10
-#: seahub/templates/admin_base.html:10 seahub/templates/home_base.html:12
-#: seahub/templates/home_base.html.py:28 seahub/templates/myhome.html:4
-#: seahub/templates/org_admin_base.html:11 seahub/templates/pub_base.html:12
-#: seahub/templates/pubrepo.html:8
+#: seahub/templates/home_base.html:12 seahub/templates/home_base.html.py:29
+#: seahub/templates/myhome.html:4 seahub/templates/org_admin_base.html:11
+#: seahub/templates/pub_base.html:12 seahub/templates/pubrepo.html:9
+#: seahub/templates/sysadmin/base.html:9
 msgid "Libraries"
 msgstr "資料庫"
 
-#: seahub/group/templates/group/group_base.html:29
-#: seahub/group/templates/group/group_base.html:56
+#: seahub/group/templates/group/group_base.html:27
+#: seahub/group/templates/group/group_base.html:55
 #: seahub/group/templates/group/groups_right_panel.html:19
 msgid "Wiki"
 msgstr "維基"
 
-#: seahub/group/templates/group/group_base.html:34
-#: seahub/templates/home_base.html:30
+#: seahub/group/templates/group/group_base.html:32
+#: seahub/templates/home_base.html:31
 msgid "Files"
 msgstr "文件"
 
-#: seahub/group/templates/group/group_base.html:38
-#: seahub/group/templates/group/group_manage.html:9
-#: seahub/group/templates/group/group_members.html:7
+#: seahub/group/templates/group/group_base.html:36
+#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_members.html:8
+#: seahub/templates/pub_base.html:14 seahub/templates/pubuser.html:16
 msgid "Members"
 msgstr "成員"
 
-#: seahub/group/templates/group/group_base.html:42
+#: seahub/group/templates/group/group_base.html:40
+#: seahub/templates/sysadmin/sys_useradmin.html:16
 msgid "Admin"
 msgstr "管理"
 
-#: seahub/group/templates/group/group_base.html:73
-msgid "Quit Group"
-msgstr "退出群組"
-
-#: seahub/group/templates/group/group_base.html:74
-msgid "Are you sure you want to quit this group?"
-msgstr "確定要退出該群組嗎？"
-
 #: seahub/group/templates/group/group_discuss.html:12
 msgid "Add a discussion..."
 msgstr "新增一個討論..."
 
-#: seahub/group/templates/group/group_discuss.html:21
+#: seahub/group/templates/group/group_discuss.html:19
+#: seahub/message/templates/message/all_msg_list.html:46
+#: seahub/message/templates/message/user_msg_list.html:23
+msgid "Add files"
+msgstr "新增文件"
+
+#: seahub/group/templates/group/group_discuss.html:25
+#: seahub/message/templates/message/user_msg_list.html:29
+msgid "Choose a file or files:"
+msgstr ""
+
+#: seahub/group/templates/group/group_discuss.html:33
 msgid "After login, you can post discussions and add replies."
 msgstr "登錄之後，你就可以發起討論和回覆。"
 
-#: seahub/group/templates/group/group_discuss.html:112
-#: seahub/message/templates/message/user_msg_list.html:65
-#: seahub/templates/pubuser.html:28 seahub/templates/repo_history.html:52
+#: seahub/group/templates/group/group_discuss.html:126
+#: seahub/message/templates/message/user_msg_list.html:80
+#: seahub/templates/pubuser.html:36 seahub/templates/repo_history.html:54
 #: seahub/templates/repo_view_snapshot.html:51
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:29
-#: seahub/templates/sysadmin/sys_publink_admin.html:30
-#: seahub/templates/sysadmin/sys_repo_admin.html:23
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:30
+#: seahub/templates/sysadmin/sys_publink_admin.html:31
+#: seahub/templates/sysadmin/sys_repo_admin.html:25
+#: seahub/templates/sysadmin/sys_trafficadmin.html:41
 #: seahub/templates/sysadmin/useradmin_paginator.html:4
 msgid "Previous"
 msgstr "前一頁"
 
-#: seahub/group/templates/group/group_discuss.html:122
-#: seahub/message/templates/message/user_msg_list.html:75
-#: seahub/templates/pubuser.html:38 seahub/templates/repo_history.html:55
+#: seahub/group/templates/group/group_discuss.html:136
+#: seahub/message/templates/message/user_msg_list.html:90
+#: seahub/templates/pubuser.html:46 seahub/templates/repo_history.html:57
 #: seahub/templates/repo_view_snapshot.html:54
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
-#: seahub/templates/sysadmin/sys_group_admin.html:32
-#: seahub/templates/sysadmin/sys_publink_admin.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:26
+#: seahub/templates/snippets/file_content_js.html:89
+#: seahub/templates/sysadmin/sys_group_admin.html:33
+#: seahub/templates/sysadmin/sys_publink_admin.html:34
+#: seahub/templates/sysadmin/sys_repo_admin.html:28
+#: seahub/templates/sysadmin/sys_trafficadmin.html:44
 #: seahub/templates/sysadmin/useradmin_paginator.html:7
 msgid "Next"
 msgstr "下一頁"
 
-#: seahub/group/templates/group/group_discuss.html:128
-#: seahub/message/templates/message/user_msg_list.html:81
+#: seahub/group/templates/group/group_discuss.html:142
+#: seahub/message/templates/message/user_msg_list.html:96
 msgid "↑Top"
 msgstr "↑Top"
 
-#: seahub/group/templates/group/group_discuss.html:248
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
 msgid "Really want to delete this discussion?"
 msgstr "確定要刪除這條討論？"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:113 seahub/templates/client_mgmt.html:55
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:107 seahub/templates/client_mgmt.html:55
+#: seahub/templates/devices.html:45
 #: seahub/templates/snippets/repo_del_popup.html:4
 msgid "Yes"
 msgstr "確定"
 
-#: seahub/group/templates/group/group_discuss.html:248
-#: seahub/templates/base.html:114 seahub/templates/client_mgmt.html:56
+#: seahub/group/templates/group/group_discuss.html:261
+#: seahub/message/templates/message/user_msg_list.html:183
+#: seahub/templates/base.html:108 seahub/templates/client_mgmt.html:56
+#: seahub/templates/devices.html:46
 #: seahub/templates/snippets/repo_del_popup.html:5
 msgid "No"
 msgstr "取消"
 
-#: seahub/group/templates/group/group_discuss.html:263
+#: seahub/group/templates/group/group_discuss.html:276
+#: seahub/message/templates/message/user_msg_list.html:198
 msgid "Successfully deleted"
 msgstr "刪除成功。"
 
-#: seahub/group/templates/group/group_discuss.html:265
+#: seahub/group/templates/group/group_discuss.html:278
+#: seahub/message/templates/message/user_msg_list.html:200
 msgid "Failed to delete: "
 msgstr "刪除失敗："
 
-#: seahub/group/templates/group/group_discuss.html:269
-#: seahub/templates/repo.html:771
+#: seahub/group/templates/group/group_discuss.html:282
+#: seahub/message/templates/message/user_msg_list.html:204
+#: seahub/templates/repo.html:840 seahub/templates/repo.html.py:1761
 msgid "Failed."
 msgstr "操作失敗"
 
@@ -1471,6 +1569,7 @@ msgid "Recent Changes"
 msgstr "最近修改"
 
 #: seahub/group/templates/group/group_info.html:14
+#: seahub/templates/pubrepo.html:10
 #: seahub/templates/snippets/my_owned_repos.html:13
 #: seahub/templates/snippets/repo_create_form.html:3
 msgid "New Library"
@@ -1479,77 +1578,58 @@ msgstr "新建資料庫"
 #: seahub/group/templates/group/group_info.html:22
 #: seahub/group/templates/group/group_info.html:76
 #: seahub/group/templates/group/group_info_for_pub.html:14
-#: seahub/group/templates/group/group_wiki.html:22
+#: seahub/group/templates/group/group_wiki.html:48
 #: seahub/share/templates/share/list_priv_shared_folders.html:18
 #: seahub/share/templates/share/repos.html:18
 #: seahub/share/templates/share/user_share_list.html:34
-#: seahub/templates/pubrepo.html:14 seahub/templates/repo_history.html:23
-#: seahub/templates/repo_settings.html:17
+#: seahub/templates/my_group_repos.html:9
+#: seahub/templates/my_shared_repos.html:8 seahub/templates/pubrepo.html:17
+#: seahub/templates/repo_history.html:23
+#: seahub/templates/repo_settings.html:19
+#: seahub/templates/snippets/my_group_repos.html:9
 #: seahub/templates/snippets/my_owned_repos.html:21
-#: seahub/templates/snippets/my_owned_repos.html:115
-#: seahub/templates/snippets/my_owned_repos.html:169
-#: seahub/templates/snippets/my_owned_repos.html:218
+#: seahub/templates/snippets/my_owned_repos.html:122
+#: seahub/templates/snippets/my_shared_repos.html:7
 #: seahub/templates/snippets/repo_create_form.html:6
 #: seahub/templates/sysadmin/repoadmin_table.html:7
-#: seahub/templates/sysadmin/sys_list_system.html:22
-#: seahub/templates/sysadmin/userinfo.html:72
-#: seahub/templates/sysadmin/userinfo.html:99
-#: seahub/templates/wiki/personal_wiki.html:21
+#: seahub/templates/sysadmin/sys_list_system.html:25
+#: seahub/templates/sysadmin/userinfo.html:66
+#: seahub/templates/sysadmin/userinfo.html:93
+#: seahub/templates/wiki/personal_wiki.html:43
 msgid "Description"
 msgstr "描述"
 
 #: seahub/group/templates/group/group_info.html:23
 #: seahub/group/templates/group/group_info_for_pub.html:15
 #: seahub/share/templates/share/user_share_list.html:35
-#: seahub/templates/pubrepo.html:15 seahub/templates/starred.html:15
+#: seahub/templates/my_group_repos.html:10
+#: seahub/templates/my_shared_repos.html:9 seahub/templates/pubrepo.html:18
+#: seahub/templates/starred.html:15
+#: seahub/templates/snippets/my_group_repos.html:10
 #: seahub/templates/snippets/my_owned_repos.html:22
 #: seahub/templates/snippets/my_owned_repos.html:69
-#: seahub/templates/snippets/my_owned_repos.html:116
-#: seahub/templates/snippets/my_owned_repos.html:170
-#: seahub/templates/snippets/my_owned_repos.html:219
-#: seahub/templates/snippets/repo_dir_data.html:40
+#: seahub/templates/snippets/my_owned_repos.html:123
+#: seahub/templates/snippets/my_shared_repos.html:8
+#: seahub/templates/snippets/repo_dir_data.html:42
 msgid "Last Update"
 msgstr "更新時間"
 
 #: seahub/group/templates/group/group_info.html:24
 #: seahub/group/templates/group/group_info_for_pub.html:16
-#: seahub/templates/snippets/my_owned_repos.html:117
-#: seahub/templates/snippets/my_owned_repos.html:171
+#: seahub/templates/my_group_repos.html:11
+#: seahub/templates/my_shared_repos.html:10
+#: seahub/templates/snippets/my_group_repos.html:11
+#: seahub/templates/snippets/my_shared_repos.html:9
 msgid "Shared By"
 msgstr "共享來源"
 
-#: seahub/group/templates/group/group_info.html:31
-#: seahub/group/templates/group/group_info.html:34
-#: seahub/group/templates/group/group_info.html:36
-#: seahub/group/templates/group/group_info_for_pub.html:24
-#: seahub/group/templates/group/group_info_for_pub.html:26
-#: seahub/share/templates/share/list_priv_shared_folders.html:23
-#: seahub/share/templates/share/repos.html:24
-#: seahub/share/templates/share/repos.html:26
-#: seahub/share/templates/share/user_share_list.html:42
-#: seahub/share/templates/share/user_share_list.html:44
-#: seahub/templates/snippets/my_owned_repos.html:29
-#: seahub/templates/snippets/my_owned_repos.html:31
-#: seahub/templates/snippets/my_owned_repos.html:75
-#: seahub/templates/snippets/my_owned_repos.html:77
-#: seahub/templates/snippets/my_owned_repos.html:125
-#: seahub/templates/snippets/my_owned_repos.html:128
-#: seahub/templates/snippets/my_owned_repos.html:130
-#: seahub/templates/snippets/my_owned_repos.html:185
-#: seahub/templates/snippets/my_owned_repos.html:188
-#: seahub/templates/snippets/my_owned_repos.html:190
-#: seahub/templates/snippets/my_owned_repos.html:223
-#: seahub/templates/sysadmin/userinfo.html:78
-msgid "directory icon"
-msgstr "目錄圖示"
-
 #: seahub/group/templates/group/group_info.html:52
 #: seahub/share/templates/share/user_share_list.html:56
-#: seahub/templates/pubrepo.html:38
+#: seahub/templates/my_shared_repos.html:37 seahub/templates/pubrepo.html:41
 #: seahub/templates/snippets/my_owned_repos.html:43
 #: seahub/templates/snippets/my_owned_repos.html:89
-#: seahub/templates/snippets/my_owned_repos.html:144
-#: seahub/templates/snippets/my_owned_repos.html:229
+#: seahub/templates/snippets/my_owned_repos.html:133
+#: seahub/templates/snippets/my_shared_repos.html:36
 msgid "Download and Sync"
 msgstr "下載和同步"
 
@@ -1565,7 +1645,7 @@ msgstr "下載和同步"
 #: seahub/share/templates/share/repos.html:54
 #: seahub/share/templates/share/repos.html:56
 #: seahub/share/templates/share/user_share_list.html:61
-#: seahub/templates/pubrepo.html:41
+#: seahub/templates/pubrepo.html:44
 msgid "Unshare"
 msgstr "取消共享"
 
@@ -1602,15 +1682,16 @@ msgid "Modified at"
 msgstr "修改於"
 
 #: seahub/group/templates/group/group_info.html:78
+#: seahub/templates/file_revisions.html:26
 #: seahub/templates/repo_history.html:22
 msgid "Modifier"
 msgstr "修改者"
 
 #: seahub/group/templates/group/group_info.html:98
 #: seahub/group/templates/group/group_info.html:100
-#: seahub/templates/repo.html:162 seahub/templates/repo.html.py:164
-#: seahub/templates/repo.html:168 seahub/templates/repo.html.py:170
-#: seahub/templates/repo_history.html:44
+#: seahub/templates/repo.html:153 seahub/templates/repo.html.py:155
+#: seahub/templates/repo.html:159 seahub/templates/repo.html.py:161
+#: seahub/templates/repo_history.html:45
 #: seahub/templates/repo_view_snapshot.html:38
 #: seahub/templates/snippets/current_commit.html:4
 #: seahub/templates/snippets/events_body.html:18
@@ -1619,23 +1700,23 @@ msgid "Details"
 msgstr "詳情"
 
 #: seahub/group/templates/group/group_info.html:107
-#: seahub/group/templates/group/new_msg_reply.html:74
-#: seahub/templates/pubuser.html:43 seahub/templates/repo_history.html:35
+#: seahub/group/templates/group/new_msg_reply.html:76
+#: seahub/templates/pubuser.html:51 seahub/templates/repo_history.html:36
 #: seahub/templates/repo_view_snapshot.html:29
-#: seahub/templates/sysadmin/sys_list_orphan.html:20
-#: seahub/templates/sysadmin/sys_list_system.html:33
-#: seahub/templates/sysadmin/sys_repo_admin.html:49
-#: seahub/templates/sysadmin/userinfo.html:88
-#: seahub/templates/sysadmin/userinfo.html:112
+#: seahub/templates/sysadmin/sys_list_orphan.html:23
+#: seahub/templates/sysadmin/sys_list_system.html:36
+#: seahub/templates/sysadmin/sys_repo_admin.html:51
+#: seahub/templates/sysadmin/userinfo.html:82
+#: seahub/templates/sysadmin/userinfo.html:106
 msgid "None"
 msgstr "無"
 
 #: seahub/group/templates/group/group_info.html:112
-#: seahub/templates/file_revisions.html:45
-#: seahub/templates/repo_history.html:38
+#: seahub/templates/file_revisions.html:49
+#: seahub/templates/repo_history.html:39
 #: seahub/templates/repo_history_view.html:21
 #: seahub/templates/repo_view_snapshot.html:32
-#: seahub/templates/snippets/current_commit.html:15
+#: seahub/templates/snippets/current_commit.html:11
 msgid "Unknown"
 msgstr "未知"
 
@@ -1654,15 +1735,43 @@ msgstr "密碼："
 msgid "The password will be kept in the server for only 1 hour."
 msgstr "密碼將在服務器上保存一小時。"
 
-#: seahub/group/templates/group/group_info.html:147
+#: seahub/group/templates/group/group_info.html:146
 msgid "Unshare Library"
 msgstr "取消共享資料庫"
 
-#: seahub/group/templates/group/group_info.html:148
+#: seahub/group/templates/group/group_info.html:147
 #, python-format
 msgid "Are you sure you want to unshare %s ?"
 msgstr "確定要取消共享 %s 嗎？"
 
+#: seahub/group/templates/group/group_info_for_pub.html:24
+#: seahub/group/templates/group/group_info_for_pub.html:26
+#: seahub/share/templates/share/list_priv_shared_folders.html:23
+#: seahub/share/templates/share/repos.html:24
+#: seahub/share/templates/share/repos.html:26
+#: seahub/share/templates/share/user_share_list.html:42
+#: seahub/share/templates/share/user_share_list.html:44
+#: seahub/templates/my_group_repos.html:25
+#: seahub/templates/my_group_repos.html:28
+#: seahub/templates/my_group_repos.html:30
+#: seahub/templates/my_shared_repos.html:18
+#: seahub/templates/my_shared_repos.html:21
+#: seahub/templates/my_shared_repos.html:23
+#: seahub/templates/snippets/my_group_repos.html:25
+#: seahub/templates/snippets/my_group_repos.html:28
+#: seahub/templates/snippets/my_group_repos.html:30
+#: seahub/templates/snippets/my_owned_repos.html:29
+#: seahub/templates/snippets/my_owned_repos.html:31
+#: seahub/templates/snippets/my_owned_repos.html:75
+#: seahub/templates/snippets/my_owned_repos.html:77
+#: seahub/templates/snippets/my_owned_repos.html:127
+#: seahub/templates/snippets/my_shared_repos.html:17
+#: seahub/templates/snippets/my_shared_repos.html:20
+#: seahub/templates/snippets/my_shared_repos.html:22
+#: seahub/templates/sysadmin/userinfo.html:72
+msgid "directory icon"
+msgstr "目錄圖示"
+
 #: seahub/group/templates/group/group_info_for_pub.html:46
 msgid "No public library is in this group"
 msgstr "當前群組沒有公開的資料庫"
@@ -1679,14 +1788,25 @@ msgid ""
 "message: "
 msgstr "%(user)s 申請加入到群組 “%(group_name)s”, 驗證資訊如下："
 
-#: seahub/group/templates/group/group_manage.html:10
+#: seahub/group/templates/group/group_join_email.html:6
+#: seahub/templates/email_base.html:9
+msgid "Thanks for using our site!"
+msgstr "感謝使用！"
+
+#: seahub/group/templates/group/group_join_email.html:8
+#: seahub/templates/email_base.html:13
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s 團隊"
+
+#: seahub/group/templates/group/group_manage.html:11
 msgid "Admins"
 msgstr "管理員"
 
-#: seahub/group/templates/group/group_manage.html:11
-#: seahub/profile/templates/profile/set_profile.html:22
-#: seahub/templates/repo.html:28
-#: seahub/templates/snippets/space_and_traffic.html:27
+#: seahub/group/templates/group/group_manage.html:12
+#: seahub/profile/templates/profile/set_profile.html:5
+#: seahub/profile/templates/profile/set_profile.html:23
+#: seahub/templates/base.html:68 seahub/templates/repo.html:29
 msgid "Settings"
 msgstr "設置"
 
@@ -1694,7 +1814,7 @@ msgstr "設置"
 msgid "Add Members"
 msgstr "新增成員"
 
-#: seahub/group/templates/group/group_manage.html:42
+#: seahub/group/templates/group/group_manage.html:16
 msgid "Add Admins"
 msgstr "新增管理員"
 
@@ -1703,7 +1823,7 @@ msgid "Avatar"
 msgstr "頭像"
 
 #: seahub/group/templates/group/group_manage.html:73
-#: seahub/profile/templates/profile/set_profile.html:29
+#: seahub/profile/templates/profile/set_profile.html:30
 msgid "Change"
 msgstr "修改"
 
@@ -1722,7 +1842,7 @@ msgid "Make Public"
 msgstr "設為公開"
 
 #: seahub/group/templates/group/group_manage.html:87
-#: seahub/templates/sysadmin/repoadmin_table.html:19
+#: seahub/templates/sysadmin/repoadmin_table.html:25
 msgid "Transfer"
 msgstr "轉讓"
 
@@ -1746,29 +1866,41 @@ msgstr "提示：必須是已註冊的電子信箱。"
 msgid "Rename Group To"
 msgstr "重命名群組為"
 
-#: seahub/group/templates/group/group_manage.html:121
+#: seahub/group/templates/group/group_manage.html:140
 msgid "Dismiss Group"
 msgstr "解散群組"
 
-#: seahub/group/templates/group/group_manage.html:122
+#: seahub/group/templates/group/group_manage.html:141
 msgid "Really want to dismiss this group?"
 msgstr "確定要解散該群組嗎？"
 
-#: seahub/group/templates/group/group_manage.html:125
+#: seahub/group/templates/group/group_manage.html:144
 msgid "Delete Member"
 msgstr "刪除成員"
 
-#: seahub/group/templates/group/group_manage.html:126
+#: seahub/group/templates/group/group_manage.html:145
 #, python-format
 msgid "Really want to delete %s ?"
 msgstr "確定要刪除 %s 嗎？"
 
-#: seahub/group/templates/group/group_members.html:17
+#: seahub/group/templates/group/group_members.html:10
+msgid "Quit"
+msgstr "退出"
+
+#: seahub/group/templates/group/group_members.html:22
 #: seahub/profile/templates/profile/user_profile.html:28
-#: seahub/templates/pubuser.html:19
+#: seahub/templates/pubuser.html:27
 msgid "Add to Contacts"
 msgstr "加到通訊錄"
 
+#: seahub/group/templates/group/group_members.html:35
+msgid "Quit Group"
+msgstr "退出群組"
+
+#: seahub/group/templates/group/group_members.html:36
+msgid "Are you sure you want to quit this group?"
+msgstr "確定要退出該群組嗎？"
+
 #: seahub/group/templates/group/group_pubinfo.html:9
 msgid "Join Group"
 msgstr "申請加入"
@@ -1795,12 +1927,29 @@ msgstr "成員數："
 msgid "Verification Message"
 msgstr "驗證訊息"
 
-#: seahub/group/templates/group/group_wiki.html:12
+#: seahub/group/templates/group/group_wiki.html:13
+#: seahub/group/templates/group/group_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/templates/wiki/personal_wiki.html:20
+msgid "Wiki Index"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:14
+#: seahub/templates/wiki/personal_wiki.html:16
+msgid "No index now."
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:16
+#: seahub/templates/repo.html:212 seahub/templates/wiki/personal_wiki.html:17
+msgid "Create"
+msgstr "創建"
+
+#: seahub/group/templates/group/group_wiki.html:35
 msgid "This group currently has no wiki"
 msgstr "該群組目前還沒創建Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:13
-#: seahub/templates/wiki/personal_wiki.html:14
+#: seahub/group/templates/group/group_wiki.html:36
+#: seahub/templates/wiki/personal_wiki.html:33
 msgid ""
 "Seafile Wiki enables you to organize your knowledge in a simple way. The "
 "contents of wiki is stored in a normal library with pre-defined file/folder "
@@ -1808,82 +1957,105 @@ msgid ""
 "back to the server."
 msgstr "Seafile Wiki 能讓你以一種非常簡單的方式管理你的知識。Wiki 的內容以預定義的文件/目錄結構存儲在一個普通的資料庫中，這樣便可以在本地編輯，然後同步回伺服器。"
 
-#: seahub/group/templates/group/group_wiki.html:15
-#: seahub/templates/wiki/personal_wiki.html:15
+#: seahub/group/templates/group/group_wiki.html:38
+#: seahub/templates/wiki/personal_wiki.html:34
 msgid "Create Wiki Now"
 msgstr "現在創建Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:19
-#: seahub/templates/wiki/personal_wiki.html:18
+#: seahub/group/templates/group/group_wiki.html:40
+#: seahub/templates/wiki/personal_wiki.html:36
+msgid "Choose a library as wiki"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:45
+#: seahub/templates/wiki/personal_wiki.html:40
 msgid "Create Wiki"
 msgstr "創建Wiki"
 
-#: seahub/group/templates/group/group_wiki.html:23
+#: seahub/group/templates/group/group_wiki.html:49
 msgid "Wiki Pages"
 msgstr "Wiki 頁面"
 
-#: seahub/group/templates/group/group_wiki.html:31
+#: seahub/group/templates/group/group_wiki.html:55
+#: seahub/templates/wiki/personal_wiki.html:50
+msgid "Choose a library as wiki:"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:60
+#: seahub/profile/templates/profile/set_profile.html:122
+#: seahub/templates/wiki/personal_wiki.html:55
+msgid "Please click and choose a library."
+msgstr "請選擇資料庫。"
+
+#: seahub/group/templates/group/group_wiki.html:68
 #: seahub/group/templates/group/group_wiki_pages.html:11
-#: seahub/templates/wiki/personal_wiki.html:30
+#: seahub/templates/wiki/personal_wiki.html:63
 #: seahub/templates/wiki/personal_wiki_pages.html:13
 msgid "Home"
 msgstr "首頁"
 
-#: seahub/group/templates/group/group_wiki.html:32
+#: seahub/group/templates/group/group_wiki.html:69
 #: seahub/group/templates/group/group_wiki_pages.html:12
-#: seahub/templates/wiki/personal_wiki.html:31
+#: seahub/templates/wiki/personal_wiki.html:64
 #: seahub/templates/wiki/personal_wiki_pages.html:14
 msgid "Pages"
 msgstr "頁面"
 
-#: seahub/group/templates/group/group_wiki.html:34
+#: seahub/group/templates/group/group_wiki.html:71
 #: seahub/group/templates/group/group_wiki_pages.html:14
-#: seahub/templates/wiki/personal_wiki.html:32
+#: seahub/templates/wiki/personal_wiki.html:65
 #: seahub/templates/wiki/personal_wiki_pages.html:15
 msgid "Wiki History"
 msgstr "Wiki歷史"
 
-#: seahub/group/templates/group/group_wiki.html:39
-#: seahub/group/templates/group/group_wiki.html:53
+#: seahub/group/templates/group/group_wiki.html:76
+#: seahub/group/templates/group/group_wiki.html:90
 #: seahub/group/templates/group/group_wiki_pages.html:18
 #: seahub/group/templates/group/group_wiki_pages.html:29
-#: seahub/templates/wiki/personal_wiki.html:35
-#: seahub/templates/wiki/personal_wiki.html:48
+#: seahub/templates/wiki/personal_wiki.html:68
+#: seahub/templates/wiki/personal_wiki.html:81
 #: seahub/templates/wiki/personal_wiki_pages.html:17
 #: seahub/templates/wiki/personal_wiki_pages.html:27
 msgid "New Page"
 msgstr "新建頁面"
 
-#: seahub/group/templates/group/group_wiki.html:40
-#: seahub/templates/wiki/personal_wiki.html:36
+#: seahub/group/templates/group/group_wiki.html:77
+#: seahub/group/templates/group/group_wiki.html:136
+#: seahub/templates/wiki/personal_wiki.html:69
+#: seahub/templates/wiki/personal_wiki.html:127
 msgid "Delete Page"
 msgstr "刪除頁面"
 
-#: seahub/group/templates/group/group_wiki.html:41
-#: seahub/templates/wiki/personal_wiki.html:37
+#: seahub/group/templates/group/group_wiki.html:78
+#: seahub/templates/wiki/personal_wiki.html:70
 msgid "Edit Page"
 msgstr "編輯頁面"
 
-#: seahub/group/templates/group/group_wiki.html:42
-#: seahub/templates/wiki/personal_wiki.html:38
+#: seahub/group/templates/group/group_wiki.html:79
+#: seahub/templates/wiki/personal_wiki.html:71
 msgid "Page History"
 msgstr "頁面歷史"
 
-#: seahub/group/templates/group/group_wiki.html:49
-#: seahub/templates/wiki/personal_wiki.html:44
+#: seahub/group/templates/group/group_wiki.html:86
+#: seahub/templates/wiki/personal_wiki.html:77
 #, python-format
 msgid "Last modified by %(modifier)s, %(modify_time)s"
 msgstr "最近修改：%(modifier)s, %(modify_time)s"
 
-#: seahub/group/templates/group/group_wiki.html:112
-#: seahub/templates/repo_settings.html:60
-#: seahub/templates/wiki/personal_wiki.html:107
+#: seahub/group/templates/group/group_wiki.html:137
+#: seahub/templates/wiki/personal_wiki.html:128
+msgid "Are you sure you want to delete this page?"
+msgstr ""
+
+#: seahub/group/templates/group/group_wiki.html:158
+#: seahub/templates/repo_settings.html:78
+#: seahub/templates/wiki/personal_wiki.html:149
 msgid "Name is required."
 msgstr "名稱為必填項。"
 
-#: seahub/group/templates/group/group_wiki.html:116
-#: seahub/templates/repo_settings.html:64
-#: seahub/templates/wiki/personal_wiki.html:111
+#: seahub/group/templates/group/group_wiki.html:162
+#: seahub/templates/repo_settings.html:82
+#: seahub/templates/wiki/personal_wiki.html:153
 msgid "Description is required."
 msgstr "描述為必填項"
 
@@ -1930,10 +2102,12 @@ msgstr "新增成員"
 
 #: seahub/group/templates/group/grpmember_add_form.html:6
 #: seahub/templates/snippets/repo_share_form.html:6
+#: seahub/templates/sysadmin/sys_useradmin.html:42
 msgid "Enter"
 msgstr "直接輸入"
 
 #: seahub/group/templates/group/grpmember_add_form.html:10
+#: seahub/templates/sysadmin/sys_useradmin.html:45
 msgid "emails, separated by ','"
 msgstr "輸入電子信箱，多個以,分隔"
 
@@ -1949,7 +2123,8 @@ msgstr "提示：必須是已註冊的電子信箱。"
 msgid "Add administrators"
 msgstr "新增管理員"
 
-#: seahub/group/templates/group/grpmember_add_js.html:41
+#: seahub/group/templates/group/grpmember_add_js.html:33
+#: seahub/templates/sysadmin/sys_useradmin.html:167
 msgid "Please enter emails, or select some."
 msgstr "請輸入電子信箱，或選擇一些。"
 
@@ -2228,135 +2403,119 @@ msgid ""
 " the library, you'll have to enter password again."
 msgstr "Seafile 伺服器不會儲存一個加密資料庫的密碼。要在線查看一個加密資料庫，你需要提供該資料庫的密碼。你的密碼將會儲存在伺服器的內存中。一小時後就會被清除。之後如果還想瀏覽改資料庫，則需要重新輸入密碼。"
 
-#: seahub/message/views.py:134
-#: seahub/message/templates/message/all_msg_list.html:164
+#: seahub/message/views.py:156
+#: seahub/message/templates/message/all_msg_list.html:166
 msgid "message is required"
 msgstr "訊息是必填項"
 
-#: seahub/message/views.py:137
-#: seahub/message/templates/message/all_msg_list.html:168
+#: seahub/message/views.py:159
+#: seahub/message/templates/message/all_msg_list.html:170
 msgid "contact is required"
 msgstr "聯絡人是必填項"
 
-#: seahub/message/views.py:159
+#: seahub/message/views.py:184
 msgid "You can not send message to yourself."
 msgstr "你不能發訊息給自己。"
 
-#: seahub/message/views.py:163
+#: seahub/message/views.py:188
 #, python-format
 msgid "Failed to send message to %s, user not found."
 msgstr "發送訊息失敗，%s 未找到。"
 
-#: seahub/message/templates/message/all_msg_list.html:4
-#: seahub/message/templates/message/all_msg_list.html:15
-#: seahub/message/templates/message/user_msg_list.html:4
-#: seahub/share/templates/share/user_share_list.html:24
-#: seahub/templates/home_base.html:22
-msgid "Messages"
-msgstr "訊息"
-
-#: seahub/message/templates/message/all_msg_list.html:16
+#: seahub/message/templates/message/all_msg_list.html:17
 msgid "New Message"
 msgstr "寫訊息"
 
-#: seahub/message/templates/message/all_msg_list.html:22
+#: seahub/message/templates/message/all_msg_list.html:23
 #: seahub/notifications/templates/notifications/user_notification_list.html:20
 msgid "Message"
 msgstr "訊息"
 
-#: seahub/message/templates/message/all_msg_list.html:23
+#: seahub/message/templates/message/all_msg_list.html:24
 #: seahub/notifications/templates/notifications/user_notification_list.html:21
 #: seahub/templates/file_revisions.html:25
 #: seahub/templates/repo_history.html:21
 msgid "Time"
 msgstr "時間"
 
-#: seahub/message/templates/message/all_msg_list.html:42
+#: seahub/message/templates/message/all_msg_list.html:43
 msgid "message..."
 msgstr "訊息..."
 
-#: seahub/message/templates/message/all_msg_list.html:45
-msgid "Add files"
-msgstr "新增文件"
-
-#: seahub/message/templates/message/all_msg_list.html:95
+#: seahub/message/templates/message/all_msg_list.html:97
 msgid "send to: click to select contacts"
 msgstr "發送給：點擊選擇聯絡人"
 
-#: seahub/message/templates/message/all_msg_list.html:101
+#: seahub/message/templates/message/all_msg_list.html:103
 msgid "please add contacts at first"
 msgstr "請先新增聯絡人"
 
-#: seahub/message/templates/message/all_msg_list.html:105
+#: seahub/message/templates/message/all_msg_list.html:107
 msgid "Failed to get your contacts for sending a message."
 msgstr "獲取聯絡人失敗，無法發送訊息。"
 
-#: seahub/message/templates/message/all_msg_list.html:136
+#: seahub/message/templates/message/all_msg_list.html:138
+#: seahub/templates/snippets/msg_form_js.html:25
 msgid "You don't have any library at present"
 msgstr "你目前還沒有資料庫"
 
-#: seahub/message/templates/message/user_msg_list.html:9
-#, python-format
-msgid "Messages with %(name)s"
-msgstr "與 %(name)s 的訊息"
-
 #: seahub/message/templates/message/user_msg_list.html:15
 msgid "Send a message..."
 msgstr "發送訊息..."
 
-#: seahub/notifications/models.py:446
+#: seahub/notifications/models.py:450
 #, python-format
 msgid ""
 "A file named %(file_name)s is uploaded to your "
 "folder %(folder)s"
 msgstr "文件 %(file_name)s 已經上傳到你的文件夾 %(folder)s"
 
-#: seahub/notifications/models.py:469
+#: seahub/notifications/models.py:473
 #, python-format
 msgid ""
 "%(user)s has shared a library named %(repo_name)s to "
 "you."
 msgstr "%(user)s 共享了資料庫%(repo_name)s給你"
 
-#: seahub/notifications/models.py:487
+#: seahub/notifications/models.py:491
 #, python-format
 msgid ""
 "%(user)s has shared a file named %(file_name)s to "
 "you."
 msgstr "%(user)s 共享了文件 %(file_name)s給你"
 
-#: seahub/notifications/models.py:503
+#: seahub/notifications/models.py:507
 #, python-format
-msgid "You have recieved a new message from %(user)s."
-msgstr "你收到來自 %(user)s 的新訊息。"
+msgid "You have received a new message from %(user)s."
+msgstr ""
 
-#: seahub/notifications/models.py:518 seahub/notifications/models.py:549
-#: seahub/utils/__init__.py:112 seahub/utils/__init__.py:778
+#: seahub/notifications/models.py:522 seahub/notifications/models.py:553
+#: seahub/utils/__init__.py:115 seahub/utils/__init__.py:832
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: seahub/notifications/models.py:529
+#: seahub/notifications/models.py:533
 #, python-format
 msgid "%(group_name)s has new discussion"
 msgstr "%(group_name)s有新討論"
 
-#: seahub/notifications/models.py:533
+#: seahub/notifications/models.py:537
 #, python-format
 msgid ""
 "%(user)s posted a new discussion in %(group_name)s"
 msgstr "%(user)s 在%(group_name)s裡新增了新討論"
 
-#: seahub/notifications/models.py:555
+#: seahub/notifications/models.py:559
 #, python-format
 msgid "One group discussion has new reply"
 msgstr "一條群組討論有新回覆"
 
-#: seahub/notifications/models.py:559
+#: seahub/notifications/models.py:563
 #, python-format
 msgid "%(user)s replied your group discussion"
 msgstr "%(user)s 回覆了你的群組討論"
 
-#: seahub/notifications/models.py:582
+#: seahub/notifications/models.py:586
 #, python-format
 msgid ""
 "User %(username)s has asked to join group %(username)s 請求加入到群組
 msgid "Successfully cleared all notices."
 msgstr "成功清空所有通知。"
 
-#: seahub/notifications/templates/notifications/notification_list.html:9
-#: seahub/notifications/templates/notifications/notification_list.html:13
-msgid "Add new notification"
-msgstr "新增新通知"
+#: seahub/notifications/templates/notifications/notice_email.html:8
+#, python-format
+msgid "Hi %(name)s,"
+msgstr ""
 
-#: seahub/notifications/templates/notifications/notification_list.html:21
+#: seahub/notifications/templates/notifications/notice_email.html:11
+#, python-format
+msgid ""
+"\n"
+"You've got 1 new notice on %(site_name)s.\n"
+msgid_plural ""
+"\n"
+"You've got %(num)s new notices on %(site_name)s.\n"
+msgstr[0] ""
+
+#: seahub/notifications/templates/notifications/notice_email.html:19
+msgid "Go check out at the following page:"
+msgstr ""
+
+#: seahub/notifications/templates/notifications/notification_list.html:8
 msgid "All Notifications"
 msgstr "所有通知"
 
-#: seahub/notifications/templates/notifications/notification_list.html:25
+#: seahub/notifications/templates/notifications/notification_list.html:9
+#: seahub/notifications/templates/notifications/notification_list.html:12
+msgid "Add new notification"
+msgstr "新增新通知"
+
+#: seahub/notifications/templates/notifications/notification_list.html:20
 msgid "Notification Detail"
 msgstr "通知內容"
 
-#: seahub/notifications/templates/notifications/notification_list.html:32
+#: seahub/notifications/templates/notifications/notification_list.html:27
 msgid "(current notification)"
 msgstr "（當前通知）"
 
-#: seahub/notifications/templates/notifications/notification_list.html:36
+#: seahub/notifications/templates/notifications/notification_list.html:31
 msgid "Set to current"
 msgstr "設為當前通知"
 
-#: seahub/notifications/templates/notifications/notification_list.html:44
-#: seahub/templates/sysadmin/sys_group_admin.html:55
+#: seahub/notifications/templates/notifications/notification_list.html:39
+#: seahub/templates/sysadmin/sys_group_admin.html:56
 #: seahub/templates/sysadmin/sys_org_admin.html:55
-#: seahub/templates/sysadmin/sys_publink_admin.html:56
+#: seahub/templates/sysadmin/sys_publink_admin.html:57
 msgid "Empty"
 msgstr "暫無"
 
-#: seahub/notifications/templates/notifications/notification_list.html:56
+#: seahub/notifications/templates/notifications/notification_list.html:51
 msgid "Delete Notification"
 msgstr "刪除通知"
 
@@ -2419,27 +2597,27 @@ msgid "Please choose how to view encrypted libraries online:"
 msgstr "請選擇查看加密資料庫的方式："
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Send passwords to the server."
 msgstr "發送密碼到伺服器。"
 
 #: seahub/options/templates/options/set_user_options.html:10
-#: seahub/profile/templates/profile/set_profile.html:70
+#: seahub/profile/templates/profile/set_profile.html:81
 msgid "Files will be decrypted in the server before being sent to you."
 msgstr "文件在傳送給你前會先在伺服器上解密。"
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Save passwords in your browser."
 msgstr "在瀏覽器儲存密碼。"
 
 #: seahub/options/templates/options/set_user_options.html:12
-#: seahub/profile/templates/profile/set_profile.html:73
+#: seahub/profile/templates/profile/set_profile.html:84
 msgid "Files will be decrypted in your browser when you download them."
 msgstr "文件會一邊下載一邊在瀏覽器裡解密。"
 
 #: seahub/options/templates/options/set_user_options.html:13
-#: seahub/profile/templates/profile/set_profile.html:74
+#: seahub/profile/templates/profile/set_profile.html:85
 msgid ""
 "Tip: the latter way is more secure, but it is not supported well by all "
 "browsers. We advise you to use the latest version of Chrome or Firefox."
@@ -2471,81 +2649,88 @@ msgid "Successfully set \"%s\" as your default library."
 msgstr "成功設置 \"%s\"為你的預設資料庫。"
 
 #: seahub/profile/templates/profile/profile_base.html:4
-#: seahub/profile/templates/profile/set_profile.html:5
-#: seahub/profile/templates/profile/set_profile.html:25
+#: seahub/profile/templates/profile/set_profile.html:26
 msgid "Profile Setting"
 msgstr "個人信息設置"
 
 #: seahub/profile/templates/profile/set_profile.html:10
-#: seahub/templates/sysadmin/userinfo.html:17
+#: seahub/templates/sysadmin/userinfo.html:8
 msgid "Profile"
 msgstr "設置"
 
-#: seahub/profile/templates/profile/set_profile.html:12
+#: seahub/profile/templates/profile/set_profile.html:11
+msgid "Language"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:13
 msgid "Encrypted Libraries"
 msgstr "加密資料庫"
 
-#: seahub/profile/templates/profile/set_profile.html:14
+#: seahub/profile/templates/profile/set_profile.html:15
 msgid "Sub-library"
 msgstr "子資料庫"
 
-#: seahub/profile/templates/profile/set_profile.html:15
+#: seahub/profile/templates/profile/set_profile.html:16
 msgid "Default Library"
 msgstr "預設資料庫"
 
-#: seahub/profile/templates/profile/set_profile.html:16
-#: seahub/profile/templates/profile/set_profile.html:100
-#: seahub/profile/templates/profile/set_profile.html:127
+#: seahub/profile/templates/profile/set_profile.html:17
+#: seahub/profile/templates/profile/set_profile.html:111
+#: seahub/profile/templates/profile/set_profile.html:138
 msgid "Delete Account"
 msgstr "刪除帳號"
 
-#: seahub/profile/templates/profile/set_profile.html:27
+#: seahub/profile/templates/profile/set_profile.html:28
 msgid "Avatar:"
 msgstr "頭像："
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 msgid "Password:"
 msgstr "密碼："
 
-#: seahub/profile/templates/profile/set_profile.html:35
+#: seahub/profile/templates/profile/set_profile.html:36
 #: seahub/templates/snippets/repo_dirents.html:79
 msgid "Update"
 msgstr "更新"
 
-#: seahub/profile/templates/profile/set_profile.html:36
+#: seahub/profile/templates/profile/set_profile.html:37
 msgctxt "true name"
 msgid "Name:"
 msgstr "名字："
 
-#: seahub/profile/templates/profile/set_profile.html:41
+#: seahub/profile/templates/profile/set_profile.html:42
 msgid "About me:"
 msgstr "關於我："
 
-#: seahub/profile/templates/profile/set_profile.html:48
+#: seahub/profile/templates/profile/set_profile.html:49
 msgid "Department:"
 msgstr "部門："
 
-#: seahub/profile/templates/profile/set_profile.html:53
+#: seahub/profile/templates/profile/set_profile.html:54
 msgid "Telephone:"
 msgstr "電話："
 
 #: seahub/profile/templates/profile/set_profile.html:66
+msgid "Language Setting"
+msgstr ""
+
+#: seahub/profile/templates/profile/set_profile.html:77
 msgid "Encrypted Libraries Setting"
 msgstr "加密資料庫設置"
 
-#: seahub/profile/templates/profile/set_profile.html:68
+#: seahub/profile/templates/profile/set_profile.html:79
 msgid "How to view encrypted libraries online:"
 msgstr "在線查看加密資料庫的方式："
 
-#: seahub/profile/templates/profile/set_profile.html:81
+#: seahub/profile/templates/profile/set_profile.html:92
 msgid "Sub-library Setting"
 msgstr "子資料庫設置"
 
-#: seahub/profile/templates/profile/set_profile.html:83
+#: seahub/profile/templates/profile/set_profile.html:94
 msgid "Enable sub-library"
 msgstr "啟用子資料庫"
 
-#: seahub/profile/templates/profile/set_profile.html:84
+#: seahub/profile/templates/profile/set_profile.html:95
 msgid ""
 "This feature enables you to selectively sync a folder inside a library. A "
 "sub-library can be created from any folder. After being created, it will be "
@@ -2554,7 +2739,7 @@ msgid ""
 "library."
 msgstr "這個功能能讓你選擇性的同步一個資料庫裡的文件夾。你可以從任意文件夾創建子資料庫。創建完後，它會顯示在你的桌面客戶端。你可以像普通的資料庫一樣下載它。同時，它會自動跟源資料庫保持同步。"
 
-#: seahub/profile/templates/profile/set_profile.html:85
+#: seahub/profile/templates/profile/set_profile.html:96
 msgid ""
 "Sub-library is also used when sharing a folder to a group or another user. "
 "Without this option on, a hidden sub-library will be created automatically "
@@ -2562,37 +2747,33 @@ msgid ""
 "listed, which enables you to manage them."
 msgstr "子資料庫也用來實現共享一個文件夾給群組或其他用戶。未開啟子資料庫選項的時候，一個隱藏的資料庫會被創建出來。開啟這個功能後，這些隱藏的資料庫也會被列出來，方便你來管理。"
 
-#: seahub/profile/templates/profile/set_profile.html:91
+#: seahub/profile/templates/profile/set_profile.html:102
 msgid "Default Library Setting"
 msgstr "預設資料庫設置"
 
-#: seahub/profile/templates/profile/set_profile.html:93
+#: seahub/profile/templates/profile/set_profile.html:104
 msgid "Your default library:"
 msgstr "你的預設資料庫："
 
-#: seahub/profile/templates/profile/set_profile.html:95
+#: seahub/profile/templates/profile/set_profile.html:106
 msgid ""
 "Default library is the default place to store your personal documents and "
 "pictures."
 msgstr "預設資料庫是用來存放你的個人文檔和照片的地方。"
 
-#: seahub/profile/templates/profile/set_profile.html:96
+#: seahub/profile/templates/profile/set_profile.html:107
 msgid "Choose Default Library"
 msgstr "選擇預設資料庫"
 
-#: seahub/profile/templates/profile/set_profile.html:101
+#: seahub/profile/templates/profile/set_profile.html:112
 msgid "This operation will not be reverted. Please think twice!"
 msgstr "該操作將不可復原。請三思！"
 
-#: seahub/profile/templates/profile/set_profile.html:106
+#: seahub/profile/templates/profile/set_profile.html:117
 msgid "Choose default library:"
 msgstr "選擇預設資料庫："
 
-#: seahub/profile/templates/profile/set_profile.html:111
-msgid "Please click and choose a library."
-msgstr "請選擇資料庫。"
-
-#: seahub/profile/templates/profile/set_profile.html:128
+#: seahub/profile/templates/profile/set_profile.html:139
 msgid "Really want to delete your account?"
 msgstr "確定要刪除該帳號嗎？"
 
@@ -2605,25 +2786,25 @@ msgid "Info"
 msgstr "資訊"
 
 #: seahub/profile/templates/profile/user_profile.html:41
-#: seahub/templates/sysadmin/userinfo.html:21
+#: seahub/templates/sysadmin/userinfo.html:15
 msgctxt "true name"
 msgid "Name"
 msgstr "名稱"
 
 #: seahub/profile/templates/profile/user_profile.html:44
-#: seahub/templates/sysadmin/userinfo.html:24
+#: seahub/templates/sysadmin/userinfo.html:18
 msgid "Self-introduction"
 msgstr "自我介紹"
 
 #: seahub/profile/templates/profile/user_profile.html:48
-#: seahub/templates/registration/registration_form.html:24
-#: seahub/templates/sysadmin/userinfo.html:29
+#: seahub/templates/registration/registration_form.html:25
+#: seahub/templates/sysadmin/userinfo.html:23
 msgid "Department"
 msgstr "部門"
 
 #: seahub/profile/templates/profile/user_profile.html:51
-#: seahub/templates/registration/registration_form.html:26
-#: seahub/templates/sysadmin/userinfo.html:32
+#: seahub/templates/registration/registration_form.html:27
+#: seahub/templates/sysadmin/userinfo.html:26
 msgid "Telephone"
 msgstr "電話"
 
@@ -2631,169 +2812,171 @@ msgstr "電話"
 msgid "Email is not longer than 512 characters"
 msgstr "電子信箱不能超過512個字元"
 
-#: seahub/share/views.py:59
+#: seahub/share/views.py:57
 msgid "Failed to share to all members, please try again later."
 msgstr "共享到公共資料失敗，請稍後再試"
 
-#: seahub/share/views.py:61
+#: seahub/share/views.py:59
 #, python-format
 msgid ""
 "Shared to all members successfully, go check it at Shares."
 msgstr "共享到公共資料成功，請前往 共享 查看。"
 
-#: seahub/share/views.py:73
+#: seahub/share/views.py:71
 #, python-format
 msgid "\"%(repo)s\" is already in group %(group)s. View"
 msgstr "\"%(repo)s\"在群組 %(group)s 中已存在。查看"
 
-#: seahub/share/views.py:83
+#: seahub/share/views.py:81
 #, python-format
 msgid "Failed to share %(repo)s to %(group)s, please try again later."
 msgstr "共享 %(repo)s 到 %(group)s失敗，請稍後重試。"
 
-#: seahub/share/views.py:87
+#: seahub/share/views.py:85
 #, python-format
 msgid ""
 "Shared to %(group)s successfully，go check it at Shares."
 msgstr "共享到 %(group)s 成功， 請前往 共享 查看。"
 
-#: seahub/share/views.py:97
+#: seahub/share/views.py:95
 msgid "You can not share libray to yourself."
 msgstr "你無法共享資料庫給你自己。"
 
-#: seahub/share/views.py:106
+#: seahub/share/views.py:104
 #, python-format
 msgid "Failed to share to %s, please try again later."
 msgstr "共享給 %s 失敗，請稍後嘗試。"
 
-#: seahub/share/views.py:113
+#: seahub/share/views.py:111
 #, python-format
 msgid ""
 "Shared to %(email)s successfully，go check it at Shares."
 msgstr "共享給 %(email)s 成功，請前往 共享 查看。"
 
-#: seahub/share/views.py:117
+#: seahub/share/views.py:115
 #, python-format
 msgid "Failed to share to %s, as the email is not registered."
 msgstr "共享給 %s 失敗，該用戶尚未註冊。"
 
-#: seahub/share/views.py:176
+#: seahub/share/views.py:174
 msgid "Only the owner of the library has permission to share it."
 msgstr "只有資料庫擁有者才有共享權限。"
 
-#: seahub/share/views.py:208
+#: seahub/share/views.py:204
 #, python-format
 msgid ""
 "Failed to share \"%s\", no enough quota. Upgrade account."
 msgstr "共享\"%s\"失敗，空間不足。升級帳號。"
 
-#: seahub/share/views.py:233 seahub/share/views.py:240
+#: seahub/share/views.py:229 seahub/share/views.py:236
 msgid "Argument is not valid"
 msgstr "參數無效"
 
-#: seahub/share/views.py:244 seahub/share/views.py:254
+#: seahub/share/views.py:240 seahub/share/views.py:250
 msgid "Failed to remove share"
 msgstr "取消共享失敗"
 
-#: seahub/share/views.py:250
+#: seahub/share/views.py:246
 msgid "group id is not valid"
 msgstr "無效的group id"
 
-#: seahub/share/views.py:263
+#: seahub/share/views.py:259
 msgid "Successfully removed share"
 msgstr "取消共享成功"
 
-#: seahub/share/views.py:355 seahub/share/views.py:486
+#: seahub/share/views.py:352 seahub/share/views.py:483
 msgid "all members"
 msgstr "所有成員"
 
-#: seahub/share/views.py:665 seahub/share/views.py:1011
-#: seahub/views/__init__.py:794 seahub/views/__init__.py:1543
-#: seahub/views/__init__.py:1578 seahub/views/ajax.py:873
-#: seahub/views/ajax.py:890 seahub/views/file.py:770
+#: seahub/share/views.py:663 seahub/share/views.py:985
+#: seahub/views/__init__.py:880 seahub/views/__init__.py:1623
+#: seahub/views/__init__.py:1658 seahub/views/ajax.py:1036
+#: seahub/views/ajax.py:1053 seahub/views/file.py:821
 msgid "Invalid arguments"
 msgstr "無效參數"
 
-#: seahub/share/views.py:674 seahub/share/views.py:1016
+#: seahub/share/views.py:668 seahub/share/views.py:990
 msgid "You cannot share the library in this way."
 msgstr "不能以這種方式共享一個資料庫。"
 
-#: seahub/share/views.py:699 seahub/share/views.py:1039
-msgid "Failed to get the link, please retry later."
-msgstr "獲取分享連結失敗，請稍後重試。"
-
-#: seahub/share/views.py:721 seahub/share/views.py:754
+#: seahub/share/views.py:700 seahub/share/views.py:733
 msgid "Removed successfully"
 msgstr "刪除成功"
 
-#: seahub/share/views.py:738 seahub/share/views.py:771
+#: seahub/share/views.py:717 seahub/share/views.py:750
 msgid "The link doesn't exist"
 msgstr "連結不存在"
 
-#: seahub/share/views.py:785
+#: seahub/share/views.py:764
 msgid ""
 "Sending shared link failed. Email service is not properly configured, please"
 " contact administrator."
 msgstr "由於電子信箱服務未正確配置，發送共享連結失敗，請聯繫管理員。"
 
-#: seahub/share/views.py:810
-msgid "Your friend shared a file to you on Seafile"
-msgstr "你的朋友在 Seafile 上共享了一個文件給你"
+#: seahub/share/views.py:787
+#, python-format
+msgid "A file is shared to you on %s"
+msgstr ""
 
-#: seahub/share/views.py:815 seahub/share/views.py:1089
+#: seahub/share/views.py:791 seahub/share/views.py:1060
 msgid "Internal server error. Send failed."
 msgstr "伺服器內部錯誤，發送失敗。"
 
-#: seahub/share/views.py:818 seahub/share/views.py:1092
+#: seahub/share/views.py:794 seahub/share/views.py:1063
 msgid "Successfully sent."
 msgstr "發送成功"
 
-#: seahub/share/views.py:838
+#: seahub/share/views.py:814
 msgid "Please choose a directory."
 msgstr "請選擇目錄。"
 
-#: seahub/share/views.py:855 seahub/share/views.py:949
+#: seahub/share/views.py:831 seahub/share/views.py:923
 msgid "Successfully saved."
 msgstr "儲存成功。"
 
-#: seahub/share/views.py:874
+#: seahub/share/views.py:850
 #, python-format
 msgid "Failed to share to \"%s\", user not found."
 msgstr "共享給 \"%s\" 失敗， 未找到該用戶。"
 
-#: seahub/share/views.py:888
+#: seahub/share/views.py:864
 #, python-format
 msgid "Successfully shared %s."
 msgstr "共享 %s 成功。"
 
-#: seahub/share/views.py:914
+#: seahub/share/views.py:888
 #, python-format
 msgid "Successfully unshared \"%s\"."
 msgstr "取消共享 %s 成功。"
 
-#: seahub/share/views.py:916
+#: seahub/share/views.py:890
 #, python-format
-msgid "You don't have permission to unshared %s."
-msgstr "你沒有權限取消共享 %s。"
+msgid "You don't have permission to unshare %s."
+msgstr ""
 
-#: seahub/share/views.py:952
+#: seahub/share/views.py:926
 #, python-format
 msgid "You don't have permission to save %s."
 msgstr "你沒有權限儲存 %s。"
 
-#: seahub/share/views.py:1059
+#: seahub/share/views.py:1013
+msgid "Failed to get the link, please retry later."
+msgstr "獲取分享連結失敗，請稍後重試。"
+
+#: seahub/share/views.py:1033
 msgid ""
 "Sending shared upload link failed. Email service is not properly configured,"
 " please contact administrator."
 msgstr "由於電子信箱服務未正確配置，發送上傳外鏈失敗，請聯繫管理員。"
 
-#: seahub/share/views.py:1084
-msgid "Your friend shared a upload link to you on Seafile"
-msgstr "你的朋友在 Seafile 上共享了一個上傳外鏈給你"
+#: seahub/share/views.py:1056
+#, python-format
+msgid "An upload link is shared to you on %s"
+msgstr ""
 
 #: seahub/share/templates/share/links.html:5
 msgid "Links - Share"
@@ -2814,14 +2997,15 @@ msgstr "訪問次數"
 
 #: seahub/share/templates/share/links.html:37
 #: seahub/share/templates/share/links.html:68
-#: seahub/templates/file_revisions.html:53 seahub/templates/repo.html:632
+#: seahub/templates/file_revisions.html:58 seahub/templates/repo.html:621
+#: seahub/templates/repo.html.py:699
 #: seahub/templates/repo_view_snapshot.html:42
 msgid "View"
 msgstr "查看"
 
 #: seahub/share/templates/share/links.html:38
 #: seahub/share/templates/share/links.html:69
-#: seahub/templates/sysadmin/sys_publink_admin.html:22
+#: seahub/templates/sysadmin/sys_publink_admin.html:24
 msgid "Remove"
 msgstr "刪除"
 
@@ -2850,7 +3034,7 @@ msgid "Folders - Share"
 msgstr "文件夾 - 共享"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:10
-#: seahub/templates/home_base.html:29
+#: seahub/templates/home_base.html:30
 msgid "Folders"
 msgstr "文件夾"
 
@@ -2875,13 +3059,13 @@ msgid ""
 msgstr "如果你不想共享整個資料庫，你可以共享單個文件夾給已註冊的用戶。"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:97
-#: seahub/share/templates/share/repos.html:101
+#: seahub/share/templates/share/repos.html:107
 #: seahub/templates/sysadmin/useradmin_js.html:62
 msgid "Edit succeeded"
 msgstr "權限修改成功"
 
 #: seahub/share/templates/share/list_priv_shared_folders.html:104
-#: seahub/share/templates/share/repos.html:108
+#: seahub/share/templates/share/repos.html:114
 #: seahub/templates/sysadmin/useradmin_js.html:71
 msgid "Edit failed."
 msgstr "權限修改失敗"
@@ -2948,7 +3132,7 @@ msgstr "共享"
 
 #: seahub/share/templates/share/user_share_list.html:8
 #: seahub/templates/org_admin_base.html:8
-#: seahub/templates/repo_settings.html:13
+#: seahub/templates/repo_settings.html:15
 msgid "Basic Info"
 msgstr "基本資訊"
 
@@ -2961,7 +3145,8 @@ msgid "Add to contacts"
 msgstr "加為聯絡人"
 
 #: seahub/share/templates/share/user_share_list.html:59
-#: seahub/templates/snippets/my_owned_repos.html:147
+#: seahub/templates/my_shared_repos.html:40
+#: seahub/templates/snippets/my_shared_repos.html:39
 msgid "Leave Share"
 msgstr "退出共享"
 
@@ -2982,56 +3167,24 @@ msgstr "文件活動"
 msgid "Exit System Admin"
 msgstr "退出系統管理"
 
-#: seahub/templates/admin_base.html:13 seahub/templates/pub_base.html:14
-#: seahub/templates/pubuser.html:8
-msgid "Users"
-msgstr "成員"
-
-#: seahub/templates/admin_base.html:19
-msgid "Notifications"
-msgstr "通知"
-
-#: seahub/templates/admin_base.html:22 seahub/templates/home_base.html:31
-msgid "Links"
-msgstr "連結"
-
-#: seahub/templates/base.html:38
-msgid "System Admin"
-msgstr "系統管理"
-
-#: seahub/templates/base.html:49
+#: seahub/templates/base.html:48
 msgid "unread notices"
 msgstr "未讀通知"
 
-#: seahub/templates/base.html:51 seahub/templates/registration/login.html:3
-#: seahub/templates/registration/login.html:6
-#: seahub/templates/registration/password_reset_complete.html:8
-msgid "Log In"
-msgstr "登錄"
-
-#: seahub/templates/base.html:53 seahub/templates/registration/login.html:36
-#: seahub/templates/registration/registration_form.html:9
-msgid "Signup"
-msgstr "註冊"
-
-#: seahub/templates/base.html:63
+#: seahub/templates/base.html:69
 msgid "Log out"
 msgstr "退出"
 
-#: seahub/templates/base.html:123
-msgid "Server Version: "
-msgstr "服務器版本："
+#: seahub/templates/base.html:73 seahub/templates/sysadmin/base.html:6
+msgid "System Admin"
+msgstr "系統管理"
 
-#: seahub/templates/base.html:124
-msgid "Seafile"
-msgstr "海文互知"
-
-#: seahub/templates/base.html:125
-msgid "Contact Us"
-msgstr "聯繫我們"
+#: seahub/templates/base.html:163
+#: seahub/templates/sysadmin/sys_group_admin.html:8
+msgid "All Groups"
+msgstr "所有群組"
 
 #: seahub/templates/client_mgmt.html:5 seahub/templates/client_mgmt.html:9
-#: seahub/templates/home_base.html:23
 msgid "Clients"
 msgstr "客戶端"
 
@@ -3039,7 +3192,7 @@ msgstr "客戶端"
 msgid "Client Name"
 msgstr "客戶端名稱"
 
-#: seahub/templates/client_mgmt.html:15
+#: seahub/templates/client_mgmt.html:15 seahub/templates/devices.html:15
 msgid "IP"
 msgstr "IP"
 
@@ -3080,28 +3233,80 @@ msgid ""
 "it online. And the password will be kept on the server for only 1 hour."
 msgstr "該資料庫已加密。如需在線查看裡面的內容，請輸入解密密碼。密碼只會在伺服器上暫存1小時。"
 
-#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:229
+#: seahub/templates/decrypt_repo_form.html:9 seahub/templates/repo.html:227
+#: seahub/templates/share_access_validation.html:8
 msgid "Password: "
 msgstr "密碼："
 
-#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:234
+#: seahub/templates/decrypt_repo_form.html:21 seahub/templates/repo.html:232
 #, python-format
 msgid ""
 "You can change how to view encrypted libraries online here."
 msgstr "你可以在這裡改變加密資料庫的查看方式"
 
-#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:337
+#: seahub/templates/decrypt_repo_form.html:33 seahub/templates/repo.html:334
+#: seahub/templates/share_access_validation.html:25
 msgid "Please enter the password."
 msgstr "請輸入密碼。"
 
-#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:52
-#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:25
+#: seahub/templates/devices.html:5 seahub/templates/devices.html.py:9
+#: seahub/templates/home_base.html:23
+msgid "Devices"
+msgstr ""
+
+#: seahub/templates/devices.html:13
+msgid "Platform"
+msgstr ""
+
+#: seahub/templates/devices.html:14
+msgid "Device Name"
+msgstr ""
+
+#: seahub/templates/devices.html:16
+msgid "Last Access"
+msgstr ""
+
+#: seahub/templates/devices.html:17
+msgid "# Libraries"
+msgstr ""
+
+#: seahub/templates/devices.html:18
+msgid "Operation"
+msgstr ""
+
+#: seahub/templates/devices.html:37
+msgid "Unlink"
+msgstr ""
+
+#: seahub/templates/devices.html:43
+#, python-format
+msgid "Really want to unlink %s?"
+msgstr ""
+
+#: seahub/templates/devices.html:44
+msgid "It will immediately stop syncing."
+msgstr ""
+
+#: seahub/templates/devices.html:50
+msgid "You do not have connected devices"
+msgstr ""
+
+#: seahub/templates/devices.html:51
+msgid "Your clients (Desktop/Android/iOS) will be listed here."
+msgstr ""
+
+#: seahub/templates/devices.html:110
+msgid "Successfully unlinked."
+msgstr ""
+
+#: seahub/templates/download.html:4 seahub/templates/file_revisions.html:57
+#: seahub/templates/history_file_view.html:63 seahub/templates/repo.html:26
 #: seahub/templates/shared_file_view.html:35
-#: seahub/templates/view_file_base.html:74
+#: seahub/templates/view_file_base.html:75
 #: seahub/templates/view_history_file.html:34
-#: seahub/templates/view_shared_dir.html:46
-#: seahub/templates/view_shared_dir.html:60
+#: seahub/templates/view_shared_dir.html:41
+#: seahub/templates/view_shared_dir.html:55
 #: seahub/templates/snippets/repo_dirents.html:24
 #: seahub/templates/snippets/repo_dirents.html:77
 msgid "Download"
@@ -3111,8 +3316,7 @@ msgstr "下載"
 #: seahub/templates/repo_history_view.html:38
 #: seahub/templates/repo_recycle_view.html:16
 #: seahub/templates/shared_file_view.html:17
-#: seahub/templates/view_shared_dir.html:16
-#: seahub/templates/snippets/repo_dir_data.html:4
+#: seahub/templates/view_shared_dir.html:13
 msgid "Current path: "
 msgstr "當前路徑："
 
@@ -3427,9 +3631,9 @@ msgid "Password is required."
 msgstr "密碼為必填項"
 
 #: seahub/templates/file_revisions.html:5 seahub/templates/repo_history.html:5
-#: seahub/templates/repo_settings.html:21
-#: seahub/templates/view_file_base.html:66
-#: seahub/templates/snippets/current_commit.html:19
+#: seahub/templates/repo_settings.html:23
+#: seahub/templates/view_file_base.html:67
+#: seahub/templates/snippets/current_commit.html:15
 #: seahub/templates/snippets/repo_dirents.html:93
 msgid "History"
 msgstr "歷史"
@@ -3448,16 +3652,11 @@ msgstr "提示：每次修改後都會生成一個新的版本, 你可以將當
 msgid "Current Path:"
 msgstr "當前路徑："
 
-#: seahub/templates/file_revisions.html:26
-#: seahub/templates/repo_view_snapshot.html:16
-msgid "Last Modifier"
-msgstr "最後修改者"
-
 #: seahub/templates/file_revisions.html:27
 #: seahub/templates/repo_history_view.html:53
 #: seahub/templates/repo_recycle_view.html:55
-#: seahub/templates/view_shared_dir.html:33
-#: seahub/templates/snippets/repo_dir_data.html:39
+#: seahub/templates/view_shared_dir.html:28
+#: seahub/templates/snippets/repo_dir_data.html:41
 msgid "Size"
 msgstr "大小"
 
@@ -3465,38 +3664,55 @@ msgstr "大小"
 msgid "(current version)"
 msgstr "(當前版本)"
 
-#: seahub/templates/file_revisions.html:50
+#: seahub/templates/file_revisions.html:39
+#, python-format
+msgid "(Renamed or moved from %(old_path)s)"
+msgstr ""
+
+#: seahub/templates/file_revisions.html:55
 #: seahub/templates/repo_recycle_view.html:66
 #: seahub/templates/repo_recycle_view.html:83
 #: seahub/templates/repo_view_snapshot.html:43
 msgid "Restore"
 msgstr "還原"
 
-#: seahub/templates/file_revisions.html:55
+#: seahub/templates/file_revisions.html:60
 msgid "Diff"
 msgstr "差異"
 
-#: seahub/templates/footer.html:3
+#: seahub/templates/footer.html:5
 #: seahub/templates/snippets/search_form.html:44
 msgid "Documents"
 msgstr "文檔"
 
-#: seahub/templates/footer.html:5
+#: seahub/templates/footer.html:7
 msgid "Introduction"
 msgstr "介紹"
 
-#: seahub/templates/footer.html:6 seahub/templates/myhome_base.html:18
+#: seahub/templates/footer.html:8 seahub/templates/myhome_base.html:17
 msgid "Help"
 msgstr "使用幫助"
 
-#: seahub/templates/footer.html:10
+#: seahub/templates/footer.html:12
 msgid "Client"
 msgstr "客戶端"
 
-#: seahub/templates/footer.html:12
+#: seahub/templates/footer.html:14
 msgid "Seafile for Windows, Mac and Linux"
 msgstr "Windows, Mac and Linux"
 
+#: seahub/templates/footer.html:19
+msgid "Server Version: "
+msgstr "服務器版本："
+
+#: seahub/templates/footer.html:20
+msgid "Seafile"
+msgstr "海文互知"
+
+#: seahub/templates/footer.html:21
+msgid "Contact Us"
+msgstr "聯繫我們"
+
 #: seahub/templates/history_file_view.html:16
 #: seahub/templates/repo_view_snapshot.html:7
 #: seahub/templates/view_snapshot_file.html:7
@@ -3525,12 +3741,13 @@ msgstr "資源回收筒"
 #: seahub/templates/history_file_view.html:31
 #: seahub/templates/repo_history.html:10
 #: seahub/templates/repo_recycle_view.html:9
+#: seahub/templates/repo_settings.html:8
 #: seahub/templates/view_trash_file.html:7
 msgid "Back to Library"
 msgstr "返回資料庫"
 
 #: seahub/templates/history_file_view.html:38
-#: seahub/templates/view_file_base.html:21
+#: seahub/templates/view_file_base.html:22
 #: seahub/templates/view_history_file.html:27
 #: seahub/templates/view_snapshot_file.html:13
 #: seahub/templates/view_trash_file.html:11
@@ -3545,36 +3762,57 @@ msgstr "個人頁面"
 msgid "Starred"
 msgstr "星標文件"
 
-#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:44
+#: seahub/templates/home_base.html:19 seahub/templates/home_base.html.py:46
 #: seahub/templates/wiki/personal_wiki.html:6
 #: seahub/templates/wiki/personal_wiki_pages.html:6
 msgid "Personal Wiki"
 msgstr "個人維基"
 
-#: seahub/templates/home_base.html:26
+#: seahub/templates/home_base.html:27
 msgid "Share Admin"
 msgstr "共享管理"
 
-#: seahub/templates/myhome.html:41
+#: seahub/templates/home_base.html:32 seahub/templates/sysadmin/base.html:21
+msgid "Links"
+msgstr "連結"
+
+#: seahub/templates/my_group_repos.html:6
+#: seahub/templates/snippets/bottom_bar.html:3
+#: seahub/templates/snippets/my_group_repos.html:6
+#: seahub/templates/snippets/my_owned_repos.html:11
+msgid "Group"
+msgstr "群組"
+
+#: seahub/templates/my_group_repos.html:47
+#: seahub/templates/snippets/my_group_repos.html:47
+msgid "No library is shared to your groups"
+msgstr "還沒有資料庫共享到你參加的群組裡"
+
+#: seahub/templates/my_shared_repos.html:49
+#: seahub/templates/snippets/my_shared_repos.html:48
+msgid "No library is shared to you"
+msgstr "還沒有資料庫共享給你"
+
+#: seahub/templates/myhome.html:40
 msgid "Welcome to Seafile!"
 msgstr "歡迎來到Seafile!"
 
-#: seahub/templates/myhome.html:42
+#: seahub/templates/myhome.html:41
 msgid ""
 "Seafile organizes files into libraries. Each library can be synced and "
 "shared separately. We have created a personal library for you. You can "
 "create more libraries later."
 msgstr "Seafile把文件組織到資料庫裡。每個資料庫可以被單獨的同步和共享。我們已經為你創建了一個私人資料庫。你之後可以再創建其他的資料庫。"
 
-#: seahub/templates/myhome.html:43 seahub/templates/repo.html:215
+#: seahub/templates/myhome.html:42 seahub/templates/repo.html:213
 msgid "Close"
 msgstr "關閉"
 
-#: seahub/templates/myhome_base.html:7
+#: seahub/templates/myhome_base.html:6
 msgid "My Home"
 msgstr "我的頁面"
 
-#: seahub/templates/myhome_base.html:14 seahub/templates/pub_base.html:5
+#: seahub/templates/myhome_base.html:13 seahub/templates/pub_base.html:5
 #: seahub/templates/pub_base.html.py:10
 msgid "Organization"
 msgstr "團體"
@@ -3585,11 +3823,11 @@ msgid ""
 "current account."
 msgstr "團體將在下個版本移除，相關數據會遷移到你當前的帳號下。"
 
-#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:33
+#: seahub/templates/org_base.html:18 seahub/templates/view_file_base.html:34
 #: seahub/templates/snippets/my_owned_repos.html:45
 #: seahub/templates/snippets/my_owned_repos.html:92
-#: seahub/templates/snippets/my_owned_repos.html:231
-#: seahub/templates/snippets/repo_dir_data.html:25
+#: seahub/templates/snippets/my_owned_repos.html:135
+#: seahub/templates/snippets/repo_dir_data.html:24
 #: seahub/templates/snippets/repo_dirents.html:26
 #: seahub/templates/snippets/repo_dirents.html:83
 msgid "Share"
@@ -3611,420 +3849,452 @@ msgstr "還沒有群組被創建"
 msgid "You can click \"Add Group\" button under \"Group\" label to create a group. "
 msgstr "你可以到“群組”頁面點擊“新建群組”按鈕創建一個群組。"
 
-#: seahub/templates/pubrepo.html:16 seahub/templates/sysadmin/userinfo.html:98
+#: seahub/templates/pubrepo.html:19 seahub/templates/sysadmin/userinfo.html:92
 msgid "Share From"
 msgstr "共享來源"
 
-#: seahub/templates/pubrepo.html:50
+#: seahub/templates/pubrepo.html:53
 msgid "No public library"
 msgstr "當前沒有公共資料"
 
-#: seahub/templates/pubrepo.html:51
+#: seahub/templates/pubrepo.html:54
 msgid ""
 "You can create a public library by clicking \"New Library\" button, others "
 "can view and download this library."
 msgstr "你可以點擊“新建資料庫”按鈕創建一個公開的資料庫，網站內的其他人都可以查看下載這個資料庫。"
 
-#: seahub/templates/repo.html:31
-msgid "Trash"
-msgstr "資源回收筒"
+#: seahub/templates/pubuser.html:10
+msgid "Search members..."
+msgstr ""
 
-#: seahub/templates/repo.html:38
+#: seahub/templates/repo.html:23
 msgid "Size: "
 msgstr "大小："
 
-#: seahub/templates/repo.html:59
+#: seahub/templates/repo.html:32
+msgid "Trash"
+msgstr "資源回收筒"
+
+#: seahub/templates/repo.html:50
 #: seahub/templates/snippets/repo_dirents.html:37
 #: seahub/templates/snippets/repo_dirents.html:91
 msgid "Move"
 msgstr "移動"
 
-#: seahub/templates/repo.html:60
+#: seahub/templates/repo.html:51
 #: seahub/templates/snippets/repo_dirents.html:38
 #: seahub/templates/snippets/repo_dirents.html:92
 msgid "Copy"
 msgstr "複製"
 
-#: seahub/templates/repo.html:64
+#: seahub/templates/repo.html:55
 msgid "Upload Files"
 msgstr "上傳文件"
 
-#: seahub/templates/repo.html:66 seahub/templates/repo.html.py:114
+#: seahub/templates/repo.html:57 seahub/templates/repo.html.py:105
 #: seahub/templates/view_shared_upload_link.html:24
 msgid "The owner of this library has run out of space."
 msgstr "該資料庫擁有者的空間已用完。"
 
-#: seahub/templates/repo.html:71 seahub/templates/repo.html.py:121
+#: seahub/templates/repo.html:62 seahub/templates/repo.html.py:112
 msgid "Please select a file at first."
 msgstr "請先選擇一個文件。"
 
-#: seahub/templates/repo.html:79
+#: seahub/templates/repo.html:70
 #: seahub/templates/view_shared_upload_link.html:32
 msgid "Add Files"
 msgstr "新增文件"
 
-#: seahub/templates/repo.html:84
+#: seahub/templates/repo.html:75
 #: seahub/templates/view_shared_upload_link.html:37
 msgid "Start All"
 msgstr "上傳全部"
 
-#: seahub/templates/repo.html:88
+#: seahub/templates/repo.html:79
 #: seahub/templates/view_shared_upload_link.html:41
 msgid "Cancel All"
 msgstr "取消全部"
 
-#: seahub/templates/repo.html:92
+#: seahub/templates/repo.html:83
 #: seahub/templates/view_shared_upload_link.html:45
 msgid ""
 "Drag & Drop is supported for Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 msgstr "在以下瀏覽器中支援文件拖放：Chrome, Safari 5.0+, Firefox 4.0+, IE 10.0+"
 
-#: seahub/templates/repo.html:94
+#: seahub/templates/repo.html:85
 #: seahub/templates/view_shared_upload_link.html:46
 #, python-format
 msgid "File size should be smaller than %(max_file_size)s"
 msgstr "單個文件大小應小於 %(max_file_size)s"
 
-#: seahub/templates/repo.html:103 seahub/templates/repo.html.py:139
+#: seahub/templates/repo.html:94 seahub/templates/repo.html.py:130
+#: seahub/templates/repo.html:1744
 #: seahub/templates/view_shared_upload_link.html:54
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: seahub/templates/repo.html:112
+#: seahub/templates/repo.html:103
 #, python-format
 msgid "Update %(file_name)s"
 msgstr "更新 %(file_name)s"
 
-#: seahub/templates/repo.html:127
+#: seahub/templates/repo.html:118
 msgid "Choose a file"
 msgstr "選擇文件"
 
-#: seahub/templates/repo.html:131
+#: seahub/templates/repo.html:122
 #, python-format
 msgid "Smaller than %(max_file_size)s"
 msgstr "大小應小於 %(max_file_size)s"
 
-#: seahub/templates/repo.html:148
-#: seahub/templates/snippets/repo_dir_data.html:16
+#: seahub/templates/repo.html:139
+#: seahub/templates/snippets/repo_dir_data.html:15
 msgid "New Directory"
 msgstr "新建目錄"
 
-#: seahub/templates/repo.html:149
+#: seahub/templates/repo.html:140
 msgid "Directory Name"
 msgstr "目錄名"
 
-#: seahub/templates/repo.html:157
-#: seahub/templates/snippets/repo_dir_data.html:19
+#: seahub/templates/repo.html:148
+#: seahub/templates/snippets/repo_dir_data.html:18
 msgid "New File"
 msgstr "新建文件"
 
-#: seahub/templates/repo.html:159
+#: seahub/templates/repo.html:150
 msgid "Featured File Type"
 msgstr "特色文件類型"
 
-#: seahub/templates/repo.html:160 seahub/templates/repo.html.py:166
+#: seahub/templates/repo.html:151 seahub/templates/repo.html.py:157
 msgid "Click to choose"
 msgstr "點擊選擇"
 
-#: seahub/templates/repo.html:160
+#: seahub/templates/repo.html:151
 msgid "online Rich Text format."
 msgstr "在線富文本格式"
 
-#: seahub/templates/repo.html:166
+#: seahub/templates/repo.html:157
 msgid "simple markup format."
 msgstr "簡單的標記格式"
 
-#: seahub/templates/repo.html:173 seahub/templates/starred.html:13
+#: seahub/templates/repo.html:164 seahub/templates/starred.html:13
 msgid "File Name"
 msgstr "文件名稱"
 
-#: seahub/templates/repo.html:182
+#: seahub/templates/repo.html:173
 msgid "Current Library"
 msgstr "當前資料庫"
 
-#: seahub/templates/repo.html:186
+#: seahub/templates/repo.html:177
 msgid "Other Libraries"
 msgstr "其他資料庫"
 
-#: seahub/templates/repo.html:196 seahub/templates/shared_file_view.html:49
+#: seahub/templates/repo.html:187 seahub/templates/shared_file_view.html:49
 msgid "Please click and choose a directory."
 msgstr "請點擊選擇目標目錄。"
 
-#: seahub/templates/repo.html:202
+#: seahub/templates/repo.html:200
 #, python-format
 msgid "Rename %(name)s as:"
 msgstr "將 %(name)s 重命名為："
 
-#: seahub/templates/repo.html:212
+#: seahub/templates/repo.html:210
 #, python-format
 msgid "Sync %(dir_name)s"
 msgstr "同步 %(dir_name)s"
 
-#: seahub/templates/repo.html:213
+#: seahub/templates/repo.html:211
 msgid ""
 "A sub-library will be created from this directory. It will be listed in your"
 " desktop client, and you can download it just like downloading a normal "
 "library."
 msgstr "一個子資料庫會從這個目錄創建。它會在你的桌面客戶端列出來，你可以像普通的資料庫一樣去下載。"
 
-#: seahub/templates/repo.html:214
-msgid "Create"
-msgstr "創建"
-
-#: seahub/templates/repo.html:228
+#: seahub/templates/repo.html:226
 msgid ""
 "This library is encrypted. Please input the password if you want to browse "
 "it online. And the password will be kept in the browser for only 1 hour."
 msgstr "該資料庫已加密。如需在線查看，請輸入解密密碼。密碼將在瀏覽器中暫存1小時。"
 
-#: seahub/templates/repo.html:257
+#: seahub/templates/repo.html:254
 #: seahub/templates/view_shared_upload_link.html:77
 msgid "File is too big"
 msgstr "文件太大"
 
-#: seahub/templates/repo.html:258
+#: seahub/templates/repo.html:255
 #: seahub/templates/view_shared_upload_link.html:78
 msgid "File is too small"
 msgstr "文件太小"
 
-#: seahub/templates/repo.html:259
+#: seahub/templates/repo.html:256
 #: seahub/templates/view_shared_upload_link.html:79
 msgid "Filetype not allowed"
 msgstr "不支援的文件類型"
 
-#: seahub/templates/repo.html:260
+#: seahub/templates/repo.html:257
 #: seahub/templates/view_shared_upload_link.html:80
 msgid "Max number of files exceeded"
 msgstr "文件太多"
 
-#: seahub/templates/repo.html:261
+#: seahub/templates/repo.html:258
 #: seahub/templates/view_shared_upload_link.html:81
 msgid "Uploaded bytes exceed file size"
 msgstr "上傳大小超過了文件大小"
 
-#: seahub/templates/repo.html:262
+#: seahub/templates/repo.html:259
 #: seahub/templates/view_shared_upload_link.html:82
 msgid "Empty file upload result"
 msgstr "空文件"
 
-#: seahub/templates/repo.html:264
-#: seahub/templates/view_shared_upload_link.html:84
+#: seahub/templates/repo.html:261
+#: seahub/templates/view_shared_upload_link.html:84 seahub/views/ajax.py:956
 msgid "Error"
 msgstr "錯誤"
 
-#: seahub/templates/repo.html:265
+#: seahub/templates/repo.html:262
 #: seahub/templates/view_shared_upload_link.html:85
 msgid "Start"
 msgstr "上傳"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Delete Items"
 msgstr "刪除條目"
 
-#: seahub/templates/repo.html:393
+#: seahub/templates/repo.html:377
 msgid "Are you sure you want to delete these selected items?"
 msgstr "確定要刪除選中的條目嗎？"
 
-#: seahub/templates/repo.html:397 seahub/templates/repo.html.py:580
+#: seahub/templates/repo.html:381 seahub/templates/repo.html.py:564
 msgid "Processing..."
 msgstr "處理中..."
 
-#: seahub/templates/repo.html:427
+#: seahub/templates/repo.html:411
 #, python-format
 msgid "Successfully deleted %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 個條目已刪除成功。"
 
-#: seahub/templates/repo.html:429
+#: seahub/templates/repo.html:413
 #, python-format
 msgid "Successfully deleted %(name)s."
 msgstr "%(name)s 刪除成功。"
 
-#: seahub/templates/repo.html:438
+#: seahub/templates/repo.html:422
 #, python-format
 msgid "Internal error. Failed to delete %(name)s and %(amount)s other items."
 msgstr "內部錯誤。%(name)s 和其他 %(amount)s 個條目刪除失敗。"
 
-#: seahub/templates/repo.html:440
+#: seahub/templates/repo.html:424
 #, python-format
 msgid "Internal error. Failed to delete %(name)s."
 msgstr "內部錯誤。%(name)s 刪除失敗。"
 
-#: seahub/templates/repo.html:540
+#: seahub/templates/repo.html:524
 msgid "Move selected directories/files to:"
 msgstr "移動選中的文件/目錄到:"
 
-#: seahub/templates/repo.html:543
+#: seahub/templates/repo.html:527
 msgid "Copy selected directories/files to:"
 msgstr "複製選中的文件/目錄到:"
 
-#: seahub/templates/repo.html:569 seahub/templates/repo.html.py:1580
-#: seahub/views/ajax.py:637 seahub/views/ajax.py:798
+#: seahub/templates/repo.html:553 seahub/templates/repo.html.py:1684
+#: seahub/views/ajax.py:659 seahub/views/ajax.py:851
 msgid "Invalid destination path"
 msgstr "目標路徑無效"
 
-#: seahub/templates/repo.html:619
+#: seahub/templates/repo.html:608
 #, python-format
 msgid "Successfully moved %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 個條目移動成功。"
 
-#: seahub/templates/repo.html:621
+#: seahub/templates/repo.html:610
 #, python-format
 msgid "Successfully moved %(name)s."
 msgstr "%(name)s 移動成功。"
 
-#: seahub/templates/repo.html:626
+#: seahub/templates/repo.html:615
 #, python-format
 msgid "Successfully copied %(name)s and %(amount)s other items."
 msgstr "%(name)s 和其他 %(amount)s 個條目復製成功。"
 
-#: seahub/templates/repo.html:628
+#: seahub/templates/repo.html:617
 #, python-format
 msgid "Successfully copied %(name)s."
 msgstr "%(name)s 復製成功。"
 
-#: seahub/templates/repo.html:640
+#: seahub/templates/repo.html:629
 #, python-format
 msgid "Internal error. Failed to move %(name)s and %(amount)s other items."
 msgstr "內部錯誤。%(name)s 和其他 %(amount)s 個條目移動失敗。"
 
-#: seahub/templates/repo.html:642
+#: seahub/templates/repo.html:631
 #, python-format
 msgid "Internal error. Failed to move %(name)s."
 msgstr "內部錯誤。%(name)s 移動失敗。"
 
-#: seahub/templates/repo.html:646
+#: seahub/templates/repo.html:635
 #, python-format
 msgid "Internal error. Failed to copy %(name)s and %(amount)s other items."
 msgstr "內部錯誤。%(name)s 和其他 %(amount)s 個條目複製失敗。"
 
-#: seahub/templates/repo.html:648
+#: seahub/templates/repo.html:637
 #, python-format
 msgid "Internal error. Failed to copy %(name)s."
 msgstr "內部錯誤。%(name)s 複製失敗。"
 
-#: seahub/templates/repo.html:707
+#: seahub/templates/repo.html:658 seahub/templates/repo.html.py:1725
+msgid "Moving..."
+msgstr ""
+
+#: seahub/templates/repo.html:660 seahub/templates/repo.html.py:1727
+msgid "Copying..."
+msgstr ""
+
+#: seahub/templates/repo.html:687
+#, python-format
+msgid "Successfully moved %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:689 seahub/templates/repo.html.py:694
+#, python-format
+msgid "Failed to move %(f_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:692
+#, python-format
+msgid "Successfully copied %(s_num)s items."
+msgstr ""
+
+#: seahub/templates/repo.html:703 seahub/views/ajax.py:1023
+msgid "Failed"
+msgstr ""
+
+#: seahub/templates/repo.html:777
 msgid "Encrypting the file..."
 msgstr "文件加密中..."
 
-#: seahub/templates/repo.html:729
+#: seahub/templates/repo.html:799
 msgid "Error when encrypting."
 msgstr "加密時發生錯誤。"
 
-#: seahub/templates/repo.html:736
+#: seahub/templates/repo.html:806
 #, python-format
 msgid "Encrypting, %(num)s% complete."
 msgstr "加密中， %(num)s% 已完成。"
 
-#: seahub/templates/repo.html:753
+#: seahub/templates/repo.html:823
 msgid "Uploading ..."
 msgstr "上傳中..."
 
-#: seahub/templates/repo.html:766 seahub/templates/repo.html.py:1025
+#: seahub/templates/repo.html:835 seahub/templates/repo.html.py:1122
 msgid "Done!"
 msgstr "完成!"
 
-#: seahub/templates/repo.html:1035
+#: seahub/templates/repo.html:1132
 msgid "Downloading..."
 msgstr "下載中..."
 
-#: seahub/templates/repo.html:1068
+#: seahub/templates/repo.html:1165
 #, python-format
 msgid "Downloading, %(num)s% complete."
 msgstr "下載中，%(num)s% 已完成。"
 
-#: seahub/templates/repo.html:1089
+#: seahub/templates/repo.html:1186
 msgid "Decrypting..."
 msgstr "解密中..."
 
-#: seahub/templates/repo.html:1106
+#: seahub/templates/repo.html:1203
 #, python-format
 msgid "Decrypting, %(num)s% complete."
 msgstr "解密中, %(num)s% 已完成。"
 
-#: seahub/templates/repo.html:1209
+#: seahub/templates/repo.html:1306
 #, python-format
 msgid "Successfully deleted %(name)s"
 msgstr "%(name)s 刪除成功。"
 
-#: seahub/templates/repo.html:1231
+#: seahub/templates/repo.html:1328
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: seahub/templates/repo.html:1233
+#: seahub/templates/repo.html:1330
 msgid "Rename Directory"
 msgstr "重命名目錄"
 
-#: seahub/templates/repo.html:1251
+#: seahub/templates/repo.html:1348
 msgid "Copy File"
 msgstr "複製文件"
 
-#: seahub/templates/repo.html:1253
+#: seahub/templates/repo.html:1350
 msgid "Move File"
 msgstr "移動文件"
 
-#: seahub/templates/repo.html:1255
+#: seahub/templates/repo.html:1352
 msgid "Copy Directory"
 msgstr "複製目錄"
 
-#: seahub/templates/repo.html:1257
+#: seahub/templates/repo.html:1354
 msgid "Move Directory"
 msgstr "移動目錄"
 
-#: seahub/templates/repo.html:1262
+#: seahub/templates/repo.html:1359
 #, python-format
 msgid "Copy %(name)s to:"
 msgstr "複製 %(name)s 到："
 
-#: seahub/templates/repo.html:1265
+#: seahub/templates/repo.html:1362
 #, python-format
 msgid "Move %(name)s to:"
 msgstr "移動 %(name)s 到："
 
-#: seahub/templates/repo.html:1288
+#: seahub/templates/repo.html:1385
 msgid "Directory download is not supported in this library."
 msgstr "該資料庫不支援目錄下載。"
 
-#: seahub/templates/repo.html:1396 seahub/templates/repo.html.py:1550
+#: seahub/templates/repo.html:1501 seahub/templates/repo.html.py:1654
 #: seahub/templates/snippets/repo_dirents.html:54
 msgid "unstarred"
 msgstr "未加星標"
 
-#: seahub/templates/repo.html:1398
+#: seahub/templates/repo.html:1503
 #: seahub/templates/snippets/repo_dirents.html:52
 msgid "starred"
 msgstr "已加星標"
 
-#: seahub/templates/repo.html:1446
+#: seahub/templates/repo.html:1551
 msgid "Sub-library is created."
 msgstr "子資料庫已創建。"
 
-#: seahub/templates/repo.html:1477 seahub/templates/repo.html.py:1518
+#: seahub/templates/repo.html:1582 seahub/templates/repo.html.py:1622
 msgid "It is required."
 msgstr "必填項。"
 
-#: seahub/templates/repo.html:1483
+#: seahub/templates/repo.html:1588
 msgid "Only an extension there, please input a name."
 msgstr "請輸入完整的文件名。"
 
-#: seahub/templates/repo.html:1493
+#: seahub/templates/repo.html:1598
 msgid "Creating..."
 msgstr "創建中..."
 
-#: seahub/templates/repo.html:1522
+#: seahub/templates/repo.html:1626
 msgid "You have not renamed it."
 msgstr "你還沒重命名。"
 
-#: seahub/templates/repo.html:1559
+#: seahub/templates/repo.html:1663
 #, python-format
 msgid "Successfully renamed %(old_name)s to %(new_name)s"
 msgstr "%(old_name)s 已重命名為 %(new_name)s"
 
-#: seahub/templates/repo.html:1677
+#: seahub/templates/repo.html:1763 seahub/templates/repo.html.py:1791
+msgid "Canceled."
+msgstr ""
+
+#: seahub/templates/repo.html:1878
 msgid "Please select at least one contact."
 msgstr "請至少選擇一個聯絡人。"
 
-#: seahub/templates/repo.html:1788
-#: seahub/templates/snippets/myhome_extra_script.html:47
+#: seahub/templates/repo.html:1989
+#: seahub/templates/snippets/myhome_extra_script.html:86
 msgid "Please enter emails or groups, or select some."
 msgstr "請輸入電子信箱或群組，或選擇一些。"
 
@@ -4046,11 +4316,12 @@ msgstr "提示：在每次修改後會生成一個鏡像，記錄修改之前的
 msgid "View Snapshot"
 msgstr "查看鏡像"
 
-#: seahub/templates/repo_history.html:60
+#: seahub/templates/repo_history.html:62
 #: seahub/templates/repo_view_snapshot.html:59
-#: seahub/templates/sysadmin/sys_group_admin.html:37
-#: seahub/templates/sysadmin/sys_publink_admin.html:38
-#: seahub/templates/sysadmin/sys_repo_admin.html:31
+#: seahub/templates/sysadmin/sys_group_admin.html:38
+#: seahub/templates/sysadmin/sys_publink_admin.html:39
+#: seahub/templates/sysadmin/sys_repo_admin.html:33
+#: seahub/templates/sysadmin/sys_trafficadmin.html:49
 #: seahub/templates/sysadmin/useradmin_paginator.html:12
 msgid "Per page: "
 msgstr "每頁："
@@ -4091,34 +4362,78 @@ msgstr "全部"
 msgid "Delete Time"
 msgstr "刪除時間"
 
-#: seahub/templates/repo_settings.html:11
+#: seahub/templates/repo_settings.html:13
 msgid "Library Settings"
 msgstr "資料庫設置"
 
-#: seahub/templates/repo_settings.html:22
+#: seahub/templates/repo_settings.html:24
 msgid "Keep full history"
 msgstr "保留所有歷史"
 
-#: seahub/templates/repo_settings.html:23
+#: seahub/templates/repo_settings.html:25
 msgid "Don't keep history"
 msgstr "不保留歷史"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:26
 msgid "Only keep a period of history:"
 msgstr "僅保留一段時間的歷史:"
 
-#: seahub/templates/repo_settings.html:24
+#: seahub/templates/repo_settings.html:27
 msgid "days"
 msgstr "天"
 
-#: seahub/templates/repo_settings.html:31
+#: seahub/templates/repo_settings.html:34
 msgid "Transfer Ownership"
 msgstr "轉讓所有權"
 
-#: seahub/templates/repo_settings.html:33
+#: seahub/templates/repo_settings.html:36
 msgid "Transfer this library to another user:"
 msgstr "將該資料庫轉讓給另一個用戶："
 
+#: seahub/templates/repo_settings.html:43
+msgid "Change Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:45
+msgid "Change the password of this library:"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:46
+msgid "Old Password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:48
+msgid "New Password(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:50
+msgid "New Password Again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:173
+msgid "Please enter the old password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:177
+msgid "Please enter the new password"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:181
+msgid "New password is too short"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:185
+msgid "New password is too long (maximum is 35 characters)"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:189
+msgid "Please enter the new password again"
+msgstr ""
+
+#: seahub/templates/repo_settings.html:193
+msgid "New passwords don't match"
+msgstr ""
+
 #: seahub/templates/repo_view_snapshot.html:8
 msgid "Back to modification history"
 msgstr "返回修改歷史"
@@ -4127,6 +4442,10 @@ msgstr "返回修改歷史"
 msgid "Create Time"
 msgstr "生成時間"
 
+#: seahub/templates/repo_view_snapshot.html:16
+msgid "Last Modifier"
+msgstr "最後修改者"
+
 #: seahub/templates/repo_view_snapshot.html:17
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
@@ -4169,8 +4488,14 @@ msgstr "你的 Seafile 客戶端版本太舊，請升級到最新版本。"
 msgid "Click to download."
 msgstr "點此下載"
 
+#: seahub/templates/share_access_validation.html:6
+msgid ""
+"Please input the password if you want to browse the shared file/directory. "
+"And the password will be kept on the server for only 1 hour."
+msgstr ""
+
 #: seahub/templates/shared_file_view.html:26
-#: seahub/templates/view_shared_dir.html:9
+#: seahub/templates/view_shared_dir.html:8
 msgid "Shared by: "
 msgstr "共享來源："
 
@@ -4182,25 +4507,26 @@ msgstr "儲存到..."
 msgid "Save To:"
 msgstr "儲存到："
 
-#: seahub/templates/shared_link_email.html:2
+#: seahub/templates/shared_link_email.html:9
+#: seahub/templates/shared_upload_link_email.html:8
+#: seahub/templates/registration/password_reset_email.html:9
+#: seahub/templates/sysadmin/user_activation_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_reset_email.html:9
+msgid "Hi,"
+msgstr ""
+
+#: seahub/templates/shared_link_email.html:12
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s is sharing a file to you on "
-"%(site_name)s."
-msgstr "你收到這封郵件是因為 %(email)s 在 %(site_name)s 上共享了一個文件給你。"
+msgid "%(email)s shared a file to you on %(site_name)s:"
+msgstr ""
 
-#: seahub/templates/shared_link_email.html:4
-msgid "Please go to the following page and view the file:"
-msgstr "請點擊以下連結查看："
-
-#: seahub/templates/shared_upload_link_email.html:2
+#: seahub/templates/shared_upload_link_email.html:11
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(email)s has shared an upload link to "
-"you on %(site_name)s."
-msgstr "你收到這封郵件是因為 %(email)s 在 %(site_name)s 上共享了一個上傳連結給你。"
+msgid "%(email)s shared an upload link to you on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/shared_upload_link_email.html:4
+#: seahub/templates/shared_upload_link_email.html:15
 msgid "You can go to the following page and upload your files:"
 msgstr "請到以下頁面上傳你的文件："
 
@@ -4212,8 +4538,8 @@ msgstr "星標文件"
 msgid "icon"
 msgstr "圖示"
 
-#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:36
-#: seahub/templates/view_file_base.html:142
+#: seahub/templates/starred.html:27 seahub/templates/view_file_base.html:37
+#: seahub/templates/view_file_base.html:144
 msgid "Unstar"
 msgstr "取消星標"
 
@@ -4268,48 +4594,48 @@ msgstr "到"
 msgid "Sorry, this user is not registered yet."
 msgstr "抱歉，該用戶還未註冊。"
 
-#: seahub/templates/view_file_base.html:38
-#: seahub/templates/view_file_base.html:138
+#: seahub/templates/view_file_base.html:39
+#: seahub/templates/view_file_base.html:140
 msgid "Star"
 msgstr "新增星標"
 
-#: seahub/templates/view_file_base.html:55
+#: seahub/templates/view_file_base.html:56
 #: seahub/templates/view_file_markdown.html:7
 #: seahub/templates/view_file_text.html:18
 msgid "updated this file"
 msgstr "更新了該文件"
 
-#: seahub/templates/view_file_base.html:59
+#: seahub/templates/view_file_base.html:60
 #, python-format
 msgid "one contributor"
 msgid_plural " %(counter)s contributors "
 msgstr[0] " %(counter)s 個貢獻者 "
 
-#: seahub/templates/view_file_base.html:136
+#: seahub/templates/view_file_base.html:138
 msgid "Unstarred successfully"
 msgstr "星標取消成功"
 
-#: seahub/templates/view_file_base.html:140
+#: seahub/templates/view_file_base.html:142
 msgid "Starred successfully"
 msgstr "星標新增成功"
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "you can also press ← "
 msgstr "可用方向鍵 ← "
 
 #: seahub/templates/view_file_image.html:15
-#: seahub/templates/snippets/file_content_html.html:31
+#: seahub/templates/snippets/file_content_html.html:30
 msgid "prev"
 msgstr "上一張"
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "you can also press → "
 msgstr "可用方向鍵 → "
 
 #: seahub/templates/view_file_image.html:21
-#: seahub/templates/snippets/file_content_html.html:37
+#: seahub/templates/snippets/file_content_html.html:36
 msgid "next"
 msgstr "下一張"
 
@@ -4328,7 +4654,7 @@ msgid "auto detect"
 msgstr "自動檢測"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid ""
 "  /   /  頁"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "Full Screen"
 msgstr "全螢幕"
 
 #: seahub/templates/view_file_pdf.html:30
-#: seahub/templates/snippets/file_content_js.html:63
+#: seahub/templates/snippets/file_content_js.html:89
 msgid "loading..."
 msgstr "載入中..."
 
 #: seahub/templates/view_file_pdf.html:77
-#: seahub/templates/snippets/file_content_js.html:110
+#: seahub/templates/snippets/file_content_js.html:136
 msgid ""
 "You can use IE 10 or other browsers, for example, firefox, to view it "
 "online."
 msgstr "如果您想在線查看該文件，您可以使用 IE 10 或其他瀏覽器比如 firefox 。"
 
 #: seahub/templates/view_file_svg.html:7
-#: seahub/templates/snippets/file_content_js.html:41
+#: seahub/templates/snippets/file_content_js.html:63
 msgid "To view it online, you can use firefox, chrome or IE 9."
 msgstr "在線查看：請使用 firefox, chrome 或 IE 9。"
 
 #: seahub/templates/view_file_unknown.html:6
-#: seahub/templates/snippets/file_content_js.html:124
+#: seahub/templates/snippets/file_content_js.html:150
 msgid "This type of file cannot be viewed online."
 msgstr "該類型文件無法在線查看。"
 
-#: seahub/templates/view_shared_dir.html:26
+#: seahub/templates/view_shared_dir.html:22
 msgid "ZIP"
 msgstr "ZIP"
 
@@ -4375,41 +4701,55 @@ msgstr "上傳文件到%(dir_name)s"
 msgid "shared by:"
 msgstr "共享來源："
 
-#: seahub/templates/registration/login.html:11
+#: seahub/templates/registration/login.html:4
+#: seahub/templates/registration/login.html:32
+#: seahub/templates/registration/login.html:60
+#: seahub/templates/registration/password_reset_complete.html:8
+#: seahub/templates/sysadmin/user_activation_email.html:15
+#: seahub/templates/sysadmin/user_add_email.html:25
+msgid "Log In"
+msgstr "登錄"
+
+#: seahub/templates/registration/login.html:37
 msgid "(forgot password)"
 msgstr "（忘記密碼）"
 
-#: seahub/templates/registration/login.html:14
+#: seahub/templates/registration/login.html:40
 msgid "CAPTCHA"
 msgstr "驗證碼"
 
-#: seahub/templates/registration/login.html:16
+#: seahub/templates/registration/login.html:42
 msgid "Not clear? Refresh it."
 msgstr "太模糊？刷新。"
 
-#: seahub/templates/registration/login.html:23
+#: seahub/templates/registration/login.html:49
 msgid "Incorrect email or password"
 msgstr "你輸入的電子信箱或密碼不正確"
 
-#: seahub/templates/registration/login.html:31
+#: seahub/templates/registration/login.html:57
 #, python-format
 msgid "Remember me for %(remember_days)s days "
 msgstr "%(remember_days)s天內保持登錄"
 
-#: seahub/templates/registration/login.html:61
+#: seahub/templates/registration/login.html:62
+#: seahub/templates/registration/registration_form.html:6
+msgid "Signup"
+msgstr "註冊"
+
+#: seahub/templates/registration/login.html:87
 msgid "Failed to refresh the CAPTCHA, please try again later."
 msgstr "刷新驗證碼失敗，請稍後嘗試。"
 
-#: seahub/templates/registration/login.html:68
-#: seahub/templates/registration/registration_form.html:47
+#: seahub/templates/registration/login.html:94
+#: seahub/templates/registration/registration_form.html:49
 #: seahub/templates/sysadmin/repoadmin_js.html:21
-#: seahub/templates/sysadmin/sys_useradmin.html:56
+#: seahub/templates/sysadmin/sys_useradmin.html:94
 msgid "Email cannot be blank"
 msgstr "電子信箱不能為空"
 
-#: seahub/templates/registration/login.html:72
-#: seahub/templates/registration/registration_form.html:51
-#: seahub/templates/sysadmin/sys_useradmin.html:60
+#: seahub/templates/registration/login.html:98
+#: seahub/templates/registration/registration_form.html:53
+#: seahub/templates/sysadmin/sys_useradmin.html:98
 msgid "Password cannot be blank"
 msgstr "密碼不能為空"
 
@@ -4463,13 +4803,13 @@ msgstr "密碼重置成功。"
 #: seahub/templates/registration/password_reset_confirm.html:4
 #: seahub/templates/registration/password_reset_form.html:4
 #: seahub/templates/registration/password_reset_form.html:7
-#: seahub/templates/sysadmin/useradmin_js.html:7 seahub/views/sysadmin.py:468
+#: seahub/templates/sysadmin/useradmin_js.html:7
 msgid "Password Reset"
 msgstr "密碼重置"
 
 #: seahub/templates/registration/password_reset_confirm.html:11
-msgid "Input new password"
-msgstr "輸入新密碼"
+msgid "Reset Password"
+msgstr ""
 
 #: seahub/templates/registration/password_reset_confirm.html:26
 msgid "Failed to reset password: this link is no longer available."
@@ -4480,23 +4820,19 @@ msgid "Password Reset Successfully"
 msgstr "密碼重置成功"
 
 #: seahub/templates/registration/password_reset_done.html:8
-msgid "We've send a password reset email to your email."
-msgstr "我們已經把密碼重置說明發往你提交的電子信箱裡，請查收。"
+msgid "We've sent a password reset email to your mailbox."
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:2
+#: seahub/templates/registration/password_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your"
-" user account at %(site_name)s. "
-msgstr "你收到這封郵件是因為你請求給你在 %(site_name)s 的帳號重置密碼。"
+"To reset the password of your account %(account)s on %(site_name)s, please "
+"click the following link: "
+msgstr ""
 
-#: seahub/templates/registration/password_reset_email.html:4
-msgid "Please go to the following page and choose a new password:"
-msgstr "請點擊以下連結更新密碼："
-
-#: seahub/templates/registration/password_reset_email.html:8
-msgid "Your username, in case you've forgotten:"
-msgstr "你的用戶名:"
+#: seahub/templates/registration/password_reset_email.html:17
+msgid "If you did not request it, just skip it."
+msgstr ""
 
 #: seahub/templates/registration/password_reset_form.html:9
 msgid "Your email used in login: "
@@ -4526,23 +4862,31 @@ msgstr "註冊成功，請等待管理員啓動你的帳號。"
 msgid "Register"
 msgstr "註冊"
 
-#: seahub/templates/registration/registration_form.html:7
+#: seahub/templates/registration/registration_form.html:9
 msgid "Welcome back, you are already signed in."
 msgstr "歡迎回來，你已登錄。"
 
-#: seahub/templates/registration/registration_form.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:28
+#: seahub/templates/registration/registration_form.html:21
+#: seahub/templates/sysadmin/sys_useradmin.html:33
 msgid "Confirm Password"
 msgstr "確認密碼"
 
-#: seahub/templates/registration/registration_form.html:55
-#: seahub/templates/snippets/repo_create_js.html:58
-#: seahub/templates/sysadmin/sys_useradmin.html:64
+#: seahub/templates/registration/registration_form.html:34
+msgid "Sign Up"
+msgstr ""
+
+#: seahub/templates/registration/registration_form.html:57
+#: seahub/templates/snippets/repo_create_js.html:53
+#: seahub/templates/snippets/shared_link_js.html:235
+#: seahub/templates/snippets/shared_link_js.html:404
+#: seahub/templates/sysadmin/sys_useradmin.html:102
 msgid "Please enter the password again"
 msgstr "請再次輸入密碼"
 
-#: seahub/templates/registration/registration_form.html:59
-#: seahub/templates/snippets/repo_create_js.html:62
+#: seahub/templates/registration/registration_form.html:61
+#: seahub/templates/snippets/repo_create_js.html:57
+#: seahub/templates/snippets/shared_link_js.html:239
+#: seahub/templates/snippets/shared_link_js.html:408
 msgid "Passwords don't match"
 msgstr "兩次輸入的密碼不一致"
 
@@ -4562,12 +4906,6 @@ msgstr " 太大。不得超過 1MB。"
 msgid "Discuss"
 msgstr "討論"
 
-#: seahub/templates/snippets/bottom_bar.html:3
-#: seahub/templates/snippets/my_owned_repos.html:11
-#: seahub/templates/snippets/my_owned_repos.html:166
-msgid "Group"
-msgstr "群組"
-
 #: seahub/templates/snippets/bottom_bar.html:66
 msgid "Please select at least 1 group."
 msgstr "請至少選擇一個群組。"
@@ -4576,10 +4914,6 @@ msgstr "請至少選擇一個群組。"
 msgid "Please input a discussion."
 msgstr "請輸入一個討論。"
 
-#: seahub/templates/snippets/current_commit.html:12
-msgid "Generated by system"
-msgstr "系統自動生成"
-
 #: seahub/templates/snippets/file_share_popup.html:3
 #, python-format
 msgid "Share %(name)s"
@@ -4598,42 +4932,66 @@ msgstr "上傳連結"
 msgid "Private Share"
 msgstr "私人共享"
 
-#: seahub/templates/snippets/file_share_popup.html:30
-#: seahub/templates/snippets/file_share_popup.html:50
+#: seahub/templates/snippets/file_share_popup.html:34
+#: seahub/templates/snippets/file_share_popup.html:75
+msgid "Use Password"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:36
+#: seahub/templates/snippets/file_share_popup.html:77
+msgid "(at least 6 characters)"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:38
+#: seahub/templates/snippets/file_share_popup.html:79
+#: seahub/templates/snippets/repo_create_form.html:22
+msgid "Password again"
+msgstr "請再次輸入密碼"
+
+#: seahub/templates/snippets/file_share_popup.html:43
+msgid "Set Expiration"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:45
+msgid "Days"
+msgstr ""
+
+#: seahub/templates/snippets/file_share_popup.html:51
+#: seahub/templates/snippets/file_share_popup.html:84
 msgid "Generate"
 msgstr "生成連結"
 
-#: seahub/templates/snippets/file_share_popup.html:32
+#: seahub/templates/snippets/file_share_popup.html:53
 msgid "Link: "
 msgstr "連結："
 
-#: seahub/templates/snippets/file_share_popup.html:33
-#: seahub/templates/snippets/file_share_popup.html:53
+#: seahub/templates/snippets/file_share_popup.html:54
+#: seahub/templates/snippets/file_share_popup.html:87
 msgid "Send"
 msgstr "發送"
 
-#: seahub/templates/snippets/file_share_popup.html:37
-#: seahub/templates/snippets/file_share_popup.html:57
+#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:91
 msgid "Send to:"
 msgstr "發送到："
 
-#: seahub/templates/snippets/file_share_popup.html:38
-#: seahub/templates/snippets/file_share_popup.html:58
+#: seahub/templates/snippets/file_share_popup.html:59
+#: seahub/templates/snippets/file_share_popup.html:92
 msgid "Emails, Seperated by ','"
 msgstr "輸入電子信箱，多個以,分隔"
 
-#: seahub/templates/snippets/file_share_popup.html:43
-#: seahub/templates/snippets/file_share_popup.html:63
+#: seahub/templates/snippets/file_share_popup.html:64
+#: seahub/templates/snippets/file_share_popup.html:97
 msgid "Sending..."
 msgstr "發送中..."
 
-#: seahub/templates/snippets/file_share_popup.html:49
+#: seahub/templates/snippets/file_share_popup.html:70
 msgid ""
 "You can share the generated link to others and then they can upload files to"
 " this directory via the link."
 msgstr "你可以共享生成好的連結給別人，他們就能通過這個連結上傳文件到這個文件夾。"
 
-#: seahub/templates/snippets/file_share_popup.html:52
+#: seahub/templates/snippets/file_share_popup.html:86
 msgid "Upload Link: "
 msgstr "上傳連結："
 
@@ -4686,7 +5044,7 @@ msgid "Sub-libraries"
 msgstr "子資料庫"
 
 #: seahub/templates/snippets/my_owned_repos.html:10
-#: seahub/templates/sysadmin/userinfo.html:62
+#: seahub/templates/sysadmin/userinfo.html:56
 msgid "Shared"
 msgstr "共享給我的"
 
@@ -4717,29 +5075,23 @@ msgid ""
 " library."
 msgstr "你可以從一個資料庫中的一個目錄創建一個子資料庫。一個子資料庫可被獨立地同步和共享。子資料庫中的文件將和源資料庫相應目錄中的文件自動保持同步。"
 
-#: seahub/templates/snippets/my_owned_repos.html:156
-msgid "No library is shared to you"
-msgstr "還沒有資料庫共享給你"
-
-#: seahub/templates/snippets/my_owned_repos.html:207
-msgid "No library is shared to your groups"
-msgstr "還沒有資料庫共享到你參加的群組裡"
-
 #: seahub/templates/snippets/office_convert_html.html:4
+#: seahub/templates/snippets/spreadsheet_convert_html.html:4
 msgid "The file is being processed, please wait..."
 msgstr "文件正在處理，請稍後..."
 
-#: seahub/templates/snippets/office_convert_js.html:39
+#: seahub/templates/snippets/office_convert_js.html:40
 msgid "hide outline"
 msgstr "隱藏提綱"
 
-#: seahub/templates/snippets/office_convert_js.html:40
+#: seahub/templates/snippets/office_convert_js.html:41
 msgid "show outline"
 msgstr "顯示提綱"
 
-#: seahub/templates/snippets/office_convert_js.html:163
-#: seahub/templates/snippets/office_convert_js.html:170
-#: seahub/templates/snippets/office_convert_js.html:195
+#: seahub/templates/snippets/office_convert_js.html:168
+#: seahub/templates/snippets/office_convert_js.html:175
+#: seahub/templates/snippets/office_convert_js.html:200
+#: seahub/templates/snippets/spreadsheet_convert_js.html:30
 msgid "Document convertion failed."
 msgstr "文檔轉換失敗。"
 
@@ -4756,27 +5108,29 @@ msgstr "加密"
 msgid "(at least %(repo_password_min_length)s characters)"
 msgstr "(至少%(repo_password_min_length)s個字元)"
 
-#: seahub/templates/snippets/repo_create_form.html:22
-msgid "Password again"
-msgstr "請再次輸入密碼"
-
-#: seahub/templates/snippets/repo_create_js.html:34
+#: seahub/templates/snippets/repo_create_js.html:29
 msgid "Name is required"
 msgstr "名稱為必填項"
 
-#: seahub/templates/snippets/repo_create_js.html:38
+#: seahub/templates/snippets/repo_create_js.html:33
 msgid "Description is required"
 msgstr "描述為必填項"
 
-#: seahub/templates/snippets/repo_create_js.html:46
+#: seahub/templates/snippets/repo_create_js.html:41
+#: seahub/templates/snippets/shared_link_js.html:223
+#: seahub/templates/snippets/shared_link_js.html:392
 msgid "Please enter password"
 msgstr "請輸入密碼"
 
-#: seahub/templates/snippets/repo_create_js.html:50
+#: seahub/templates/snippets/repo_create_js.html:45
+#: seahub/templates/snippets/shared_link_js.html:227
+#: seahub/templates/snippets/shared_link_js.html:396
 msgid "Password is too short"
 msgstr "密碼太短"
 
-#: seahub/templates/snippets/repo_create_js.html:54
+#: seahub/templates/snippets/repo_create_js.html:49
+#: seahub/templates/snippets/shared_link_js.html:231
+#: seahub/templates/snippets/shared_link_js.html:400
 msgid "Password is too long (maximum is 35 characters)"
 msgstr "密碼太長（不超過35個字元）"
 
@@ -4789,7 +5143,7 @@ msgstr "刪除成功。"
 msgid "Really want to delete %(lib_name)s ?"
 msgstr "確定要刪除 %(lib_name)s 嗎？"
 
-#: seahub/templates/snippets/repo_dir_data.html:15
+#: seahub/templates/snippets/repo_dir_data.html:14
 msgid "Upload"
 msgstr "上傳"
 
@@ -4916,15 +5270,23 @@ msgid ""
 "Please select at least one file type or input at least one file extension"
 msgstr "請至少選擇一種文件類型或一種文件副檔名"
 
-#: seahub/templates/snippets/shared_link_js.html:79
+#: seahub/templates/snippets/shared_link_js.html:120
 msgid "Select contacts"
 msgstr "選擇聯絡人"
 
-#: seahub/templates/snippets/shared_link_js.html:121
-#: seahub/templates/snippets/shared_link_js.html:243
+#: seahub/templates/snippets/shared_link_js.html:164
+#: seahub/templates/snippets/shared_link_js.html:338
 msgid "Please input at least an email."
 msgstr "請輸入至少一個電子信箱。"
 
+#: seahub/templates/snippets/shared_link_js.html:250
+msgid "Please enter days"
+msgstr ""
+
+#: seahub/templates/snippets/shared_link_js.html:256
+msgid "Please enter valid days"
+msgstr ""
+
 #: seahub/templates/snippets/space_and_traffic.html:4
 #: seahub/templates/snippets/space_and_traffic.html:12
 msgid "Used:"
@@ -4937,7 +5299,7 @@ msgstr "個人"
 
 #: seahub/templates/snippets/space_and_traffic.html:6
 #: seahub/templates/snippets/space_and_traffic.html:8
-#: seahub/templates/sysadmin/userinfo.html:41
+#: seahub/templates/sysadmin/userinfo.html:35
 msgid "Sharing"
 msgstr "共享"
 
@@ -4949,6 +5311,22 @@ msgstr "本月已用流量："
 msgid "Payment"
 msgstr "支付"
 
+#: seahub/templates/sysadmin/base.html:12
+msgid "Users"
+msgstr "成員"
+
+#: seahub/templates/sysadmin/base.html:18
+msgid "Notifications"
+msgstr "通知"
+
+#: seahub/templates/sysadmin/base.html:25
+msgid "Traffic"
+msgstr ""
+
+#: seahub/templates/sysadmin/base.html:30
+msgid "Logs"
+msgstr ""
+
 #: seahub/templates/sysadmin/repo_transfer_form.html:3
 msgid "Transfer Library"
 msgstr "轉讓資料庫"
@@ -4959,74 +5337,74 @@ msgid "Transfer %(lib_name)s to:"
 msgstr "轉讓 %(lib_name)s 給："
 
 #: seahub/templates/sysadmin/repoadmin_table.html:6
-#: seahub/templates/sysadmin/sys_publink_admin.html:11
-#: seahub/templates/sysadmin/sys_repo_search.html:10
+#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_repo_search.html:12
 msgid "Owner"
 msgstr "擁有者"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:8
-msgid "All Groups"
-msgstr "所有群組"
-
-#: seahub/templates/sysadmin/sys_group_admin.html:13
+#: seahub/templates/sysadmin/sys_group_admin.html:14
 #: seahub/templates/sysadmin/sys_org_admin.html:13
 msgid "Creator"
 msgstr "創建者"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:14
+#: seahub/templates/sysadmin/sys_group_admin.html:15
 #: seahub/templates/sysadmin/sys_org_admin.html:14
-#: seahub/templates/sysadmin/sys_publink_admin.html:12
+#: seahub/templates/sysadmin/sys_publink_admin.html:14
 msgid "Create At"
 msgstr "創建時間"
 
-#: seahub/templates/sysadmin/sys_group_admin.html:62
+#: seahub/templates/sysadmin/sys_group_admin.html:63
 msgid "Delete Group"
 msgstr "刪除群組"
 
 #: seahub/templates/sysadmin/sys_ldap_useradmin.html:8
-#: seahub/templates/sysadmin/sys_useradmin.html:8
+#: seahub/templates/sysadmin/sys_useradmin.html:7
+msgid "Search users..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:15
 msgid "Database"
 msgstr "資料庫"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:9
-#: seahub/templates/sysadmin/sys_useradmin.html:10
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:16
+#: seahub/templates/sysadmin/sys_useradmin.html:18
 msgid "LDAP"
 msgstr "LDAP"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:11
-#: seahub/templates/sysadmin/sys_list_orphan.html:12
-#: seahub/templates/sysadmin/sys_list_system.html:12
-#: seahub/templates/sysadmin/sys_repo_admin.html:12
-#: seahub/templates/sysadmin/sys_useradmin.html:13
-msgid "Search"
-msgstr "搜索"
-
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:23
+#: seahub/templates/sysadmin/useradmin_table.html:8
+#: seahub/templates/sysadmin/useradmin_table.html:73
 msgid "Create At / Last Login"
 msgstr "創建於/最後登錄"
 
-#: seahub/templates/sysadmin/sys_ldap_useradmin.html:20
-#: seahub/templates/sysadmin/useradmin_table.html:6
-#: seahub/templates/sysadmin/userinfo.html:37
+#: seahub/templates/sysadmin/sys_ldap_useradmin.html:24
+#: seahub/templates/sysadmin/useradmin_table.html:7
+#: seahub/templates/sysadmin/useradmin_table.html:72
+#: seahub/templates/sysadmin/userinfo.html:31
 msgid "Space Used"
 msgstr "已用空間"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:8
-#: seahub/templates/sysadmin/sys_list_system.html:8
-#: seahub/templates/sysadmin/sys_repo_admin.html:8
+#: seahub/templates/sysadmin/sys_list_orphan.html:7
+#: seahub/templates/sysadmin/sys_list_system.html:7
+#: seahub/templates/sysadmin/sys_repo_admin.html:7
+msgid "Search libraries by name..."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_list_orphan.html:14
+#: seahub/templates/sysadmin/sys_list_system.html:14
+#: seahub/templates/sysadmin/sys_repo_admin.html:14
 msgid "All"
 msgstr "全部"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:9
-#: seahub/templates/sysadmin/sys_list_system.html:9
-#: seahub/templates/sysadmin/sys_repo_admin.html:9
+#: seahub/templates/sysadmin/sys_list_orphan.html:15
+#: seahub/templates/sysadmin/sys_list_system.html:15
+#: seahub/templates/sysadmin/sys_repo_admin.html:15
 msgid "Orphan"
 msgstr "沒有所有者的資料庫"
 
-#: seahub/templates/sysadmin/sys_list_orphan.html:10
-#: seahub/templates/sysadmin/sys_list_system.html:10
-#: seahub/templates/sysadmin/sys_repo_admin.html:10
+#: seahub/templates/sysadmin/sys_list_orphan.html:16
+#: seahub/templates/sysadmin/sys_list_system.html:16
+#: seahub/templates/sysadmin/sys_repo_admin.html:16
 msgid "System"
 msgstr "系統資料庫"
 
@@ -5042,96 +5420,117 @@ msgstr "個性域名"
 msgid "Delete Organization"
 msgstr "刪除團體"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:6
+#: seahub/templates/sysadmin/sys_publink_admin.html:7
 msgid "All Public Links"
 msgstr "全部公共連結"
 
-#: seahub/templates/sysadmin/sys_publink_admin.html:13
+#: seahub/templates/sysadmin/sys_publink_admin.html:15
 msgid "Count"
 msgstr "數量"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:5
+#: seahub/templates/sysadmin/sys_repo_search.html:7
 msgid "Search Library"
 msgstr "搜索資料庫"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:8
+#: seahub/templates/sysadmin/sys_repo_search.html:10
 msgid "Tip: you can search by keyword in name or owner or both."
 msgstr "提示：可以用關鍵詞來搜索, 關鍵詞來源於名字或所有者, 或這兩者。"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:14
-#: seahub/templates/sysadmin/user_search.html:12
+#: seahub/templates/sysadmin/sys_repo_search.html:16
+#: seahub/templates/sysadmin/user_search.html:14
 msgid "Result"
 msgstr "搜索結果"
 
-#: seahub/templates/sysadmin/sys_repo_search.html:18
-#: seahub/templates/sysadmin/user_search.html:16
+#: seahub/templates/sysadmin/sys_repo_search.html:20
+#: seahub/templates/sysadmin/user_search.html:18
 msgid "No result"
 msgstr "沒有結果"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:20
-#: seahub/templates/sysadmin/sys_useradmin.html:23
-msgid "Add new user"
-msgstr "新增新用戶"
+#: seahub/templates/sysadmin/sys_trafficadmin.html:19
+msgid "User Traffic"
+msgstr ""
 
-#: seahub/templates/sysadmin/sys_useradmin.html:38
-#: seahub/templates/sysadmin/user_search.html:20
+#: seahub/templates/sysadmin/sys_trafficadmin.html:22
+msgid "Month:"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:28
+#: seahub/templates/sysadmin/sys_useradmin.html:15
+msgid "User"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_trafficadmin.html:29
+msgid "Total Usage"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:22
+#: seahub/templates/sysadmin/sys_useradmin.html:28
+msgid "Add user"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:23
+msgid "Add admin"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:39
+msgid "Add admins"
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:46
+msgid "Tip: the emails should be the users already added."
+msgstr ""
+
+#: seahub/templates/sysadmin/sys_useradmin.html:58
+#: seahub/templates/sysadmin/user_search.html:22
 msgid "Activating..., please wait"
 msgstr "正在啓動...，請稍候"
 
-#: seahub/templates/sysadmin/sys_useradmin.html:68
+#: seahub/templates/sysadmin/sys_useradmin.html:106
 msgid "Passwords do not match"
 msgstr "兩次輸入的密碼不一致"
 
-#: seahub/templates/sysadmin/user_add_email.html:3
+#: seahub/templates/sysadmin/user_activation_email.html:12
+#, python-format
+msgid "Your account %(username)s on %(site_name)s has been activated."
+msgstr ""
+
+#: seahub/templates/sysadmin/user_add_email.html:13
 #, python-format
 msgid ""
-"You're receiving this e-mail because %(user)s added you to organization "
-"\"%(org.org_name)s\" on %(site_name)s."
-msgstr "你收到這封郵件是因為 %(user)s 在 %(site_name)s 上將你加入到“%(org.org_name)s”團體。"
+"%(user)s invited you to join organization \"%(org_name)s\" on %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:5
+#: seahub/templates/sysadmin/user_add_email.html:15
 #, python-format
-msgid ""
-"You're receiving this e-mail because %(user)s added you to %(site_name)s."
-msgstr "你收到這封郵件是因為 %(user)s 將你加入到 %(site_name)s。"
+msgid "%(user)s invited you to join %(site_name)s."
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:7
-msgid "Following is your account information:"
-msgstr "以下是您的登錄資訊："
+#: seahub/templates/sysadmin/user_add_email.html:20
+msgid "Here is your account information:"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:8
+#: seahub/templates/sysadmin/user_add_email.html:21
 #, python-format
 msgid "Email: %(email)s"
 msgstr "電子信箱：%(email)s"
 
-#: seahub/templates/sysadmin/user_add_email.html:9
+#: seahub/templates/sysadmin/user_add_email.html:22
 #, python-format
-msgid "Password:  %(password)s"
-msgstr "密碼：%(password)s"
+msgid "Password: %(password)s"
+msgstr ""
 
-#: seahub/templates/sysadmin/user_add_email.html:11
-msgid "Please go to the following page and log in:"
-msgstr "請點擊以下連結登錄："
-
-#: seahub/templates/sysadmin/user_reset_email.html:2
+#: seahub/templates/sysadmin/user_reset_email.html:12
 #, python-format
 msgid ""
-"You're receiving this e-mail because staff has reset your password at "
-"%(site_name)s. "
-msgstr "你收到這封郵件是因為你在 %(site_name)s 的帳號密碼已經被管理員重置。"
+"Your password on %(site_name)s has been reset. Now it is %(password)s. "
+"Please change it as soon as possible. "
+msgstr ""
 
-#: seahub/templates/sysadmin/user_reset_email.html:4
-#, python-format
-msgid ""
-"Your new password is %(password)s, please modify your password as soon as "
-"possible."
-msgstr "你的新密碼是 %(password)s, 請盡快修改。"
-
-#: seahub/templates/sysadmin/user_search.html:5
+#: seahub/templates/sysadmin/user_search.html:7
 msgid "Search User"
 msgstr "搜索用戶"
 
-#: seahub/templates/sysadmin/user_search.html:8
+#: seahub/templates/sysadmin/user_search.html:10
 msgid "Tip: Use * to match any number of characters."
 msgstr "提示：用 * 來匹配任意字元。"
 
@@ -5145,7 +5544,7 @@ msgid "Are you sure you want to reset the password of %s ?"
 msgstr "確定要重置 %s 的密碼嗎？"
 
 #: seahub/templates/sysadmin/useradmin_js.html:11
-#: seahub/templates/sysadmin/useradmin_table.html:49
+#: seahub/templates/sysadmin/useradmin_table.html:117
 msgid "Revoke Admin"
 msgstr "取消管理員"
 
@@ -5155,7 +5554,6 @@ msgid "Are you sure you want to revoke the admin permission of %s ?"
 msgstr "確定要取消 %s 的管理權限嗎？"
 
 #: seahub/templates/sysadmin/useradmin_js.html:15
-#: seahub/templates/sysadmin/useradmin_table.html:51
 msgid "Set Admin"
 msgstr "設為管理員"
 
@@ -5174,437 +5572,466 @@ msgid ""
 "configuration."
 msgstr "編輯成功, 但發送郵件失敗，請檢查你的郵件配置。"
 
-#: seahub/templates/sysadmin/useradmin_table.html:5
+#: seahub/templates/sysadmin/useradmin_table.html:6
+#: seahub/templates/sysadmin/useradmin_table.html:71
 msgid "Status"
 msgstr "狀態"
 
-#: seahub/templates/sysadmin/useradmin_table.html:19
-#: seahub/templates/sysadmin/useradmin_table.html:26
+#: seahub/templates/sysadmin/useradmin_table.html:20
+#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:86
+#: seahub/templates/sysadmin/useradmin_table.html:93
 msgid "Active"
 msgstr "啓動"
 
-#: seahub/templates/sysadmin/useradmin_table.html:21
-#: seahub/templates/sysadmin/useradmin_table.html:27
+#: seahub/templates/sysadmin/useradmin_table.html:22
+#: seahub/templates/sysadmin/useradmin_table.html:28
+#: seahub/templates/sysadmin/useradmin_table.html:88
+#: seahub/templates/sysadmin/useradmin_table.html:94
 msgid "Inactive"
 msgstr "不啓動"
 
-#: seahub/templates/sysadmin/useradmin_table.html:47
+#: seahub/templates/sysadmin/useradmin_table.html:50
+#: seahub/templates/sysadmin/useradmin_table.html:116
 msgid "ResetPwd"
 msgstr "重置密碼"
 
-#: seahub/templates/sysadmin/userinfo.html:39
+#: seahub/templates/sysadmin/userinfo.html:7
+msgid "Back to user list"
+msgstr ""
+
+#: seahub/templates/sysadmin/userinfo.html:33
 msgid "Total"
 msgstr "總空間"
 
-#: seahub/templates/sysadmin/userinfo.html:40
+#: seahub/templates/sysadmin/userinfo.html:34
 msgid "Used"
 msgstr "我使用的"
 
-#: seahub/templates/sysadmin/userinfo.html:45
+#: seahub/templates/sysadmin/userinfo.html:39
 msgid "Set Quota"
 msgstr "設置容量"
 
-#: seahub/templates/sysadmin/userinfo.html:48
+#: seahub/templates/sysadmin/userinfo.html:42
 msgid "Set user storage limit"
 msgstr "設置該用戶的存儲容量上限"
 
-#: seahub/templates/sysadmin/userinfo.html:51
+#: seahub/templates/sysadmin/userinfo.html:45
 msgid "Tip: 0 means default limit"
 msgstr "提示: 設置為0表示重置為默認上限"
 
-#: seahub/templates/sysadmin/userinfo.html:61
+#: seahub/templates/sysadmin/userinfo.html:55
 msgid "Owned"
 msgstr "我擁有的"
 
-#: seahub/templates/wiki/personal_wiki.html:13
+#: seahub/templates/wiki/personal_wiki.html:32
 msgid "You do not have personal wiki"
 msgstr "你還未創建個人維基"
 
-#: seahub/templates/wiki/personal_wiki.html:20
+#: seahub/templates/wiki/personal_wiki.html:42
 msgid "personal-wiki"
 msgstr "個人維基"
 
-#: seahub/templates/wiki/personal_wiki.html:22
+#: seahub/templates/wiki/personal_wiki.html:44
 msgid "Personal Wiki Pages"
 msgstr "個人維基頁面"
 
-#: seahub/utils/__init__.py:97
+#: seahub/utils/__init__.py:100
 msgid "permission error"
 msgstr "權限錯誤"
 
-#: seahub/views/__init__.py:401
+#: seahub/views/__init__.py:429
 msgid "Unable to view recycle page"
 msgstr "無法查看資源回收筒"
 
-#: seahub/views/__init__.py:427 seahub/views/ajax.py:216
-#: seahub/views/ajax.py:296 seahub/views/ajax.py:370 seahub/views/ajax.py:457
-#: seahub/views/ajax.py:514 seahub/views/ajax.py:556 seahub/views/ajax.py:600
-#: seahub/views/ajax.py:760 seahub/views/ajax.py:923
+#: seahub/views/__init__.py:455 seahub/views/ajax.py:231
+#: seahub/views/ajax.py:318 seahub/views/ajax.py:392 seahub/views/ajax.py:479
+#: seahub/views/ajax.py:536 seahub/views/ajax.py:578 seahub/views/ajax.py:622
+#: seahub/views/ajax.py:813 seahub/views/ajax.py:1086
 msgid "Library does not exist."
 msgstr "資料庫不存在"
 
-#: seahub/views/__init__.py:438
+#: seahub/views/__init__.py:466
 msgid "You do not have permission to perform this action."
 msgstr "你沒有權限進行該操作"
 
-#: seahub/views/__init__.py:445 seahub/views/__init__.py:502
+#: seahub/views/__init__.py:473 seahub/views/__init__.py:530
 msgid "Failed to edit library information."
 msgstr "資料庫資訊編輯失敗。"
 
-#: seahub/views/__init__.py:453 seahub/views/__init__.py:511
+#: seahub/views/__init__.py:481 seahub/views/__init__.py:539
 msgid "Failed to save settings on server"
 msgstr "設置失敗"
 
-#: seahub/views/__init__.py:460 seahub/views/__init__.py:514
+#: seahub/views/__init__.py:488 seahub/views/__init__.py:542
 msgid "Settings saved."
 msgstr "設置已保存。"
 
-#: seahub/views/__init__.py:550
+#: seahub/views/__init__.py:603
 #, python-format
 msgid "Username %s is not valid."
 msgstr "用戶名 %s 含有無效字元"
 
-#: seahub/views/__init__.py:557
+#: seahub/views/__init__.py:610
 #, python-format
 msgid "User %s is not found."
 msgstr "未找到用戶 %s 。"
 
-#: seahub/views/__init__.py:563
+#: seahub/views/__init__.py:616
 #, python-format
 msgid "Library %(repo_name)s has been transfered to %(new_owner)s."
 msgstr "資料庫 %(repo_name)s 已被轉讓給 %(new_owner)s。"
 
-#: seahub/views/__init__.py:571
+#: seahub/views/__init__.py:648
+#, python-format
+msgid "Successfully updated the password of Library %(repo_name)s."
+msgstr ""
+
+#: seahub/views/__init__.py:655
 msgid "Filename contains invalid character"
 msgstr "上傳的文件名包含無效字元"
 
-#: seahub/views/__init__.py:573
+#: seahub/views/__init__.py:657
 msgid "Duplicated filename"
 msgstr "已存在同名的文件"
 
-#: seahub/views/__init__.py:577
+#: seahub/views/__init__.py:661
 msgid "File size surpasses the limit"
 msgstr "文件大小超過限制"
 
-#: seahub/views/__init__.py:579
+#: seahub/views/__init__.py:663
 msgid "The space of owner is used up, upload failed"
 msgstr "該資料庫所有者的空間已用完，無法上傳"
 
-#: seahub/views/__init__.py:581
+#: seahub/views/__init__.py:665
 msgid "An error occurs during file transfer"
 msgstr "文件傳輸出錯"
 
-#: seahub/views/__init__.py:593 seahub/views/__init__.py:615
+#: seahub/views/__init__.py:677 seahub/views/__init__.py:699
 msgid "Invalid url"
 msgstr "無效連結"
 
-#: seahub/views/__init__.py:635
+#: seahub/views/__init__.py:719
 msgid "Unable to view library modification"
 msgstr "無法瀏覽該資料庫修改歷史"
 
-#: seahub/views/__init__.py:699
+#: seahub/views/__init__.py:785
 msgid "Unable to view library snapshots"
 msgstr "無法查看該資料庫鏡像"
 
-#: seahub/views/__init__.py:764
+#: seahub/views/__init__.py:850
 msgid "You have no permission to restore library"
 msgstr "你沒有權限進行還原操作"
 
-#: seahub/views/__init__.py:788
+#: seahub/views/__init__.py:874
 msgid "Please specify history ID"
 msgstr "請指定歷史記錄ID"
 
-#: seahub/views/__init__.py:796 seahub/views/__init__.py:1483
-#: seahub/views/__init__.py:1851 seahub/views/ajax.py:1107
+#: seahub/views/__init__.py:882 seahub/views/__init__.py:1568
+#: seahub/views/__init__.py:1931 seahub/views/ajax.py:1279
 msgid "Library does not exist"
 msgstr "資料庫不存在"
 
-#: seahub/views/__init__.py:798
+#: seahub/views/__init__.py:884
 msgid "History you specified does not exist"
 msgstr "指定的歷史記錄不存在"
 
-#: seahub/views/__init__.py:800
+#: seahub/views/__init__.py:886
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-#: seahub/views/__init__.py:882
+#: seahub/views/__init__.py:968
 msgid "No conflict in the merge."
 msgstr "合併沒有衝突。"
 
-#: seahub/views/__init__.py:904 seahub/views/__init__.py:905
+#: seahub/views/__init__.py:989 seahub/views/__init__.py:990
 msgid "My Library"
 msgstr "我的資料庫"
 
-#: seahub/views/__init__.py:1187
+#: seahub/views/__init__.py:1271
 msgid "Failed to unshare the library, as it does not exist."
 msgstr "取消共享失敗，該資料庫不存在"
 
-#: seahub/views/__init__.py:1192
+#: seahub/views/__init__.py:1276
 #, python-format
 msgid "Unshare \"%s\" successfully."
 msgstr "\"%s\" 取消共享成功"
 
-#: seahub/views/__init__.py:1194
+#: seahub/views/__init__.py:1278
 #, python-format
 msgid "Failed to unshare \"%s\"."
 msgstr "\"%s\" 取消共享失敗"
 
-#: seahub/views/__init__.py:1228
+#: seahub/views/__init__.py:1312
 msgid "Failed to delete file."
 msgstr "刪除文件出錯。"
 
-#: seahub/views/__init__.py:1235
+#: seahub/views/__init__.py:1319
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s 刪除成功。"
 
-#: seahub/views/__init__.py:1237 seahub/views/ajax.py:540
+#: seahub/views/__init__.py:1321 seahub/views/ajax.py:562
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "內部錯誤。刪除 %s 失敗。"
 
-#: seahub/views/__init__.py:1283
+#: seahub/views/__init__.py:1367
 msgid "Unable to access file"
 msgstr "無法訪問文件"
 
-#: seahub/views/__init__.py:1309
+#: seahub/views/__init__.py:1393
 msgid "Failed to download library, unable to find server"
 msgstr "下載失敗：找不到伺服器"
 
-#: seahub/views/__init__.py:1320
+#: seahub/views/__init__.py:1404
 msgid "Invalid server setting"
 msgstr "伺服器設置錯誤"
 
-#: seahub/views/__init__.py:1564
+#: seahub/views/__init__.py:1644
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "成功還原 %(path)s 到根目錄。"
 
-#: seahub/views/__init__.py:1568 seahub/views/__init__.py:1594
+#: seahub/views/__init__.py:1648 seahub/views/__init__.py:1674
 #, python-format
 msgid "Successfully revert %(path)s"
 msgstr "成功還原 %(path)s"
 
-#: seahub/views/__init__.py:1590
+#: seahub/views/__init__.py:1670
 #, python-format
 msgid "Successfully revert %(path)s to root directory."
 msgstr "成功還原 %(path)s 到根目錄。"
 
-#: seahub/views/__init__.py:1888 seahub/views/file.py:748
+#: seahub/views/__init__.py:1970 seahub/views/file.py:799
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: seahub/views/__init__.py:1891
+#: seahub/views/__init__.py:1973
 #, python-format
 msgid "Unable to download directory \"%s\": size is too large."
 msgstr "無法下載 \"%s\"：目錄大小超過限制。"
 
-#: seahub/views/__init__.py:1905
+#: seahub/views/__init__.py:1987
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "無法下載 \"%s\""
 
-#: seahub/views/__init__.py:2067
+#: seahub/views/__init__.py:2148
 msgid "Successfully enable \"Personal Wiki\"."
 msgstr "\"個人維基\"模組新增成功。"
 
-#: seahub/views/__init__.py:2072
+#: seahub/views/__init__.py:2153
 msgid "Successfully disable \"Personal Wiki\"."
 msgstr "\"個人維基\"模組刪除成功。"
 
-#: seahub/views/ajax.py:69
+#: seahub/views/ajax.py:72
 msgid "You don't have permission to access the library."
 msgstr "你沒有權限訪問該資料庫。"
 
-#: seahub/views/ajax.py:77
+#: seahub/views/ajax.py:80
 msgid "No path."
 msgstr "路徑不存在"
 
-#: seahub/views/ajax.py:150
+#: seahub/views/ajax.py:160
 msgid "The group doesn't exist"
 msgstr "該群組不存在"
 
-#: seahub/views/ajax.py:156 seahub/views/ajax.py:377 seahub/views/ajax.py:463
-#: seahub/views/ajax.py:607 seahub/views/ajax.py:631 seahub/views/ajax.py:767
-#: seahub/views/ajax.py:792 seahub/views/file.py:755
+#: seahub/views/ajax.py:166 seahub/views/ajax.py:399 seahub/views/ajax.py:485
+#: seahub/views/ajax.py:629 seahub/views/ajax.py:653 seahub/views/ajax.py:820
+#: seahub/views/ajax.py:845 seahub/views/file.py:806
 msgid "Permission denied"
 msgstr "沒有權限"
 
-#: seahub/views/ajax.py:223 seahub/views/ajax.py:303 seahub/views/ajax.py:521
-#: seahub/views/ajax.py:563 seahub/views/ajax.py:930 seahub/views/ajax.py:1130
-#: seahub/views/ajax.py:1148
+#: seahub/views/ajax.py:238 seahub/views/ajax.py:325 seahub/views/ajax.py:543
+#: seahub/views/ajax.py:585 seahub/views/ajax.py:1093
+#: seahub/views/ajax.py:1302 seahub/views/ajax.py:1320
 msgid "Permission denied."
 msgstr "沒有權限"
 
-#: seahub/views/ajax.py:238 seahub/views/ajax.py:318 seahub/views/ajax.py:943
+#: seahub/views/ajax.py:253 seahub/views/ajax.py:340 seahub/views/ajax.py:1106
 msgid "Library is encrypted."
 msgstr "該資料庫已加密"
 
-#: seahub/views/ajax.py:244 seahub/views/ajax.py:324 seahub/views/ajax.py:949
+#: seahub/views/ajax.py:259 seahub/views/ajax.py:346 seahub/views/ajax.py:1112
 msgid "Error: no head commit id"
 msgstr "錯誤：沒有 head commit id。"
 
-#: seahub/views/ajax.py:529 seahub/views/ajax.py:571
+#: seahub/views/ajax.py:551 seahub/views/ajax.py:593
 msgid "Argument missing."
 msgstr "參數缺失"
 
-#: seahub/views/ajax.py:625
+#: seahub/views/ajax.py:647
 msgid "Destination path is too long."
 msgstr "目標路徑過長"
 
-#: seahub/views/ajax.py:654 seahub/views/ajax.py:706
+#: seahub/views/ajax.py:686 seahub/views/ajax.py:753
 #, python-format
 msgid "Successfully moved %(name)s view"
 msgstr "移動 %(name)s 成功：查看"
 
-#: seahub/views/ajax.py:676 seahub/views/ajax.py:735
+#: seahub/views/ajax.py:715 seahub/views/ajax.py:790
 #, python-format
 msgid "Successfully copied %(name)s view"
 msgstr "複製 %(name)s 成功：查看"
 
-#: seahub/views/ajax.py:694 seahub/views/ajax.py:813
+#: seahub/views/ajax.py:732 seahub/views/ajax.py:866
 #, python-format
 msgid "Can not move directory %(src)s to its subdirectory %(des)s"
 msgstr "不能把目錄 %(src)s 移動到它的子目錄 %(des)s 中"
 
-#: seahub/views/ajax.py:724 seahub/views/ajax.py:843
+#: seahub/views/ajax.py:769 seahub/views/ajax.py:905
 #, python-format
 msgid "Can not copy directory %(src)s to its subdirectory %(des)s"
 msgstr "不能把目錄 %(src)s 複製到它的子目錄 %(des)s 中"
 
-#: seahub/views/ajax.py:786
+#: seahub/views/ajax.py:839
 #, python-format
 msgid "Destination path is too long for %s."
 msgstr "目標路徑對 %s 來說過長。"
 
-#: seahub/views/ajax.py:1020
+#: seahub/views/ajax.py:1188
 msgid "Failed to get file block list"
 msgstr "獲取文件塊列表失敗"
 
-#: seahub/views/ajax.py:1058 seahub/views/ajax.py:1063
+#: seahub/views/ajax.py:1226 seahub/views/ajax.py:1231
 msgid "Wrong repo id"
 msgstr "錯誤的repo id"
 
-#: seahub/views/file.py:111
+#: seahub/views/ajax.py:1274
+msgid "System library can not be deleted."
+msgstr ""
+
+#: seahub/views/file.py:117
 msgid "HTTPError: failed to open file online"
 msgstr "HTTPError: 無法在線打開該文件"
 
-#: seahub/views/file.py:115
+#: seahub/views/file.py:121
 msgid "URLError: failed to open file online"
 msgstr "URLError: 無法在線打開該文件"
 
-#: seahub/views/file.py:122
+#: seahub/views/file.py:128
 msgid "The encoding you chose is not proper."
 msgstr "文件編碼不合適"
 
-#: seahub/views/file.py:139 seahub/views/file.py:142
+#: seahub/views/file.py:145 seahub/views/file.py:148
 msgid "Unknown file encoding"
 msgstr "文件編碼無法識別"
 
-#: seahub/views/file.py:263 seahub/views/file.py:270 seahub/views/file.py:491
-#: seahub/views/file.py:496
+#: seahub/views/file.py:272 seahub/views/file.py:279 seahub/views/file.py:509
+#: seahub/views/file.py:514
 #, python-format
 msgid "File size surpasses %s, can not be opened online."
 msgstr "文件大小超過 %s，無法在線查看。"
 
-#: seahub/views/file.py:309 seahub/views/file.py:529 seahub/views/file.py:544
-#: seahub/views/file.py:566
+#: seahub/views/file.py:318 seahub/views/file.py:552 seahub/views/file.py:567
+#: seahub/views/file.py:589
 msgid "Unable to view file"
 msgstr "無法查看該文件"
 
-#: seahub/views/file.py:339
+#: seahub/views/file.py:350 seahub/views/file.py:527 seahub/views/file.py:646
 msgid "Invalid file format."
 msgstr "錯誤的文件格式。"
 
-#: seahub/views/file.py:759
+#: seahub/views/file.py:810
 msgid "The library does not exist."
 msgstr "資料庫不存在"
 
-#: seahub/views/file.py:763
+#: seahub/views/file.py:814
 msgid "The library is encrypted."
 msgstr "該資料庫已加密"
 
-#: seahub/views/file.py:831
+#: seahub/views/file.py:882
 msgid "Unable to edit file"
 msgstr "無法編輯該文件"
 
-#: seahub/views/file.py:843
+#: seahub/views/file.py:894
 msgid "The file does not exist."
 msgstr "該文件不存在"
 
-#: seahub/views/file.py:871
+#: seahub/views/file.py:922
 msgid "Edit online is not offered for this type of file."
 msgstr "該類型文件不能在線編輯。"
 
-#: seahub/views/sysadmin.py:314
+#: seahub/views/sysadmin.py:313
 msgid "Failed to set quota: internal error"
 msgstr "內部錯誤，設置失敗"
 
-#: seahub/views/sysadmin.py:330
+#: seahub/views/sysadmin.py:329
 #, python-format
 msgid "Successfully deleted %s"
 msgstr "%s 刪除成功。"
 
-#: seahub/views/sysadmin.py:332
+#: seahub/views/sysadmin.py:331
 msgid "Failed to delete: the user does not exist"
 msgstr "刪除失敗：該用戶不存在"
 
-#: seahub/views/sysadmin.py:347
+#: seahub/views/sysadmin.py:346 seahub/views/sysadmin.py:734
 #, python-format
 msgid "Successfully set %s as admin"
 msgstr "成功設置 %s 為管理員"
 
-#: seahub/views/sysadmin.py:349
+#: seahub/views/sysadmin.py:348
 msgid "Failed to set admin: the user does not exist"
 msgstr "設置管理員失敗：該用戶不存在"
 
-#: seahub/views/sysadmin.py:364
+#: seahub/views/sysadmin.py:363
 #, python-format
 msgid "Successfully revoke the admin permission of %s"
 msgstr "成功取消 %s 的管理權限"
 
-#: seahub/views/sysadmin.py:366
+#: seahub/views/sysadmin.py:365
 msgid "Failed to revoke admin: the user does not exist"
 msgstr "取消管理員權限失敗：該用戶不存在"
 
-#: seahub/views/sysadmin.py:380
+#: seahub/views/sysadmin.py:379
 #, python-format
 msgid "Successfully activated \"%s\"."
 msgstr "成功啓動 %s。"
 
-#: seahub/views/sysadmin.py:382
+#: seahub/views/sysadmin.py:381
 msgid "Failed to activate: user does not exist."
 msgstr "啓動失敗：該用戶不存在。"
 
-#: seahub/views/sysadmin.py:397
+#: seahub/views/sysadmin.py:396
 #, python-format
 msgid "Successfully deactivated \"%s\"."
 msgstr "成功取消啓動 %s。"
 
-#: seahub/views/sysadmin.py:399
+#: seahub/views/sysadmin.py:398
 msgid "Failed to deactivate: user does not exist."
 msgstr "取消啓動失敗：該用戶不存在。"
 
-#: seahub/views/sysadmin.py:488
+#: seahub/views/sysadmin.py:412
+#, python-format
+msgid "Your account on %s is activated"
+msgstr ""
+
+#: seahub/views/sysadmin.py:456
+#, python-format
+msgid "Password has been reset on %s"
+msgstr ""
+
+#: seahub/views/sysadmin.py:476
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, an email has been sent to "
 "%(user)s."
 msgstr "成功將重置密碼為 %(passwd)s, 一封通知郵件已經發送給 %(user)s。"
 
-#: seahub/views/sysadmin.py:493
+#: seahub/views/sysadmin.py:481
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr "成功將用戶密碼重置為 %(passwd)s, 但發送通知郵件到 %(user)s 失敗，請檢查你的郵件配置。"
 
-#: seahub/views/sysadmin.py:497
+#: seahub/views/sysadmin.py:485
 #, python-format
 msgid "Successfully reset password to %(passwd)s for user %(user)s."
 msgstr "成功將用戶 %(user)s 的密碼重置為 %(passwd)s。"
 
-#: seahub/views/sysadmin.py:500
+#: seahub/views/sysadmin.py:488
 #, python-format
 msgid ""
 "Successfully reset password to %(passwd)s for user %(user)s. But email "
@@ -5612,47 +6039,53 @@ msgid ""
 "configured."
 msgstr "成功將用戶 %(user)s 的密碼重置為 %(passwd)s, 但是由於電子信箱服務未正確配置，通知郵件無法發送。"
 
-#: seahub/views/sysadmin.py:503
+#: seahub/views/sysadmin.py:491
 msgid "Failed to reset password: user does not exist"
 msgstr "密碼重置失敗：用戶不存在"
 
-#: seahub/views/sysadmin.py:524
-msgid "Seafile Registration Information"
-msgstr "Seafile註冊資訊"
+#: seahub/views/sysadmin.py:507
+#, python-format
+msgid "You are invited to join %s"
+msgstr ""
 
-#: seahub/views/sysadmin.py:563
+#: seahub/views/sysadmin.py:546
 #, python-format
 msgid "Successfully added user %s. An email notification has been sent."
 msgstr "成功新增用戶 %s。一封通知郵件已發送。"
 
-#: seahub/views/sysadmin.py:566
+#: seahub/views/sysadmin.py:549
 #, python-format
 msgid ""
 "Successfully added user %s. An error accurs when sending email notification,"
 " please check your email configuration."
 msgstr "成功新增用戶 %s。但發送通知郵件出錯，請檢查電子信箱配置。"
 
-#: seahub/views/sysadmin.py:568
+#: seahub/views/sysadmin.py:551
 #, python-format
 msgid "Successfully added user %s."
 msgstr "成功添加用戶 %s。"
 
-#: seahub/views/sysadmin.py:570
+#: seahub/views/sysadmin.py:553
 #, python-format
 msgid ""
 "Successfully added user %s. But email notification can not be sent, because "
 "Email service is not properly configured."
 msgstr "成功新增用戶 %s。 但由於郵件服務未正確配置，通知郵件無法發送。"
 
-#: seahub/views/sysadmin.py:681
+#: seahub/views/sysadmin.py:664
 msgid "Successfully transfered."
 msgstr "成功轉讓。"
 
-#: seahub/views/sysadmin.py:683
+#: seahub/views/sysadmin.py:666
 #, python-format
 msgid "Failed to transfer, user %s not found"
 msgstr "轉讓失敗，未找到用戶 \"%s\""
 
-#: seahub/views/sysadmin.py:685
+#: seahub/views/sysadmin.py:668
 msgid "Failed to transfer, invalid arguments."
 msgstr "轉讓失敗， 參數無效"
+
+#: seahub/views/sysadmin.py:736
+#, python-format
+msgid "Failed set %s as admin"
+msgstr ""
diff --git a/seahub/settings.py b/seahub/settings.py
index dee5319776..5ef75cfd9b 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -149,6 +149,7 @@ LANGUAGES = (
     ('ru', gettext_noop(u'Русский')),
     ('sk', gettext_noop('Slovak')),
     ('sv', gettext_noop('Svenska')),
+    ('th', gettext_noop('Thai')),
     ('uk', gettext_noop('українська мова')),
     ('zh-cn', gettext_noop(u'简体中文')),
     ('zh-tw', gettext_noop(u'繁體中文')),