diff --git a/src/msgs/zh.po b/src/msgs/zh.po
index 819382844..585146d78 100644
--- a/src/msgs/zh.po
+++ b/src/msgs/zh.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.0-alpha\n"
-"Last-Translator: Shelley Shyan - skylarkbj AT 163 DOT com\n"
+"Last-Translator: Shelley Shyan - shelleyshyan AT gmail DOT com\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -11,7 +11,7 @@ msgstr ""
 
 #: ejabberd_c2s.erl:364 ejabberd_c2s.erl:668
 msgid "Use of STARTTLS required"
-msgstr "要求使用STARTTLS"
+msgstr "要求使用 STARTTLS"
 
 #: ejabberd_c2s.erl:448
 msgid "No resource provided"
@@ -22,17 +22,16 @@ msgid "Replaced by new connection"
 msgstr "被新的连接替换"
 
 #: ejabberd_captcha.erl:93 ejabberd_captcha.erl:125
-#, fuzzy
 msgid "Enter the text you see"
-msgstr "请输入文本文件的路径"
+msgstr "请输入您所看到的文本"
 
 #: ejabberd_captcha.erl:97
 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s"
-msgstr ""
+msgstr "您发送给 ~s 的消息已被阻止. 要解除阻止, 请访问 ~s"
 
 #: ejabberd_captcha.erl:235
 msgid "The captcha is valid."
-msgstr ""
+msgstr "验证码有效."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -68,19 +67,19 @@ msgstr "通知"
 
 #: mod_announce.erl:635
 msgid "Send announcement to all users"
-msgstr "将通知发送给所有用户"
+msgstr "发送通知给所有用户"
 
 #: mod_announce.erl:637
 msgid "Send announcement to all users on all hosts"
-msgstr "给所有主机上的所有用户发送通知"
+msgstr "发送通知给所有主机上的所有用户"
 
 #: mod_announce.erl:639
 msgid "Send announcement to all online users"
-msgstr "将通知发送给所有在线用户"
+msgstr "发送通知给所有在线用户"
 
 #: mod_announce.erl:641 mod_configure.erl:1046 mod_configure.erl:1091
 msgid "Send announcement to all online users on all hosts"
-msgstr "将通知发送给所有主机的所有用户"
+msgstr "发送通知给所有主机的在线用户"
 
 #: mod_announce.erl:643
 msgid "Set message of the day and send to online users"
@@ -214,11 +213,11 @@ msgstr "所有用户"
 
 #: mod_configure.erl:470
 msgid "Outgoing s2s Connections"
-msgstr "出站s2s连接"
+msgstr "出站 s2s 连接"
 
 #: mod_configure.erl:471 web/ejabberd_web_admin.erl:1833
 msgid "Running Nodes"
-msgstr "正在运行的节点"
+msgstr "运行中的节点"
 
 #: mod_configure.erl:472 web/ejabberd_web_admin.erl:1835
 msgid "Stopped Nodes"
@@ -234,7 +233,7 @@ msgstr "备份管理"
 
 #: mod_configure.erl:547
 msgid "Import Users From jabberd14 Spool Files"
-msgstr "从Jabberd 1.4 Spool文件导入用户"
+msgstr "从 jabberd14 Spool 文件导入用户"
 
 #: mod_configure.erl:667
 msgid "To ~s"
@@ -319,7 +318,7 @@ msgstr "导入用户的文件位于 "
 
 #: mod_configure.erl:997
 msgid "Enter path to jabberd14 spool file"
-msgstr "请输入jabberd14 spool文件的路径"
+msgstr "请输入 jabberd14 spool 文件的路径"
 
 #: mod_configure.erl:1007
 msgid "Import Users from Dir at "
@@ -327,7 +326,7 @@ msgstr "导入用户的目录位于 "
 
 #: mod_configure.erl:1011
 msgid "Enter path to jabberd14 spool dir"
-msgstr "请输入jabberd14 spool目录的路径"
+msgstr "请输入 jabberd14 spool 目录的路径"
 
 #: mod_configure.erl:1012
 msgid "Path to Dir"
@@ -397,7 +396,7 @@ msgstr "花名册大小"
 
 #: mod_configure.erl:1693
 msgid "IP addresses"
-msgstr "IP地址"
+msgstr "IP 地址"
 
 #: mod_configure.erl:1694
 msgid "Resources"
@@ -425,7 +424,7 @@ msgstr "访问被服务策略拒绝"
 
 #: mod_irc/mod_irc.erl:400
 msgid "IRC Transport"
-msgstr "IRC传输"
+msgstr "IRC 传输"
 
 #: mod_irc/mod_irc.erl:427
 msgid "ejabberd IRC module"
