diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 0c96afc312..f77bc043aa 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-09 15:17+0800\n"
+"POT-Creation-Date: 2013-01-09 18:59+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,282 +152,308 @@ msgstr ""
 msgid "Русский"
 msgstr ""
 
-#: views.py:526
+#: views.py:531
 msgid "Unable to view recycle page"
 msgstr "无法查看文件回收站"
 
-#: views.py:547
+#: views.py:552
 msgid "Settings saved."
 msgstr "设置已保存。"
 
-#: views.py:550
+#: views.py:555
 msgid "Failed to save settings on server"
 msgstr "设置失败"
 
-#: views.py:557
+#: views.py:562
 msgid "Internal Server Error"
 msgstr "服务器内部错误"
 
-#: views.py:559
+#: views.py:564
 msgid "Filename contains invalid character"
 msgstr "上传的文件名包含非法字符"
 
-#: views.py:561
+#: views.py:566
 msgid "Duplicated filename"
 msgstr "已存在同名的文件"
 
-#: views.py:563 views.py:1294 views.py:2504 views.py:2619
+#: views.py:568 views.py:1299 views.py:2533 views.py:2661
 msgid "File not exists"
 msgstr "文件不存在"
 
-#: views.py:565
+#: views.py:570
 msgid "File size surpasses the limit"
 msgstr "文件大小超过限制"
 
-#: views.py:567
+#: views.py:572
 msgid "The space of owner is used up, upload failed"
 msgstr "该资料库所有者的空间已用完，无法上传"
 
-#: views.py:569
+#: views.py:574
 msgid "An error occurs during file transfer"
 msgstr "文件传输出错"
 
-#: views.py:580 views.py:601
+#: views.py:585 views.py:606
 msgid "Invalid url"
 msgstr "非法链接"
 
-#: views.py:665
+#: views.py:670
 msgid "Unable to view library modification"
 msgstr "无法浏览该资料库修改历史"
 
-#: views.py:711
+#: views.py:716
 msgid "Unable to view library snapshots"
 msgstr "无法查看该资料库镜像"
 
-#: views.py:761
+#: views.py:766
 msgid "You have no permission to restore library"
 msgstr "你没有权限进行还原操作"
 
-#: views.py:777
+#: views.py:782
 msgid "Please specify history ID"
 msgstr "请指定历史记录ID"
 
-#: views.py:783 views.py:1551 views.py:2379 views.py:2414 views.py:2824
+#: views.py:788 views.py:1569 views.py:2408 views.py:2443 views.py:2879
 msgid "Invalid arguments"
 msgstr "非法参数"
 
-#: views.py:785 views.py:880 views.py:2333 views.py:2839
+#: views.py:790 views.py:885 views.py:2362 views.py:2894
 msgid "Library not exists"
 msgstr "资料库不存在"
 
-#: views.py:787
+#: views.py:792
 msgid "History you specified is not exists"
 msgstr "指定的历史记录不存在"
 
-#: views.py:789
+#: views.py:794
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: views.py:900 views.py:916
+#: views.py:905 views.py:921
 msgid ""
 "Failed to remove library. Only staff or owner can perform this operation."
 msgstr "删除资料库失败, 只有团体管理员或资料库创建者有权删除资料库。"
 
-#: views.py:1190
+#: views.py:1195
 msgid "Failed to create repo"
 msgstr "创建失败"
 
-#: views.py:1208
+#: views.py:1213
 msgid "Operation successful"
 msgstr "操作成功"
 
-#: views.py:1210
+#: views.py:1215
 msgid "Operation failed"
 msgstr "操作失败"
 
-#: views.py:1241
+#: views.py:1246
 msgid "Failed to delete file."
 msgstr "删除文件出错。"
 
-#: views.py:1248
+#: views.py:1253
 #, python-format
 msgid "%s successfully deleted."
 msgstr "%s 删除成功。"
 