@@ -433,102 +432,97 @@ msgstr "ejabberd IRC 模块"
 
 #: mod_irc/mod_irc.erl:557
 msgid "You need an x:data capable client to configure mod_irc settings"
-msgstr "您需要一个兼容x:data的客户端来配置mod_irc设置"
+msgstr "您需要一个兼容 x:data 的客户端来配置 mod_irc 设置"
 
 #: mod_irc/mod_irc.erl:564
 msgid "Registration in mod_irc for "
-msgstr "mod_irc中的注册是为 "
+msgstr "mod_irc 中的注册是为 "
 
 #: mod_irc/mod_irc.erl:569
-#, fuzzy
 msgid ""
 "Enter username, encodings, ports and passwords you wish to use for "
 "connecting to IRC servers"
-msgstr "请输入您想使用的用来连接到IRC服务器的用户名和编码"
+msgstr "请输入您想使用的用来连接到IRC服务器的用户名, 编码, 端口和密码."
 
 #: mod_irc/mod_irc.erl:574
 msgid "IRC Username"
-msgstr "IRC用户名"
+msgstr "IRC 用户名"
 
 #: mod_irc/mod_irc.erl:584
-#, fuzzy
 msgid ""
 "If you want to specify different ports, passwords, encodings for IRC "
 "servers, fill this list with values in format '{\"irc server\", \"encoding"
 "\", port, \"password\"}'.  By default this service use \"~s\" encoding, port "
 "~p, empty password."
 msgstr ""
-"如果您想为IRC服务器指定不同的编码, 请用'{\"irc 服务器\", \"编码\"}'格式的值填"
-"充此表单. 默认情况下此服务使用\"~s\"编码."
+"如果您想为 IRC 服务器指定不同的端口, 密码, 编码, 请用 '{\"irc 服务器\", \"编"
+"码\", 端口, \"密码\"}' 格式的值填充此表单. 默认情况下此服务使用\"~s\"编码, "
+"~p 端口, 密码为空."
 
 #: mod_irc/mod_irc.erl:596
-#, fuzzy
 msgid ""
 "Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef."
 "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."
 msgstr ""
-"例如: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1"
-"\"}]."
+"例如: [{\"irc.lucky.net\", \"koi8-r\"}, 6667, \"secret\"}, {\"vendetta.fef."
+"net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."
 
 #: mod_irc/mod_irc.erl:601
 msgid "Connections parameters"
-msgstr ""
+msgstr "连接参数"
 
 #: mod_irc/mod_irc.erl:711
 msgid "Join IRC channel"
-msgstr ""
+msgstr "加入 IRC 频道"
 
 #: mod_irc/mod_irc.erl:715
 msgid "IRC channel (don't put the first #)"
-msgstr ""
+msgstr "IRC 频道 (不要输入第一个#号)"
 
 #: mod_irc/mod_irc.erl:720
-#, fuzzy
 msgid "IRC server"
-msgstr "IRC用户名"
+msgstr "IRC 服务器"
 
 #: mod_irc/mod_irc.erl:753 mod_irc/mod_irc.erl:757
 msgid "Join the IRC channel here."
-msgstr ""
+msgstr "在这里加入 IRC 频道."
 
 #: mod_irc/mod_irc.erl:761
 msgid "Join the IRC channel in this Jabber ID: ~s"
-msgstr ""
+msgstr "用此 Jabber ID: ~s  加入 IRC 频道"
 
 #: mod_irc/mod_irc.erl:846
 msgid "IRC settings"
-msgstr ""
+msgstr "IRC 设置"
 
 #: mod_irc/mod_irc.erl:851
-#, fuzzy
 msgid ""
 "Enter username and encodings you wish to use for connecting to IRC servers.  "
 "Press 'Next' to get more fields to fill in.  Press 'Complete' to save "
 "settings."
-msgstr "请输入您想使用的用来连接到IRC服务器的用户名和编码"
+msgstr ""
+"请输入您想使用的用来连接到 IRC 服务器的用户名和编码. 按 '下一步' 获取更多待填"
+"字段. 按 '完成' 保存设置."
 
 #: mod_irc/mod_irc.erl:857
-#, fuzzy
 msgid "IRC username"
-msgstr "IRC用户名"
+msgstr "IRC 用户名"
 
-#: mod_irc/mod_irc.erl:904
-#, fuzzy
+#: mod_irc/mod_irc.erl:906
 msgid "Password ~b"
-msgstr "密码"
+msgstr "~b 的密码"
 
-#: mod_irc/mod_irc.erl:909
-#, fuzzy
+#: mod_irc/mod_irc.erl:911
 msgid "Port ~b"
-msgstr "端口"
+msgstr "~b 的端口"
 
-#: mod_irc/mod_irc.erl:914
+#: mod_irc/mod_irc.erl:916
 msgid "Encoding for server ~b"
-msgstr ""
+msgstr "服务器 ~b 的编码"
 
-#: mod_irc/mod_irc.erl:923
+#: mod_irc/mod_irc.erl:925
 msgid "Server ~b"
-msgstr ""
+msgstr "服务器 ~b"
 
 #: mod_muc/mod_muc.erl:437
 msgid "Only service administrators are allowed to send service messages"
@@ -548,7 +542,7 @@ msgstr "聊天室"
 
 #: mod_muc/mod_muc.erl:672
 msgid "You need an x:data capable client to register nickname"
-msgstr "您需要一个兼容x:data的客户端来注册昵称"
+msgstr "您需要一个兼容 x:data 的客户端来注册昵称"
 
 #: mod_muc/mod_muc.erl:678
 msgid "Nickname Registration at "
@@ -566,9 +560,8 @@ msgstr "昵称"
 
 #: mod_muc/mod_muc.erl:722 mod_muc/mod_muc_room.erl:926
 #: mod_muc/mod_muc_room.erl:1513
-#, fuzzy
 msgid "That nickname is registered by another person"
-msgstr "昵称已被另一人注册"
+msgstr "该昵称已被另一个人注册了"
 
 #: mod_muc/mod_muc.erl:748
 msgid "You must fill in field \"Nickname\" in the form"
@@ -576,7 +569,7 @@ msgstr "您必须填充表单中\"昵称\"项"
 
 #: mod_muc/mod_muc.erl:768
 msgid "ejabberd MUC module"
-msgstr "ejabberd MUC模块"
+msgstr "ejabberd MUC 模块"
 
 #: mod_muc/mod_muc_log.erl:371 mod_muc/mod_muc_log.erl:378
 msgid "Chatroom configuration modified"
@@ -617,7 +610,7 @@ msgstr "现在称呼为"
 #: mod_muc/mod_muc_log.erl:414 mod_muc/mod_muc_log.erl:675
 #: mod_muc/mod_muc_room.erl:2040
 msgid " has set the subject to: "
-msgstr "已将标题设置为： "
+msgstr "已将标题设置为: "
 
 #: mod_muc/mod_muc_log.erl:445
 msgid "Monday"
@@ -700,9 +693,8 @@ msgid "Room Configuration"
 msgstr "房间配置"
 
 #: mod_muc/mod_muc_log.erl:745
-#, fuzzy
 msgid "Room Occupants"
-msgstr "占用人数"
+msgstr "房间人数"
 
 #: mod_muc/mod_muc_log.erl:848 mod_muc/mod_muc_room.erl:2785
 msgid "Room title"
@@ -715,7 +707,7 @@ msgstr "已经超过传输率限制"
 #: mod_muc/mod_muc_room.erl:239
 msgid ""
 "This participant is kicked from the room because he sent an error message"
-msgstr "该用户由于发生了错误而被踢出了聊天室"
+msgstr "该用户由于发送了错误消息而被踢出了聊天室"
 
 #: mod_muc/mod_muc_room.erl:248
 msgid "It is not allowed to send private messages to the conference"
@@ -723,13 +715,13 @@ msgstr "不允许向会议发送私聊消息"
 
 #: mod_muc/mod_muc_room.erl:293
 msgid "Improper message type"
-msgstr "消息类型不恰当"
+msgstr "不正确的消息类型"
 
 #: mod_muc/mod_muc_room.erl:403
 msgid ""
 "This participant is kicked from the room because he sent an error message to "
 "another participant"
-msgstr "该用户由于给其他人发送了出错信息而被踢出了聊天室"
+msgstr "该用户由于给其他人发送了出错消息而被踢出了聊天室"
 
 #: mod_muc/mod_muc_room.erl:416
 msgid "It is not allowed to send private messages of type \"groupchat\""
@@ -742,7 +734,7 @@ msgstr "接收人不在会议室"
 #: mod_muc/mod_muc_room.erl:448 mod_muc/mod_muc_room.erl:825
 #: mod_muc/mod_muc_room.erl:3407
 msgid "Only occupants are allowed to send messages to the conference"
-msgstr "只允许占有者向会议发送消息"
+msgstr "只允许驻留者向会议发送消息"
 
 #: mod_muc/mod_muc_room.erl:457
 msgid "It is not allowed to send private messages"
@@ -750,7 +742,7 @@ msgstr "不允许发送私聊消息"
 
 #: mod_muc/mod_muc_room.erl:503
 msgid "Only occupants are allowed to send queries to the conference"
-msgstr "只允许占有者发出查询请求"
+msgstr "只允许驻留者发出查询请求"
 
 #: mod_muc/mod_muc_room.erl:515
 msgid "Queries to the conference members are not allowed in this room"