-#: views.py:1250
+#: views.py:1255
 #, python-format
 msgid "Internal error. Failed to delete %s."
 msgstr "内部错误。删除 %s 失败。"
 
-#: views.py:1310 views.py:1619
+#: views.py:1315 views.py:1637
 msgid "Unable to view file"
 msgstr "无法查看该文件"
 
-#: views.py:1502
+#: views.py:1520
 msgid "File size surpasses 10M, can not be previewed online."
 msgstr "文件超过10M，无法在线查看。"
 
-#: views.py:1507
+#: views.py:1525
 msgid "HTTPError: failed to open file online"
 msgstr "HTTPError: 无法在线打开该文件"
 
-#: views.py:1510
+#: views.py:1528
 msgid "URLError: failed to open file online"
 msgstr "URLError: 无法在线打开该文件"
 
-#: views.py:1522
+#: views.py:1540
 msgid "Unknown file encoding"
 msgstr "文件编码无法识别"
 
-#: views.py:1531
+#: views.py:1549
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: views.py:1537 views.py:2175 views.py:2206 views.py:2240
+#: views.py:1555 views.py:2204 views.py:2235 views.py:2269
 msgid "Permission denied"
 msgstr "共享权限"
 
-#: views.py:1541
+#: views.py:1559
 msgid "The library does not exist."
 msgstr "资料库不存在"
 
-#: views.py:1545
+#: views.py:1563
 msgid "The library is encrypted."
 msgstr "该资料库已加密"
 
-#: views.py:1598
+#: views.py:1616
 msgid "Unable to edit file"
 msgstr "无法编辑该文件"
 
-#: views.py:1613
+#: views.py:1631
 msgid "The file does not exist."
 msgstr "该文件不存在"
 
-#: views.py:1639
+#: views.py:1657
 msgid "Edit online is not offered for this type of file."
 msgstr "该类型文件不能在线编辑。"
 
-#: views.py:1693
+#: views.py:1711
 msgid "Unable to access file"
 msgstr "无法访问文件"
 
-#: views.py:1709
+#: views.py:1727
 msgid "Failed to download library, unable to find server"
 msgstr "下载失败：找不到服务器"
 
-#: views.py:1720
+#: views.py:1738
 msgid "Invalid server setting"
 msgstr "服务器设置错误"
 
-#: views.py:1761
+#: views.py:1779
 msgid "Destination path is too long."
 msgstr "目标路径过长"
 
-#: views.py:1767
+#: views.py:1785
 msgid "You can not modify that library."
 msgstr "你无法修改该资料库。"
 
-#: views.py:1780
+#: views.py:1798
 #, python-format
 msgid "Can not %(op)s directory %(src)s to its subdirectory %(des)s"
 msgstr "不能把目录 %(src)s %(op)s到它的子目录 %(des)s中"
 
-#: views.py:1781
+#: views.py:1799
 msgid "copy"
 msgstr "复制"
 
-#: views.py:1781
+#: views.py:1799
 msgid "move"
 msgstr "移动"
 
-#: views.py:1796
+#: views.py:1814
 #, python-format
 msgid "Successfully copying %(name)s：<a href=\"%(url)s\">view</a>"
 msgstr "复制 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
 
-#: views.py:1802
+#: views.py:1820
 #, python-format
 msgid "Successfully moving %(name)s <a href=\"%(url)s\">view</a>"
 msgstr "移动 %(name)s 成功：<a href=\"%(url)s\">查看</a>"
 
-#: views.py:1917
+#: views.py:1935
 msgid "Failed to set quota: internal error"
 msgstr "内部错误，设置失败"
 
-#: views.py:1991 templates/sys_useradmin.html:78
+#: views.py:2008 templates/sys_useradmin.html:78
 #: templates/registration/password_reset_confirm.html:4
 #: templates/registration/password_reset_form.html:4
 #: templates/registration/password_reset_form.html:7
 msgid "Password Reset"
 msgstr "密码重置"
 