@@ -758,17 +750,15 @@ msgstr "本房间不允许发出成员查询请求"
 
 #: mod_muc/mod_muc_room.erl:601
 msgid "private, "
-msgstr "保密"
+msgstr "保密, "
 
 #: mod_muc/mod_muc_room.erl:801
-#, fuzzy
 msgid ""
 "Only moderators and participants are allowed to change the subject in this "
 "room"
-msgstr "只允许监管人和参与人更改此房间的主题"
+msgstr "只允许监管人和参与人在此房间里更改主题"
 
 #: mod_muc/mod_muc_room.erl:806
-#, fuzzy
 msgid "Only moderators are allowed to change the subject in this room"
 msgstr "只允许监管人更改此房间的主题"
 
@@ -779,23 +769,21 @@ msgstr "不允许访客给所有占有者发送消息"
 #: mod_muc/mod_muc_room.erl:884
 msgid ""
 "This participant is kicked from the room because he sent an error presence"
-msgstr "该用户由于状态信息错误而被踢出了聊天室"
+msgstr "该用户由于发送了错误状态而被踢出了聊天室"
 
 #: mod_muc/mod_muc_room.erl:902
 msgid "Visitors are not allowed to change their nicknames in this room"
 msgstr "此房间不允许用户更改昵称"
 
 #: mod_muc/mod_muc_room.erl:915 mod_muc/mod_muc_room.erl:1505
-#, fuzzy
 msgid "That nickname is already in use by another occupant"
-msgstr "昵称已被另一用户占用"
+msgstr "该昵称已被另一用户使用"
 
 #: mod_muc/mod_muc_room.erl:1494
 msgid "You have been banned from this room"
 msgstr "您已被禁止进入该房间"
 
 #: mod_muc/mod_muc_room.erl:1497
-#, fuzzy
 msgid "Membership is required to enter this room"
 msgstr "进入此房间需要会员身份"
 
@@ -804,13 +792,12 @@ msgid "This room is not anonymous"
 msgstr "此房间不是匿名房间"
 
 #: mod_muc/mod_muc_room.erl:1559
-#, fuzzy
 msgid "A password is required to enter this room"
 msgstr "进入此房间需要密码"
 
 #: mod_muc/mod_muc_room.erl:1581
 msgid "Unable to generate a captcha"
-msgstr ""
+msgstr "无法产生验证码"
 
 #: mod_muc/mod_muc_room.erl:1591
 msgid "Incorrect password"
@@ -822,7 +809,7 @@ msgstr "需要管理员权限"
 
 #: mod_muc/mod_muc_room.erl:2110
 msgid "Moderator privileges required"
-msgstr "需要调解人权限"
+msgstr "需要主持人权限"
 
 #: mod_muc/mod_muc_room.erl:2265
 msgid "Jabber ID ~s is invalid"
@@ -845,18 +832,16 @@ msgid "Owner privileges required"
 msgstr "需要持有人权限"
 
 #: mod_muc/mod_muc_room.erl:2780
-#, fuzzy
 msgid "Configuration of room ~s"
-msgstr "配置 "
+msgstr "房间~s的配置 "
 
 #: mod_muc/mod_muc_room.erl:2788 mod_muc/mod_muc_room.erl:3206
-#, fuzzy
 msgid "Room description"
-msgstr "描述:"
+msgstr "房间描述"
 
 #: mod_muc/mod_muc_room.erl:2795
 msgid "Make room persistent"
-msgstr "在服务器端保存该房间"
+msgstr "永久保存该房间"
 
 #: mod_muc/mod_muc_room.erl:2800
 msgid "Make room public searchable"
@@ -868,11 +853,11 @@ msgstr "公开参与人列表"
 
 #: mod_muc/mod_muc_room.erl:2806
 msgid "Make room password protected"
-msgstr "保护房间密码"
+msgstr "进入此房间需要密码"
 
 #: mod_muc/mod_muc_room.erl:2817
 msgid "Maximum Number of Occupants"
-msgstr "占有人最大数"
+msgstr "允许的驻留者最大数"
 
 #: mod_muc/mod_muc_room.erl:2824
 msgid "No limit"
@@ -880,11 +865,11 @@ msgstr "不限"
 
 #: mod_muc/mod_muc_room.erl:2835
 msgid "Present real Jabber IDs to"
-msgstr "将真实Jabber ID显示给"
+msgstr "将真实 Jabber ID 显示给"
 
 #: mod_muc/mod_muc_room.erl:2843
 msgid "moderators only"
-msgstr "仅一般人"
+msgstr "仅主持人"
 
 #: mod_muc/mod_muc_room.erl:2845
 msgid "anyone"
@@ -896,14 +881,13 @@ msgstr "设置房间只接收会员"
 
 #: mod_muc/mod_muc_room.erl:2850
 msgid "Make room moderated"
-msgstr "使房间处于监管状态"
+msgstr "只有有\"发言权\"的用户才可以发送消息给所有驻留者"
 
 #: mod_muc/mod_muc_room.erl:2853
 msgid "Default users as participants"
-msgstr "将默认用户视为参与人"
+msgstr "用户默认被视为参与人"
 
 #: mod_muc/mod_muc_room.erl:2856
-#, fuzzy
 msgid "Allow users to change the subject"
 msgstr "允许用户更改主题"
 
@@ -928,9 +912,8 @@ msgid "Allow visitors to change nickname"
 msgstr "允许用户更改昵称"
 
 #: mod_muc/mod_muc_room.erl:2877
-#, fuzzy
 msgid "Make room captcha protected"
-msgstr "保护房间密码"
+msgstr "保护房间验证码"
 
 #: mod_muc/mod_muc_room.erl:2886
 msgid "Enable logging"
@@ -938,11 +921,11 @@ msgstr "启用服务器端聊天记录"
 
 #: mod_muc/mod_muc_room.erl:2894
 msgid "You need an x:data capable client to configure room"
-msgstr "您需要一个兼容x:data的客户端来配置房间"
+msgstr "您需要一个兼容 x:data 的客户端来配置房间"
 
 #: mod_muc/mod_muc_room.erl:3208
 msgid "Number of occupants"
-msgstr "占用人数"
+msgstr "驻留人数"
 
 #: mod_muc/mod_muc_room.erl:3327
 msgid "~s invites you to the room ~s"
@@ -955,11 +938,11 @@ msgstr "密码是"
 #: mod_offline.erl:509 mod_offline_odbc.erl:352
 msgid ""
 "Your contact offline message queue is full. The message has been discarded."
-msgstr "您的离线消息队列已满. 消息已被丢弃"
+msgstr "您的联系人离线消息队列已满. 消息已被丢弃"
 
 #: mod_offline.erl:558 mod_offline_odbc.erl:407
 msgid "~s's Offline Messages Queue"
-msgstr "~s的离线消息队列"
+msgstr "~s 的离线消息队列"
 
 #: mod_offline.erl:561 mod_offline_odbc.erl:410 mod_roster.erl:992
 #: mod_roster_odbc.erl:1093 mod_shared_roster.erl:778
@@ -999,25 +982,24 @@ msgid "Offline Messages:"
 msgstr "离线消息:"
 
 #: mod_offline.erl:620 mod_offline_odbc.erl:496
-#, fuzzy
 msgid "Remove All Offline Messages"
-msgstr "离线消息"
+msgstr "移除所有离线消息"
 
 #: mod_proxy65/mod_proxy65_service.erl:213
 msgid "ejabberd SOCKS5 Bytestreams module"
-msgstr "ejabberd SOCKS5字节流模块"
+msgstr "ejabberd SOCKS5 字节流模块"
 
 #: mod_pubsub/mod_pubsub.erl:1054 mod_pubsub/mod_pubsub_odbc.erl:1053
 msgid "Publish-Subscribe"
-msgstr "发布-订阅"
+msgstr "发行-订阅"
 
 #: mod_pubsub/mod_pubsub.erl:1150 mod_pubsub/mod_pubsub_odbc.erl:1150
 msgid "ejabberd Publish-Subscribe module"
-msgstr "ejabberd发行-订阅模块"
+msgstr "ejabberd 发行-订阅模块"
 
 #: mod_pubsub/mod_pubsub.erl:1437 mod_pubsub/mod_pubsub_odbc.erl:1442
 msgid "PubSub subscriber request"
-msgstr "PubSub订阅人请求"
+msgstr "PubSub 订阅人请求"
 
 #: mod_pubsub/mod_pubsub.erl:1439 mod_pubsub/mod_pubsub_odbc.erl:1444
 msgid "Choose whether to approve this entity's subscription."
@@ -1025,7 +1007,7 @@ msgstr "选择是否允许该实体的订阅"
 
 #: mod_pubsub/mod_pubsub.erl:1445 mod_pubsub/mod_pubsub_odbc.erl:1450
 msgid "Node ID"
-msgstr "节点ID"
+msgstr "节点 ID"
 
 #: mod_pubsub/mod_pubsub.erl:1450 mod_pubsub/mod_pubsub_odbc.erl:1455
 msgid "Subscriber Address"
@@ -1033,7 +1015,7 @@ msgstr "订阅人地址"
 
 #: mod_pubsub/mod_pubsub.erl:1456 mod_pubsub/mod_pubsub_odbc.erl:1461
 msgid "Allow this Jabber ID to subscribe to this pubsub node?"