-#: views.py:1993
+#: views.py:2024
 #, python-format
 msgid ""
-"Successfully resetting password to %(passwd)s, an email has been sent to "
+"Successfully resetted password to %(passwd)s, an email has been sent to "
 "%(user)s."
-msgstr "成功将重置密码为 %(passwd)s, 一封通知邮件已经发送给 %(user)s"
+msgstr "成功将重置密码为 %(passwd)s, 一封通知邮件已经发送给 %(user)s。"
 
-#: views.py:1997
+#: views.py:2029
 #, python-format
 msgid ""
-"Successfully resetting password to %(passwd)s, but failed to send email to "
+"Successfully resetted password to %(passwd)s, but failed to send email to "
 "%(user)s, please check your email configuration."
 msgstr ""
-"成功将重置密码为 %(passwd)s, 发送通知邮件到 %(user)s 失败，请检查你的邮件配"
-"置。"
+"成功将用户密码重置为 %(passwd)s, 但发送通知邮件到 %(user)s 失败，请检查你的邮件"
+"配置。"
 
-#: views.py:2013
+#: views.py:2033
 #, python-format
-msgid "Successfully resetting password to %s"
-msgstr "成功将密码重置为 %s"
+msgid "Successfully resetted password to %(passwd)s for user %(user)s."
+msgstr "成功将用户 %(user)s 的密码重置为 %(passwd)s。"
 
-#: views.py:2015
+#: views.py:2036
+#, python-format
+msgid ""
+"Successfully resetted 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, 但是由于邮箱服务未正确配"
+"置，通知邮件无法发送。"
+
+#: views.py:2039
 msgid "Failed to reset password: user does not exist"
 msgstr "密码重置失败：用户不存在"
 
-#: views.py:2037
+#: views.py:2060
 msgid "Seafile Registration Information"
 msgstr "Seafile注册信息"
 
-#: views.py:2039
-msgid "Successfully sending mail"
-msgstr "邮件发送成功"
+#: views.py:2095
+#, python-format
+msgid "Successfully added user %s. An email notification has been sent."
+msgstr "成功添加用户 %s。一封通知邮件已发送。"
 
-#: views.py:2041
-msgid "Failed to send mail"
-msgstr "邮件发送失败"
+#: views.py:2098
+#, python-format
+msgid ""
+"Successfully added user %s. An error accurs when sending email notification, "
+"please check your email configuration."
+msgstr "成功添加用户 %s。但发送通知邮件出错，请检查邮箱配置。"
 
-#: views.py:2252
+#: views.py:2100
+#, python-format
+msgid "Successfully added user %s."
+msgstr "成功添加用户 %s。"
+
+#: views.py:2102
+#, python-format
+msgid ""
+"Successfully added user %s. But email notification can not be sent, because "
+"Email service is not properly configured."
+msgstr "成功添加用户 %s。 但由于邮件服务未正确配置，通知邮件无法发送。"
+
+#: views.py:2281
 #, python-format
 msgid "Successfully renamed %(old)s to %(new)s"
 msgstr "%(old)s 已重命名为 %(new)s"
 
-#: views.py:2307
+#: views.py:2336
 msgid "Failed to create library"
 msgstr "创建资料库失败"
 
-#: views.py:2400
+#: views.py:2429
 #, python-format
 msgid ""
 "Successfully revert %(path)s to <a href=\"%(root)s\">root directory.</a>"
 msgstr "成功还原 %(path)s 到<a href=\"%(root)s\">根目录。</a>"
 
-#: views.py:2404 views.py:2430
+#: views.py:2433 views.py:2459
 #, python-format
 msgid "Successfully revert <a href=\"%(url)s\">%(path)s</a>"
 msgstr "成功还原 <a href=\"%(url)s\">%(path)s</a>"
 