-msgstr "允许该Jabber ID订阅该pubsub节点?"
+msgstr "允许该 Jabber ID 订阅该pubsub节点?"
 
 #: mod_pubsub/mod_pubsub.erl:3220 mod_pubsub/mod_pubsub_odbc.erl:3244
 msgid "Deliver payloads with event notifications"
@@ -1097,16 +1079,15 @@ msgstr "仅将通知发送给可发送的用户"
 
 #: mod_pubsub/mod_pubsub.erl:3239 mod_pubsub/mod_pubsub_odbc.erl:3263
 msgid "The collections with which a node is affiliated"
-msgstr ""
+msgstr "加入结点的集合"
 
 #: mod_register.erl:190
 msgid "Choose a username and password to register with this server"
 msgstr "请选择在此服务器上注册所需的用户名和密码"
 
 #: mod_register.erl:243
-#, fuzzy
 msgid "Users are not allowed to register accounts so quickly"
-msgstr "不允许用户注册帐户太快"
+msgstr "不允许用户太频繁地注册帐户"
 
 #: mod_roster.erl:943 mod_roster_odbc.erl:1044 web/ejabberd_web_admin.erl:1653
 #: web/ejabberd_web_admin.erl:1812 web/ejabberd_web_admin.erl:1823
@@ -1150,7 +1131,7 @@ msgstr "格式错误"
 
 #: mod_roster.erl:1000 mod_roster_odbc.erl:1101
 msgid "Add Jabber ID"
-msgstr "添加Jabber ID"
+msgstr "添加 Jabber ID"
 
 #: mod_roster.erl:1099 mod_roster_odbc.erl:1200
 msgid "Roster"
@@ -1168,7 +1149,7 @@ msgstr "添加新用户"
 
 #: mod_shared_roster.erl:847
 msgid "Name:"
-msgstr "名称:"
+msgstr "姓名:"
 
 #: mod_shared_roster.erl:852
 msgid "Description:"
@@ -1225,7 +1206,7 @@ msgstr "姓氏"
 msgid ""
 "Fill in the form to search for any matching Jabber User (Add * to the end of "
 "field to match substring)"
-msgstr "填充表单以搜索任何匹配的Jabber用户(在字段末添加*来匹配子串)"
+msgstr "填充表单以搜索任何匹配的 Jabber 用户(在字段末添加*来匹配子串)"
 
 #: mod_vcard.erl:357 mod_vcard.erl:466 mod_vcard_odbc.erl:334
 #: mod_vcard_odbc.erl:441
@@ -1240,7 +1221,7 @@ msgstr "中间名"
 #: mod_vcard.erl:357 mod_vcard.erl:467 mod_vcard_odbc.erl:334
 #: mod_vcard_odbc.erl:442 web/ejabberd_web_admin.erl:1932
 msgid "Name"
-msgstr "名称"
+msgstr "姓名"
 
 #: mod_vcard.erl:357 mod_vcard.erl:475 mod_vcard_odbc.erl:334
 #: mod_vcard_odbc.erl:450
@@ -1254,7 +1235,7 @@ msgstr "组织单位"
 
 #: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334
 msgid "Search users in "
-msgstr "要搜索的用户位于 "
+msgstr "搜索用户于 "
 
 #: mod_vcard.erl:357 mod_vcard_odbc.erl:334 web/ejabberd_web_admin.erl:1496
 #: web/ejabberd_web_admin.erl:1551
@@ -1263,11 +1244,11 @@ msgstr "用户"
 
 #: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334
 msgid "You need an x:data capable client to search"
-msgstr "您需要一个兼容x:data的客户端来搜索"
+msgstr "您需要一个兼容 x:data 的客户端来搜索"
 
 #: mod_vcard.erl:382 mod_vcard_ldap.erl:483 mod_vcard_odbc.erl:359
 msgid "vCard User Search"
-msgstr "vCard用户搜索"
+msgstr "vCard 用户搜索"
 
 #: mod_vcard.erl:438 mod_vcard_ldap.erl:537 mod_vcard_odbc.erl:413
 msgid "ejabberd vCard module"
@@ -1279,16 +1260,16 @@ msgstr "搜索结果属于关键词 "
 
 #: mod_vcard_ldap.erl:458
 msgid "Fill in fields to search for any matching Jabber User"
-msgstr "填充字段以搜索任何匹配的Jabber用户"
+msgstr "填充字段以搜索任何匹配的 Jabber 用户"
 
 #: web/ejabberd_web_admin.erl:179 web/ejabberd_web_admin.erl:186
 #: web/ejabberd_web_admin.erl:202 web/ejabberd_web_admin.erl:209
 msgid "Unauthorized"
-msgstr ""
+msgstr "未认证的"
 
 #: web/ejabberd_web_admin.erl:266 web/ejabberd_web_admin.erl:283
 msgid "ejabberd Web Admin"
-msgstr "ejabberd网页管理"
+msgstr "ejabberd 网页管理"
 
 #: web/ejabberd_web_admin.erl:749 web/ejabberd_web_admin.erl:760
 msgid "Administration"
@@ -1300,11 +1281,11 @@ msgstr "原始格式"
 
 #: web/ejabberd_web_admin.erl:997
 msgid "~s access rule configuration"
-msgstr "~s访问规则配置"
+msgstr "~s 访问规则配置"
 
 #: web/ejabberd_web_admin.erl:1015
 msgid "ejabberd virtual hosts"
-msgstr "ejabberd虚拟主机"
+msgstr "ejabberd 虚拟主机"
 
 #: web/ejabberd_web_admin.erl:1023 web/ejabberd_web_admin.erl:1030
 msgid "Users"
@@ -1316,7 +1297,7 @@ msgstr "用户上次活动"
 
 #: web/ejabberd_web_admin.erl:1060
 msgid "Period: "
-msgstr "持续时间:"
+msgstr "持续时间: "
 
 #: web/ejabberd_web_admin.erl:1070
 msgid "Last month"
@@ -1343,9 +1324,8 @@ msgid "Statistics"
 msgstr "统计"
 
 #: web/ejabberd_web_admin.erl:1097
-#, fuzzy
 msgid "Not Found"
-msgstr "没有找到节点"
+msgstr "没有找到"
 
 #: web/ejabberd_web_admin.erl:1114
 msgid "Node not found"
@@ -1369,7 +1349,7 @@ msgstr "上次活动"
 
 #: web/ejabberd_web_admin.erl:1611 web/ejabberd_web_admin.erl:1627
 msgid "Registered Users:"
-msgstr "注册用户："
+msgstr "注册用户:"
 
 #: web/ejabberd_web_admin.erl:1613 web/ejabberd_web_admin.erl:1629
 #: web/ejabberd_web_admin.erl:2113
@@ -1378,11 +1358,11 @@ msgstr "在线用户:"
 
 #: web/ejabberd_web_admin.erl:1615
 msgid "Outgoing s2s Connections:"
-msgstr "出站s2s连接:"
+msgstr "出站 s2s 连接:"
 
 #: web/ejabberd_web_admin.erl:1617
 msgid "Outgoing s2s Servers:"
-msgstr "出站s2s服务器"
+msgstr "出站 s2s 服务器"
 
 #: web/ejabberd_web_admin.erl:1682
 msgid "Change Password"
@@ -1394,11 +1374,11 @@ msgstr "用户 "
 
 #: web/ejabberd_web_admin.erl:1692
 msgid "Connected Resources:"
-msgstr "已连接资源"
+msgstr "已连接资源:"
 
 #: web/ejabberd_web_admin.erl:1693
 msgid "Password:"
-msgstr "密码："
+msgstr "密码: "
 
 #: web/ejabberd_web_admin.erl:1754
 msgid "No Data"
@@ -1414,7 +1394,7 @@ msgstr "节点 "
 
 #: web/ejabberd_web_admin.erl:1864
 msgid "Listened Ports"
-msgstr "监听端口"
+msgstr "被监听的端口"
 
 #: web/ejabberd_web_admin.erl:1866 web/ejabberd_web_admin.erl:2181
 #: web/ejabberd_web_admin.erl:2369
@@ -1431,7 +1411,7 @@ msgstr "停止"
 
 #: web/ejabberd_web_admin.erl:1885
 msgid "RPC Call Error"
-msgstr "RPC调用错误"
+msgstr "RPC 调用错误"
 
 #: web/ejabberd_web_admin.erl:1926
 msgid "Database Tables at "
@@ -1443,7 +1423,7 @@ msgstr "存储类型"
 
 #: web/ejabberd_web_admin.erl:1934
 msgid "Elements"
-msgstr ""
+msgstr "元素"
 
 #: web/ejabberd_web_admin.erl:1935
 msgid "Memory"
@@ -1451,21 +1431,20 @@ msgstr "内存"
 
 #: web/ejabberd_web_admin.erl:1953 web/ejabberd_web_admin.erl:2058
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: web/ejabberd_web_admin.erl:1955
 msgid "Backup of "
 msgstr "备份来源 "
 
 #: web/ejabberd_web_admin.erl:1957
-#, fuzzy
 msgid ""
 "Please note that these options will only backup the builtin Mnesia database. "
 "If you are using the ODBC module, you also need to backup your SQL database "
 "separately."
 msgstr ""
-"注意：这些选项仅将备份内置的Mnesia数据库. 如果您在使用ODBC模块, 您还需要分别"
-"备份您的数据库."
+"注意：这些选项仅将备份内置的 Mnesia 数据库. 如果您正在使用 ODBC 模块, 您还需"
+"要分别备份您的数据库."
 
 #: web/ejabberd_web_admin.erl:1962
 msgid "Store binary backup:"