-#: views.py:2426
+#: views.py:2455
 #, python-format
 msgid "Successfully revert %(path)s to <a href=\"%(url)s\">root directory.</a>"
 msgstr "成功还原 %(path)s 到<a href=\"%(url)s\">根目录。</a>"
 
-#: views.py:2664
+#: views.py:2719
 msgid "Internal error"
 msgstr "内部错误"
 
-#: views.py:2871
+#: views.py:2926
 #, python-format
 msgid "Unable to download \"%s\""
 msgstr "无法下载 \"%s\""
@@ -625,7 +651,7 @@ msgstr "编辑"
 
 #: templates/file_edit.html:79 templates/repo.html:87
 #: templates/repo_history_view.html:38 templates/repo_recycle_view.html:16
-#: templates/shared_file_view.html:18 templates/view_shared_dir.html:19
+#: templates/shared_file_view.html:18 templates/view_shared_dir.html:16
 msgid "Current path: "
 msgstr "当前路径："
 
@@ -708,7 +734,7 @@ msgstr "最后修改者"
 
 #: templates/file_revisions.html:25 templates/repo.html:112
 #: templates/repo_history_view.html:53 templates/repo_recycle_view.html:55
-#: templates/view_shared_dir.html:39
+#: templates/view_shared_dir.html:33
 msgid "Size"
 msgstr "大小"
 
@@ -717,7 +743,7 @@ msgstr "大小"
 #: templates/repo_view_snapshot.html:18 templates/sys_group_admin.html:14
 #: templates/sys_org_admin.html:15 templates/sys_seafadmin.html:14
 #: templates/sys_useradmin.html:6 templates/sys_useradmin.html.py:18
-#: templates/userinfo.html:40 templates/view_shared_dir.html:40
+#: templates/userinfo.html:40 templates/view_shared_dir.html:34
 #: templates/snippets/my_owned_repos.html:21
 #: templates/snippets/my_owned_repos.html:60
 msgid "Operations"
@@ -741,8 +767,8 @@ msgstr "还原"
 #: templates/file_revisions.html:52 templates/file_view.html:84
 #: templates/history_file_view.html:66 templates/public_home.html:48
 #: templates/repo.html:28 templates/repo.html.py:137 templates/repo.html:180
-#: templates/shared_file_view.html:35 templates/view_shared_dir.html:55
-#: templates/view_shared_dir.html.py:74
+#: templates/shared_file_view.html:35 templates/view_shared_dir.html:48
+#: templates/view_shared_dir.html.py:66
 #: templates/snippets/my_owned_repos.html:34
 #: templates/snippets/my_owned_repos.html:81
 msgid "Download"
@@ -1056,7 +1082,7 @@ msgstr "新建资料库"
 #: templates/repo_history_view.html:52 templates/repo_recycle_view.html:53
 #: templates/sys_group_admin.html:11 templates/sys_org_admin.html:11
 #: templates/sys_seafadmin.html:11 templates/userinfo.html:38
-#: templates/userinfo.html.py:63 templates/view_shared_dir.html:38
+#: templates/userinfo.html.py:63 templates/view_shared_dir.html:32
 #: templates/snippets/my_owned_repos.html:18
 #: templates/snippets/my_owned_repos.html:56
 #: templates/snippets/repo_create_form.html:4
@@ -1141,7 +1167,7 @@ msgstr "系统自动生成"
 msgid "You can't access this library."
 msgstr "无法在线查看该资料库。"
 
-#: templates/repo.html:98 templates/view_shared_dir.html:29
+#: templates/repo.html:98 templates/view_shared_dir.html:26
 msgid "ZIP"
 msgstr ""
 
@@ -1157,7 +1183,7 @@ msgstr "新建目录"
 msgid "New File"
 msgstr "新建文件"
 
-#: templates/repo.html:120 templates/view_shared_dir.html:46
+#: templates/repo.html:120 templates/view_shared_dir.html:39
 msgid "Directory icon"
 msgstr "目录图标"
 