@@ -1477,7 +1456,7 @@ msgstr "存储为二进制备份:"
 #: web/ejabberd_web_admin.erl:2009 web/ejabberd_web_admin.erl:2017
 #: web/ejabberd_web_admin.erl:2024 web/ejabberd_web_admin.erl:2031
 msgid "OK"
-msgstr "OK"
+msgstr "确定"
 
 #: web/ejabberd_web_admin.erl:1969
 msgid "Restore binary backup immediately:"
@@ -1486,7 +1465,7 @@ msgstr "立即恢复二进制备份:"
 #: web/ejabberd_web_admin.erl:1977
 msgid ""
 "Restore binary backup after next ejabberd restart (requires less memory):"
-msgstr "在下次ejabberd重启后恢复二进制备份(需要的内存更少):"
+msgstr "在下次 ejabberd 重启后恢复二进制备份(需要的内存更少):"
 
 #: web/ejabberd_web_admin.erl:1984
 msgid "Store plain text backup:"
@@ -1498,25 +1477,23 @@ msgstr "立即恢复普通文本备份:"
 
 #: web/ejabberd_web_admin.erl:1998
 msgid "Import users data from a PIEFXIS file (XEP-0277):"
-msgstr ""
+msgstr "从 PIEFXIS 文件 (XEP-0277)导入用户数据:"
 
 #: web/ejabberd_web_admin.erl:2005
 msgid "Export data of all users in the server to PIEFXIS files (XEP-0277):"
-msgstr ""
+msgstr "将服务器上所有用户的数据导出到 PIEFXIS 文件 (XEP-0277):"
 
 #: web/ejabberd_web_admin.erl:2012
 msgid "Export data of users in a host to PIEFXIS files (XEP-0277):"
-msgstr ""
+msgstr "将某主机的用户数据导出到 PIEFXIS 文件 (XEP-0277):"
 
 #: web/ejabberd_web_admin.erl:2020
-#, fuzzy
 msgid "Import user data from jabberd14 spool file:"
-msgstr "从Jabberd 1.4 Spool文件导入用户"
+msgstr "从 jabberd14 Spool文件导入用户数据:"
 
 #: web/ejabberd_web_admin.erl:2027
-#, fuzzy
 msgid "Import users data from jabberd14 spool directory:"
-msgstr "从Jabberd 1.4 Spool文件导入用户"
+msgstr "从 jabberd14 Spool目录导入用户数据:"
 
 #: web/ejabberd_web_admin.erl:2053
 msgid "Listened Ports at "
@@ -1528,7 +1505,7 @@ msgstr "模块位于 "
 
 #: web/ejabberd_web_admin.erl:2104
 msgid "Statistics of ~p"
-msgstr "~p的统计"
+msgstr "~p 的统计"
 
 #: web/ejabberd_web_admin.erl:2107
 msgid "Uptime:"
@@ -1536,7 +1513,7 @@ msgstr "正常运行时间:"
 
 #: web/ejabberd_web_admin.erl:2110
 msgid "CPU Time:"
-msgstr "CPU时间："
+msgstr "CPU 时间："
 
 #: web/ejabberd_web_admin.erl:2116
 msgid "Transactions Committed:"
@@ -1563,9 +1540,8 @@ msgid "Update plan"
 msgstr "更新计划"
 
 #: web/ejabberd_web_admin.erl:2176
-#, fuzzy
 msgid "Modified modules"
-msgstr "更新模块"
+msgstr "被修改模块"
 
 #: web/ejabberd_web_admin.erl:2177
 msgid "Update script"
@@ -1577,7 +1553,7 @@ msgstr "低级别更新脚本"
 
 #: web/ejabberd_web_admin.erl:2179
 msgid "Script check"
-msgstr "检查脚本"
+msgstr "脚本检查"
 
 #: web/ejabberd_web_admin.erl:2347
 msgid "Port"
@@ -1585,12 +1561,11 @@ msgstr "端口"
 
 #: web/ejabberd_web_admin.erl:2348
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #: web/ejabberd_web_admin.erl:2349
-#, fuzzy
 msgid "Protocol"
-msgstr "端口"
+msgstr "协议"
 
 #: web/ejabberd_web_admin.erl:2350 web/ejabberd_web_admin.erl:2477
 msgid "Module"
@@ -1618,7 +1593,7 @@ msgstr "开始"
 #~ msgstr "虚拟主机"
 
 #~ msgid "Specified nickname is already registered"
-#~ msgstr "指定的名称已被注册"
+#~ msgstr "指定的昵称已被注册"
 
 #~ msgid "Size"
 #~ msgstr "大小"