@@ -1191,7 +1217,7 @@ msgstr "未加星标"
 
 #: templates/repo.html:164 templates/repo.html.py:567 templates/repo.html:591
 #: templates/repo_history_view.html:66 templates/repo_recycle_view.html:78
-#: templates/view_shared_dir.html:65
+#: templates/view_shared_dir.html:57
 msgid "File"
 msgstr "文件"
 
@@ -1446,7 +1472,7 @@ msgstr "你的 Seafile 客户端版本太旧，请升级到最新版本。"
 msgid "Click to download."
 msgstr "点此下载"
 
-#: templates/shared_file_view.html:28 templates/view_shared_dir.html:12
+#: templates/shared_file_view.html:28 templates/view_shared_dir.html:9
 msgid "Shared by: "
 msgstr "共享来源："
 
@@ -2055,6 +2081,15 @@ msgstr "名字(可选)"
 msgid "Note(optional)"
 msgstr "备注(可选)"
 
+#~ msgid "Successfully resetting password to %s"
+#~ msgstr "成功将密码重置为 %s"
+
+#~ msgid "Successfully sending mail"
+#~ msgstr "邮件发送成功"
+
+#~ msgid "Failed to send mail"
+#~ msgstr "邮件发送失败"
+
 #~ msgid "more"
 #~ msgstr "详细"
 
@@ -2070,9 +2105,6 @@ msgstr "备注(可选)"
 #~ msgid "Directory name can not be empty"
 #~ msgstr "目录名不能为空"
 
-#~ msgid "Successfully shared."
-#~ msgstr "共享成功。"
-
 #~ msgid "Successfully sent."
 #~ msgstr "邮件发送成功"
 
diff --git a/settings.py b/settings.py
index d6c432f056..33a252ae8d 100644
--- a/settings.py
+++ b/settings.py
@@ -255,7 +255,7 @@ LOGGING = {
 # Email sending #
 #################
 
-SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER = True # Whether to send email when a system staff adding new member.
+SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER = False # Whether to send email when a system staff adding new member.
 SEND_EMAIL_ON_RESETTING_USER_PASSWD = True # Whether to send email when a system staff resetting user's password.
 
 #####################
diff --git a/share/locale/zh_CN/LC_MESSAGES/django.po b/share/locale/zh_CN/LC_MESSAGES/django.po
index 0bb86c5e17..a985020b87 100644
--- a/share/locale/zh_CN/LC_MESSAGES/django.po
+++ b/share/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-05 10:30+0800\n"
+"POT-Creation-Date: 2013-01-09 19:06+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -93,56 +93,70 @@ msgstr "可读写"
 msgid "Read-Only"
 msgstr "只可浏览"
 
-#: views.py:305
+#: views.py:308
 #, python-format
 msgid ""
 "Failed to share to %s, as encrypted libraries cannot be shared to emails "
 "outside the site."
 msgstr "共享给 %s 失败， 加密的资料库不能共享给站外邮箱。"
 
-#: views.py:320 views.py:342
+#: views.py:323 views.py:345
 #, python-format
 msgid "Failed to share to %s."
 msgstr "共享给 %s 失败。"
 
-#: views.py:338
+#: views.py:341
 msgid "You are shared with a library in Seafile"
 msgstr "有人在Seafile上共享了一个资料库给你"
 
-#: views.py:345
+#: views.py:348
 #, python-format
 msgid ""
 "Shared to %(email)s successfully, go check it at <a href=\"%(share)s"
 "\">Share</a>."
 msgstr "共享给 %(email)s 成功，请前往 <a href=\"%(share)s\">共享</a> 查看。"
 
-#: views.py:370
+#: views.py:373
 msgid "Deleted successfully."
 msgstr "删除成功"
 
-#: views.py:388
+#: views.py:391
 msgid "Invalid arguments"
 msgstr "参数错误"
 
-#: views.py:397
-msgid "Can not share root dir."
-msgstr "无法共享根目录"
+#: views.py:400
+msgid "You cannot share the repo in this way."
+msgstr ""
 
-#: views.py:422
+#: views.py:425
 msgid "Failed to get the link, please retry later."
 msgstr "获取分享链接失败，请稍后重试。"
 
-#: views.py:444 views.py:452
+#: views.py:447
 msgid "Removed successfully"
 msgstr "删除成功"
 
-#: views.py:489
+#: views.py:455
+msgid "Deleted successfully"
+msgstr "删除成功"
+
+#: views.py:471
+msgid ""
+"Sending shared link failed. Email service is not properly configured, please "
+"contact administrator."
+msgstr "由于邮箱服务未正确配置，发送共享链接失败，请联系管理员。"
+
+#: views.py:496
 msgid "Your friend shared a file to you on Seafile"
 msgstr "你的朋友在 Seafile 上共享了一个文件给你"
 
-#: views.py:493
-msgid "Send failed."
-msgstr "发送失败"
+#: views.py:500
+msgid "Internal server error. Send failed."
+msgstr "服务器内部错误，发送失败。"
+
+#: views.py:503
+msgid "Successfully sent."
+msgstr "发送成功"
 
 #: templates/repo/share_admin.html:15
 msgid "Tips"
@@ -247,6 +261,12 @@ msgstr "权限修改失败"
 msgid "edit failed"
 msgstr "权限修改失败"
 
+#~ msgid "Can not share root dir."
+#~ msgstr "无法共享根目录"
+
+#~ msgid "Send failed."
+#~ msgstr "发送失败"
+
 #~ msgid "Links"
 #~ msgstr "文件外链"
 
diff --git a/share/views.py b/share/views.py
index eb3954256f..bc90d15a3f 100644
--- a/share/views.py
+++ b/share/views.py
@@ -1,5 +1,6 @@
 # encoding: utf-8
 import os
+import logging
 import simplejson as json
 from django.core.mail import send_mail
 from django.core.urlresolvers import reverse
@@ -34,6 +35,9 @@ except ImportError:
     CLOUD_MODE = False
 from seahub.settings import SITE_ROOT
 
+# Get an instance of a logger
+logger = logging.getLogger(__name__)
+
 @login_required
 def share_repo(request):
     """
@@ -496,7 +500,8 @@ def send_shared_link(request):
                 send_mail(_(u'Your friend shared a file to you on Seafile'),
                           t.render(Context(c)), None, [to_email],
                           fail_silently=False)
-            except:
+            except Exception, e:
+                logger.error(str(e))
                 data = json.dumps({'error':_(u'Internal server error. Send failed.')})
                 return HttpResponse(data, status=500, content_type=content_type)
 
diff --git a/views.py b/views.py
index 86e6b18d02..2b10815701 100644
--- a/views.py
+++ b/views.py
@@ -2092,14 +2092,14 @@ def user_add(request):
                     if SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER:
                         try:
                             send_user_add_mail(request, email, password)
-                            messages.success(request, _(u'Successfully added user %s. An email notification has been sent.' % email))
+                            messages.success(request, _(u'Successfully added user %s. An email notification has been sent.') % email)
                         except Exception, e:
                             logger.error(str(e))
-                            messages.success(request, _(u'Successfully added user %s. An error accurs when sending email notification, please check your email configuration.' % email))
+                            messages.success(request, _(u'Successfully added user %s. An error accurs when sending email notification, please check your email configuration.') % email)
                     else:
-                        messages.success(request, _(u'Successfully added user %s.' % email))
+                        messages.success(request, _(u'Successfully added user %s.') % email)
                 else:
-                    messages.success(request, _(u'Successfully added user %s. But email notification can not be sent, because Email service is not properly configured.' % email))
+                    messages.success(request, _(u'Successfully added user %s. But email notification can not be sent, because Email service is not properly configured.') % email)
 
                 return HttpResponseRedirect(reverse('sys_useradmin', args=[]))
     else: