summary refs log tree commit diff stats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2016-02-19 09:54:19 -0500
committerPatrick Griffis <tingping@tingping.se>2016-02-19 09:54:19 -0500
commitdf36f88e889e37c432b875525dbd3779780f4600 (patch)
treeec315c2bc964af5804693960701869b72d13671e /po/zh_CN.po
parent94a7fbae025b4a42f781e22a1e0d06a98f214888 (diff)
Update translations
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2670
1 files changed, 1402 insertions, 1268 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 35535117..9551be66 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,24 +5,26 @@
 # Translators:
 # Aron Xu <happyaron.xu@gmail.com>, 2010
 # Dalin <ayi880@hotmail.com>, 2003
-# chenyueg <chenyueg@gmail.com>, 2010
-# michaeljayt <michaeljayt@gmail.com>, 2014
+# Eleanor Chen <chenyueg@gmail.com>, 2010
+# highwind <highwindmx@126.com>, 2014
+# bababababanana1, 2014
+# Michael Jay Tong <michaeljayt@gmail.com>, 2014
 # Minor revision by Walte <webmaster@www.linuxfans.org>, 2003
 # Rongjun Mu <elanmu@sina.com>, 2003
 # Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004
 # Sarah Smith <sarahs@redhat.com>, 2003
 # SEPTEM <septeman@gmail.com>, 2006
-# tonghuix <tonghuix@gmail.com>, 2014
+# Tong Hui <tonghuix@gmail.com>, 2014,2016
 # Zhuyuan Liu <gtkdict@yahoo.com.cn>, 2005
 # Zong Yaotang <zong@cosix.com.au>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-05-14 17:20+0000\n"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/hexchat/language/zh_CN/)\n"
+"POT-Creation-Date: 2016-01-25 23:00-0500\n"
+"PO-Revision-Date: 2016-01-28 03:42+0000\n"
+"Last-Translator: Tong Hui <tonghuix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/hexchat/hexchat/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,383 +70,408 @@ msgstr "HexChat 主题管理器"
 
 #. 0 means unlimited
 #. STRINGS
-#: ../src/common/cfgfiles.c:848
+#: ../src/common/cfgfiles.c:841
 msgid "I'm busy"
 msgstr "我很忙"
 
-#: ../src/common/cfgfiles.c:883
+#: ../src/common/cfgfiles.c:878
 msgid "Leaving"
 msgstr "已离开"
 
-#: ../src/common/dcc.c:72
+#: ../src/common/chanopt.c:121 ../src/common/chanopt.c:122
+#: ../src/fe-gtk/maingui.c:1572 ../src/fe-gtk/maingui.c:1692
+#: ../src/fe-gtk/maingui.c:3389
+msgid "<none>"
+msgstr "<无>"
+
+#: ../src/common/dcc.c:69
 msgid "Waiting"
 msgstr "等待中"
 
 #. black
-#: ../src/common/dcc.c:73
+#: ../src/common/dcc.c:70
 msgid "Active"
 msgstr "活跃"
 
 #. cyan
-#: ../src/common/dcc.c:74
+#: ../src/common/dcc.c:71
 msgid "Failed"
 msgstr "失败"
 
 #. red
-#: ../src/common/dcc.c:75
+#: ../src/common/dcc.c:72
 msgid "Done"
 msgstr "完成"
 
 #. green
-#: ../src/common/dcc.c:76 ../src/fe-gtk/menu.c:968
+#: ../src/common/dcc.c:73 ../src/fe-gtk/menu.c:970
 msgid "Connect"
 msgstr "连接"
 
 #. black
-#: ../src/common/dcc.c:77
+#: ../src/common/dcc.c:74
 msgid "Aborted"
 msgstr "已中止"
 
-#: ../src/common/dcc.c:1890 ../src/common/outbound.c:2554
+#: ../src/common/dcc.c:1776 ../src/common/dcc.c:1787 ../src/common/dcc.c:1803
+#: ../src/common/outbound.c:2534
 #, c-format
 msgid "Cannot access %s\n"
 msgstr "无法获取 %s\n"
 
 #. ! if (osvi.dwMajorVersion >= 5)
 #. fallback to error number
-#: ../src/common/dcc.c:1891 ../src/common/text.c:1364
-#: ../src/common/text.c:1407 ../src/common/text.c:1418
-#: ../src/common/text.c:1425 ../src/common/text.c:1438
-#: ../src/common/text.c:1455 ../src/common/text.c:1560
-#: ../src/common/util.c:369
+#: ../src/common/dcc.c:1777 ../src/common/dcc.c:1788 ../src/common/dcc.c:1804
+#: ../src/common/text.c:1280 ../src/common/text.c:1323
+#: ../src/common/text.c:1334 ../src/common/text.c:1341
+#: ../src/common/text.c:1354 ../src/common/text.c:1371
+#: ../src/common/text.c:1476 ../src/common/util.c:177
 msgid "Error"
 msgstr "错误"
 
-#: ../src/common/dcc.c:2369
+#: ../src/common/dcc.c:2449
 #, c-format
 msgid "%s is offering \"%s\". Do you want to accept?"
 msgstr "%s 要给您发送 “%s”,要接受吗?"
 
-#: ../src/common/dcc.c:2586
+#: ../src/common/dcc.c:2666
 msgid "No active DCCs\n"
 msgstr "没有活跃的 DCC\n"
 
-#: ../src/common/hexchat.c:867
+#: ../src/common/hexchat.c:842
 msgid "_Open Dialog Window"
 msgstr "打开对话窗口(_O)"
 
-#: ../src/common/hexchat.c:868
+#: ../src/common/hexchat.c:843
 msgid "_Send a File"
 msgstr "发送文件(_S)"
 
-#: ../src/common/hexchat.c:869
+#: ../src/common/hexchat.c:844
 msgid "_User Info (WhoIs)"
 msgstr "用户信息(_U)(WHOIS)"
 
-#: ../src/common/hexchat.c:870
+#: ../src/common/hexchat.c:845
 msgid "_Add to Friends List"
 msgstr "添加到好友列表(_A)"
 
-#: ../src/common/hexchat.c:871
+#: ../src/common/hexchat.c:846
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../src/common/hexchat.c:872
+#: ../src/common/hexchat.c:847
 msgid "O_perator Actions"
 msgstr "管理员动作(_P)"
 
-#: ../src/common/hexchat.c:874
+#: ../src/common/hexchat.c:849
 msgid "Give Ops"
 msgstr "赋予管理员权限"
 
-#: ../src/common/hexchat.c:875
+#: ../src/common/hexchat.c:850
 msgid "Take Ops"
 msgstr "取消管理员权限"
 
-#: ../src/common/hexchat.c:876
+#: ../src/common/hexchat.c:851
 msgid "Give Voice"
 msgstr "赋予发言权"
 
-#: ../src/common/hexchat.c:877
+#: ../src/common/hexchat.c:852
 msgid "Take Voice"
 msgstr "取消发言权"
 
-#: ../src/common/hexchat.c:879
+#: ../src/common/hexchat.c:854
 msgid "Kick/Ban"
 msgstr "踢人/屏蔽"
 
-#: ../src/common/hexchat.c:880 ../src/common/hexchat.c:917
+#: ../src/common/hexchat.c:855 ../src/common/hexchat.c:892
 msgid "Kick"
 msgstr "踢人"
 
-#: ../src/common/hexchat.c:881 ../src/common/hexchat.c:882
-#: ../src/common/hexchat.c:883 ../src/common/hexchat.c:884
-#: ../src/common/hexchat.c:885 ../src/common/hexchat.c:916
+#: ../src/common/hexchat.c:856 ../src/common/hexchat.c:857
+#: ../src/common/hexchat.c:858 ../src/common/hexchat.c:859
+#: ../src/common/hexchat.c:860 ../src/common/hexchat.c:891
 #: ../src/fe-gtk/banlist.c:50
 msgid "Ban"
 msgstr "屏蔽"
 
-#: ../src/common/hexchat.c:886 ../src/common/hexchat.c:887
-#: ../src/common/hexchat.c:888 ../src/common/hexchat.c:889
+#: ../src/common/hexchat.c:861 ../src/common/hexchat.c:862
+#: ../src/common/hexchat.c:863 ../src/common/hexchat.c:864
 msgid "KickBan"
 msgstr "踢出并屏蔽"
 
-#: ../src/common/hexchat.c:899
+#: ../src/common/hexchat.c:874
 msgid "Leave Channel"
 msgstr "离开频道"
 
-#: ../src/common/hexchat.c:900
+#: ../src/common/hexchat.c:875
 msgid "Join Channel..."
 msgstr "进入频道..."
 
-#: ../src/common/hexchat.c:901 ../src/fe-gtk/menu.c:1410
+#: ../src/common/hexchat.c:876 ../src/fe-gtk/menu.c:1410
 msgid "Enter Channel to Join:"
 msgstr "输入要进入的频道:"
 
-#: ../src/common/hexchat.c:902
+#: ../src/common/hexchat.c:877
 msgid "Server Links"
 msgstr "服务器列表"
 
-#: ../src/common/hexchat.c:903
+#: ../src/common/hexchat.c:878
 msgid "Ping Server"
 msgstr "Ping 服务器"
 
-#: ../src/common/hexchat.c:904
+#: ../src/common/hexchat.c:879
 msgid "Hide Version"
 msgstr "隐藏版本信息"
 
-#: ../src/common/hexchat.c:914
+#: ../src/common/hexchat.c:889
 msgid "Op"
 msgstr "赋予管理员权限"
 
-#: ../src/common/hexchat.c:915
+#: ../src/common/hexchat.c:890
 msgid "DeOp"
 msgstr "取消管理员权限"
 
-#: ../src/common/hexchat.c:918
+#: ../src/common/hexchat.c:893
 msgid "bye"
 msgstr "道别"
 
-#: ../src/common/hexchat.c:919
+#: ../src/common/hexchat.c:894
 #, c-format
 msgid "Enter reason to kick %s:"
 msgstr "输入踢出 %s 的原因:"
 
-#: ../src/common/hexchat.c:920
+#: ../src/common/hexchat.c:895
 msgid "Sendfile"
 msgstr "发送文件"
 
-#: ../src/common/hexchat.c:921
+#: ../src/common/hexchat.c:896
 msgid "Dialog"
 msgstr "对话"
 
-#: ../src/common/hexchat.c:930
+#: ../src/common/hexchat.c:905
 msgid "WhoIs"
 msgstr "WhoIs"
 
-#: ../src/common/hexchat.c:931
+#: ../src/common/hexchat.c:906
 msgid "Send"
 msgstr "发送"
 
-#: ../src/common/hexchat.c:932
+#: ../src/common/hexchat.c:907
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/common/hexchat.c:933 ../src/fe-gtk/banlist.c:852
-#: ../src/fe-gtk/dccgui.c:884 ../src/fe-gtk/ignoregui.c:385
+#: ../src/common/hexchat.c:908 ../src/fe-gtk/banlist.c:847
+#: ../src/fe-gtk/dccgui.c:883 ../src/fe-gtk/ignoregui.c:385
 #: ../src/fe-gtk/urlgrab.c:212
 msgid "Clear"
 msgstr "清除"
 
-#: ../src/common/hexchat.c:934
+#: ../src/common/hexchat.c:909
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/common/hexchat.c:1130
+#: ../src/common/hexchat.c:1082
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
 msgstr "你没有 %s 的写入权限。此会话中的信息不可保存。"
 
-#: ../src/common/hexchat.c:1139
+#: ../src/common/hexchat.c:1091
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
 msgstr "* 不要以 root 身份执行 IRC!您应该\n  使用普通用户帐号来登录。\n"
 
-#: ../src/common/ignore.c:130 ../src/common/ignore.c:134
-#: ../src/common/ignore.c:138 ../src/common/ignore.c:142
-#: ../src/common/ignore.c:146 ../src/common/ignore.c:150
-#: ../src/common/ignore.c:154
+#: ../src/common/ignore.c:127 ../src/common/ignore.c:131
+#: ../src/common/ignore.c:135 ../src/common/ignore.c:139
+#: ../src/common/ignore.c:143 ../src/common/ignore.c:147
+#: ../src/common/ignore.c:151
 msgid "YES  "
 msgstr "是  "
 
-#: ../src/common/ignore.c:132 ../src/common/ignore.c:136
-#: ../src/common/ignore.c:140 ../src/common/ignore.c:144
-#: ../src/common/ignore.c:148 ../src/common/ignore.c:152
-#: ../src/common/ignore.c:156
+#: ../src/common/ignore.c:129 ../src/common/ignore.c:133
+#: ../src/common/ignore.c:137 ../src/common/ignore.c:141
+#: ../src/common/ignore.c:145 ../src/common/ignore.c:149
+#: ../src/common/ignore.c:153
 msgid "NO   "
 msgstr "否   "
 
-#: ../src/common/ignore.c:385
+#: ../src/common/ignore.c:378
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr "您正受到来自 %s 的 CTCP 洪水攻击,忽略 %s\n"
+msgstr "您正受到来自 %s 的洗屏攻击,忽略 %s\n"
 
-#: ../src/common/ignore.c:410
+#: ../src/common/ignore.c:403
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr "您正受到来自 %s 的 MSG 洪水攻击,自动打开图形化对话框参数gui_autoopen_dialog 将设置为关闭。\n"
+msgstr "您正受到来自 %s 的 MSG 洪水攻击,设置图形化自动对话框为关闭。\n"
+
+#: ../src/common/inbound.c:1284
+#, c-format
+msgid "Resolved to %s"
+msgstr "解析到 %s"
+
+#: ../src/common/inbound.c:1286 ../src/common/inbound.c:1314
+msgid "Not found"
+msgstr "找不到"
+
+#: ../src/common/inbound.c:1303
+msgid "Resolved to:"
+msgstr "解析到:"
+
+#: ../src/common/inbound.c:1333
+#, c-format
+msgid "Looking up %s..."
+msgstr "查找 %s..."
 
-#: ../src/common/notify.c:558
+#: ../src/common/notify.c:559
 #, c-format
 msgid "  %-20s online\n"
 msgstr "  %-20s 在线\n"
 
-#: ../src/common/notify.c:560
+#: ../src/common/notify.c:561
 #, c-format
 msgid "  %-20s offline\n"
 msgstr "  %-20s 离线\n"
 
-#: ../src/common/outbound.c:72
+#: ../src/common/outbound.c:69
 msgid "No channel joined. Try /join #<channel>\n"
-msgstr "没有进入任何频道。请尝试 /join #<channel>\n"
+msgstr "没有进入任何频道。请尝试输入 /join #<channel>\n"
 
-#: ../src/common/outbound.c:78
+#: ../src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
 msgstr "未连接任何服务器。请尝试输入 /server <host> [<port>]\n"
 
-#: ../src/common/outbound.c:280
+#: ../src/common/outbound.c:277
 #, c-format
 msgid "Server %s already exists on network %s.\n"
 msgstr "服务器 %s 已存在于网络 %s 中。\n"
 
-#: ../src/common/outbound.c:286
+#: ../src/common/outbound.c:283
 #, c-format
 msgid "Added server %s to network %s.\n"
 msgstr "已将服务器 %s 添加到网络 %s 中。\n"
 
-#: ../src/common/outbound.c:371
+#: ../src/common/outbound.c:368
 #, c-format
 msgid "Already marked away: %s\n"
 msgstr "已标记为离开:%s\n"
 
-#: ../src/common/outbound.c:409
+#: ../src/common/outbound.c:405
 msgid "Already marked back.\n"
 msgstr "已取消离开标记。\n"
 
-#: ../src/common/outbound.c:1793
+#: ../src/common/outbound.c:1772
 msgid "I need /bin/sh to run!\n"
 msgstr "使用 /bin/sh 才能执行本程序!\n"
 
-#: ../src/common/outbound.c:2214
+#: ../src/common/outbound.c:2195
 msgid "Commands Available:"
 msgstr "可用命令:"
 
-#: ../src/common/outbound.c:2228
+#: ../src/common/outbound.c:2209
 msgid "User defined commands:"
 msgstr "用户自定义命令:"
 
-#: ../src/common/outbound.c:2244
+#: ../src/common/outbound.c:2225
 msgid "Plugin defined commands:"
 msgstr "可用插件命令:"
 
-#: ../src/common/outbound.c:2255
+#: ../src/common/outbound.c:2236
 msgid "Type /HELP <command> for more information, or /HELP -l"
 msgstr "请输入 /HELP <命令名> 或者 /HELP -l 以获取更多信息"
 
-#: ../src/common/outbound.c:2339
+#: ../src/common/outbound.c:2320
 #, c-format
 msgid "Unknown arg '%s' ignored."
 msgstr "忽略未知参数 “%s”。"
 
-#: ../src/common/outbound.c:3093 ../src/common/outbound.c:3123
+#: ../src/common/outbound.c:3073 ../src/common/outbound.c:3103
 msgid "Quiet is not supported by this server."
 msgstr "此服务器不支持静默。"
 
 #. error
-#: ../src/common/outbound.c:3585 ../src/common/outbound.c:3619
+#: ../src/common/outbound.c:3551 ../src/common/outbound.c:3576
 msgid "No such plugin found.\n"
 msgstr "找不到该插件。\n"
 
-#: ../src/common/outbound.c:3590 ../src/fe-gtk/plugingui.c:204
+#: ../src/common/outbound.c:3556 ../src/fe-gtk/plugingui.c:188
 msgid "That plugin is refusing to unload.\n"
 msgstr "无法卸载该插件。\n"
 
-#: ../src/common/outbound.c:3901
+#: ../src/common/outbound.c:3858
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
 msgstr "ADDBUTTON <名称> <动作>,在用户列表下添加一个按钮"
 
-#: ../src/common/outbound.c:3902
+#: ../src/common/outbound.c:3859
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
 msgstr "ADDSERVER <新网络> <新服务器/6667>,向网络列表添加新网络新服务器信息"
 
-#: ../src/common/outbound.c:3904
+#: ../src/common/outbound.c:3861
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
 msgstr "ALLCHAN <命令>,向您所在的所有频道发送命令"
 
-#: ../src/common/outbound.c:3906
+#: ../src/common/outbound.c:3863
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
 msgstr "ALLCHANL <命令>,向您所在服务器的所有频道发送命令。"
 
-#: ../src/common/outbound.c:3908
+#: ../src/common/outbound.c:3865
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
 msgstr "ALLSERV <命令>,向您所在的所有服务器发送命令"
 
-#: ../src/common/outbound.c:3909
-msgid "AWAY [<reason>], sets you away"
-msgstr "AWAY [<离开原因>],设置为离开状态"
+#: ../src/common/outbound.c:3866
+msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
+msgstr "AWAY [<离开原因>],设置为离开状态(使用 /BACK 解除)"
 
-#: ../src/common/outbound.c:3910
+#: ../src/common/outbound.c:3867
 msgid "BACK, sets you back (not away)"
 msgstr "BACK,取消离开状态"
 
-#: ../src/common/outbound.c:3912
+#: ../src/common/outbound.c:3869
 msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
 msgstr "BAN <掩码> [<拦截类型>],禁止所有符合 <掩码> 的用户进入当前的频道。如果他们已在该频道,这个命令不会将其踢出(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3913
+#: ../src/common/outbound.c:3870
 msgid "CHANOPT [-quiet] <variable> [<value>]"
 msgstr "CHANOPT [-quiet] <变量名> [<值>]"
 
-#: ../src/common/outbound.c:3914
+#: ../src/common/outbound.c:3871
 msgid ""
 "CHARSET [<encoding>], get or set the encoding used for the current "
 "connection"
 msgstr "CHARSET [<编码字符集>],获取及设置当前连接所使用的编码字符集"
 
-#: ../src/common/outbound.c:3915
+#: ../src/common/outbound.c:3872
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
 msgstr "CLEAR [ALL|HISTORY|[-]<amount>],清空当前的窗口文本或命令历史。"
 
-#: ../src/common/outbound.c:3916
+#: ../src/common/outbound.c:3873
 msgid "CLOSE [-m], Closes the current window/tab or all queries"
 msgstr "CLOSE [-m],关闭当前窗口/标签页或者所有请求"
 
-#: ../src/common/outbound.c:3919
+#: ../src/common/outbound.c:3876
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
 msgstr "COUNTRY [-s] <国家地区代码|通配符>,查看国家代码对应的国家名,比如 :cn = 中国"
 
-#: ../src/common/outbound.c:3921
+#: ../src/common/outbound.c:3878
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
 msgstr "CTCP <昵称> <要发送的信息>,给昵称为 <昵称> 者发送 CTCP 信息,常用是 VERSION 和 USERINFO"
 
-#: ../src/common/outbound.c:3923
+#: ../src/common/outbound.c:3880
 msgid ""
 "CYCLE [<channel>], parts the current or given channel and immediately "
 "rejoins"
 msgstr "CYCLE [<频道>],离开当前频道并立即重新进入"
 
-#: ../src/common/outbound.c:3925
+#: ../src/common/outbound.c:3882
 msgid ""
 "\n"
 "DCC GET <nick>                      - accept an offered file\n"
@@ -457,89 +484,89 @@ msgid ""
 "         /dcc close send johnsmith file.tar.gz"
 msgstr "\nDCC GET <昵称>                     - 接收昵称为 <昵称> 者使用 DCC 发送给\n                                      您的文件\nDCC SEND [-maxcps=#] <昵称> [文件] - 使用 DCC 发送文件给 <昵称>\nDCC PSEND [-maxcps=#] <昵称> [文件] - 使用被动模式 DCC 发送文件给 <昵称>\nDCC LIST                           - 显示 DCC 列表\nDCC CHAT <昵称>                    - 与 <昵称> 进行 DCC 直连聊天\nDCC PCHAT <昵称>                    - 使用 DCC 被动模式与 <昵称> 聊天\nDCC CLOSE <类型> <昵称> <文件>         例如:\n         /dcc close send johnsmith file.tar.gz"
 
-#: ../src/common/outbound.c:3937
+#: ../src/common/outbound.c:3894
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
 msgstr "DEHOP <昵称>,取消当前频道内昵称为 <昵称> 的副管理员身份(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3939
+#: ../src/common/outbound.c:3896
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
 msgstr "DELBUTTON <名称>,删除用户列表下的那个按钮"
 
-#: ../src/common/outbound.c:3941
+#: ../src/common/outbound.c:3898
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
 msgstr "DEOP <昵称>,取消昵称为 <昵称> 者在当前频道的管理员身份(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3943
+#: ../src/common/outbound.c:3900
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
 msgstr "DEVOICE <昵称>,取消昵称为 <昵称> 者在当前频道的发言权(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3944
+#: ../src/common/outbound.c:3901
 msgid "DISCON, Disconnects from server"
 msgstr "DISCON,断开服务器连接"
 
-#: ../src/common/outbound.c:3945
+#: ../src/common/outbound.c:3902
 msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
 msgstr "DNS <昵称|主机|IP>,解析用户昵称、 IP 地址或者主机名"
 
-#: ../src/common/outbound.c:3946
+#: ../src/common/outbound.c:3903
 msgid "ECHO <text>, Prints text locally"
 msgstr "ECHO <文本>,在本地显示文本"
 
-#: ../src/common/outbound.c:3949
+#: ../src/common/outbound.c:3906
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
 msgstr "EXEC [-o] <命令>,执行命令。如果使用了 -o 选项则输出到当前频道,否则输出到当前文本框"
 
-#: ../src/common/outbound.c:3951
+#: ../src/common/outbound.c:3908
 msgid "EXECCONT, sends the process SIGCONT"
 msgstr "EXECCONT,向进程发送 SIGCONT 信号"
 
-#: ../src/common/outbound.c:3954
+#: ../src/common/outbound.c:3911
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
 msgstr "EXECKILL [-9],杀死当前会话中的某个执行进程。如果使用 -9 选项,则用 SIGKILL 杀死该进程"
 
-#: ../src/common/outbound.c:3956
+#: ../src/common/outbound.c:3913
 msgid "EXECSTOP, sends the process SIGSTOP"
 msgstr "EXECSTOP,向进程发送 SIGSTOP 信号"
 
-#: ../src/common/outbound.c:3957
+#: ../src/common/outbound.c:3914
 msgid "EXECWRITE, sends data to the processes stdin"
 msgstr "EXECWRITE,把数据发送给进程的标准输入"
 
-#: ../src/common/outbound.c:3961
+#: ../src/common/outbound.c:3918
 msgid "EXPORTCONF, exports HexChat settings"
 msgstr "EXPORTCONF, 导出 HexChat 设置"
 
-#: ../src/common/outbound.c:3964
+#: ../src/common/outbound.c:3921
 msgid "FLUSHQ, flushes the current server's send queue"
 msgstr "FLUSHQ,清空当前服务器的发送队列"
 
-#: ../src/common/outbound.c:3966
+#: ../src/common/outbound.c:3923
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
 msgstr "GATE <主机> [<端口号>],经由某主机来代理,默认端口为 23"
 
-#: ../src/common/outbound.c:3971
+#: ../src/common/outbound.c:3928
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr "GHOST <昵称> [密码],消灭幽灵昵称"
+msgstr "GHOST <昵称> [密码],消灭此幽灵昵称"
 
-#: ../src/common/outbound.c:3976
+#: ../src/common/outbound.c:3933
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
 msgstr "HOP <昵称>,给昵称为 <昵称> 者以副管理员的身份(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3977
+#: ../src/common/outbound.c:3934
 msgid "ID <password>, identifies yourself to nickserv"
-msgstr "ID <密码>,向昵称服务器进行身份验证"
+msgstr "ID <密码>,向昵称服务器验证你的身份"
 
-#: ../src/common/outbound.c:3979
+#: ../src/common/outbound.c:3936
 msgid ""
 "IGNORE <mask> <types..> <options..>\n"
 "    mask - host mask to ignore, eg: *!*@*.aol.com\n"
@@ -548,32 +575,32 @@ msgid ""
 "    options - NOSAVE, QUIET"
 msgstr "IGNORE <掩码> <类型..> <选项..>\n    掩码 - 要忽略的主机掩码,比如 *!*@*.aol.com\n    类型 - 要忽略数据的类型,应以下选项之一或全部:\n            PRIV,CHAN,NOTI,CTCP,INVI,ALL\n    选项 - 忽略选项:NOSAVE,QUIET"
 
-#: ../src/common/outbound.c:3986
+#: ../src/common/outbound.c:3943
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
 msgstr "INVITE <昵称> [<频道>],邀请昵称为 <昵称> 者进入频道,默认为当前的频道(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3987
+#: ../src/common/outbound.c:3944
 msgid "JOIN <channel>, joins the channel"
 msgstr "JOIN <频道>,进入频道"
 
-#: ../src/common/outbound.c:3989
+#: ../src/common/outbound.c:3946
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
 msgstr "KICK <昵称> [原因],将该昵称从当前频道中踢出 (需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3991
+#: ../src/common/outbound.c:3948
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr "KICKBAN <昵称> [原因],把 <昵称> 者踢出当前频道,并禁止再次进入(需要具有频道管理员身份)"
+msgstr "KICKBAN <昵称> [原因],把 <昵称> 踢出当前频道,并禁止再次进入(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:3994
+#: ../src/common/outbound.c:3951
 msgid "LAGCHECK, forces a new lag check"
 msgstr "LAGCHECK,强制进行延迟检查"
 
-#: ../src/common/outbound.c:3996
+#: ../src/common/outbound.c:3953
 msgid ""
 "LASTLOG [-h] [-m] [-r] [--] <string>, searches for a string in the buffer\n"
 "    Use -h to highlight the found string(s)\n"
@@ -582,174 +609,174 @@ msgid ""
 "    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
 msgstr "LASTLOG [-h] [-m] [-r] [--] <字符串>,在缓冲区中搜索该字符串\n    使用 -h 选项高亮显示搜索到的字符串(多个)\n    使用 -m 选项严格匹配大小写\n    使用 -r 选项将字符串作为正则表达式搜索\n    使用 -- (双破折号) 标记选项参数结束,例如要搜索的字符串是 '-r'"
 
-#: ../src/common/outbound.c:4002
+#: ../src/common/outbound.c:3959
 msgid "LOAD [-e] <file>, loads a plugin or script"
 msgstr "LOAD [-e] <文件>,载入插件或脚本"
 
-#: ../src/common/outbound.c:4005
+#: ../src/common/outbound.c:3962
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
 msgstr "MDEHOP,撤销当前频道中所有副管理员(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4007
+#: ../src/common/outbound.c:3964
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
 msgstr "MDEOP,撤销当前频道中所有管理员(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4009
+#: ../src/common/outbound.c:3966
 msgid ""
 "ME <action>, sends the action to the current channel (actions are written in"
 " the 3rd person, like /me jumps)"
 msgstr "ME <动作>,向当前频道中发送一个动作(动作使用英语的第 3 人称陈述,例如 /me 跳一下)"
 
-#: ../src/common/outbound.c:4013
+#: ../src/common/outbound.c:3970
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
 msgstr "MKICK,踢出当前频道中除您自己以外的所有用户(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4016
+#: ../src/common/outbound.c:3973
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
 msgstr "MOP,给当前频道中所有用户赋予管理员的身份(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4017
+#: ../src/common/outbound.c:3974
 msgid ""
 "MSG <nick> <message>, sends a private message, message \".\" to send to last"
 " nick or prefix with \"=\" for dcc chat"
 msgstr "MSG <昵称> <消息>,发送私信, 昵称为 \".\" 发送给上一个昵称的用户,或者以 \"=\" 开头发送 dcc 聊天"
 
-#: ../src/common/outbound.c:4020
+#: ../src/common/outbound.c:3977
 msgid "NAMES [channel], Lists the nicks on the channel"
 msgstr "NAMES [频道],列出该频道的所有昵称"
 
-#: ../src/common/outbound.c:4022
+#: ../src/common/outbound.c:3979
 msgid "NCTCP <nick> <message>, Sends a CTCP notice"
 msgstr "NCTCP <昵称> <消息>,给昵称为 <nick> 者发送一则 CTCP 通知"
 
-#: ../src/common/outbound.c:4023
+#: ../src/common/outbound.c:3980
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
 msgstr "NEWSERVER [-noconnect] <主机名> [<端口号>]"
 
-#: ../src/common/outbound.c:4024
+#: ../src/common/outbound.c:3981
 msgid "NICK <nickname>, sets your nick"
 msgstr "NICK <昵称>,设置您的昵称"
 
-#: ../src/common/outbound.c:4027
+#: ../src/common/outbound.c:3984
 msgid "NOTICE <nick/channel> <message>, sends a notice"
 msgstr "NOTICE <昵称/频道> <消息>,发送一条通知"
 
-#: ../src/common/outbound.c:4029
+#: ../src/common/outbound.c:3986
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
 msgstr "NOTIFY [-n 网络1[,网络2,...]] [<昵称>],列出您的通知列表,或在列表中添加某人"
 
-#: ../src/common/outbound.c:4031
+#: ../src/common/outbound.c:3988
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
 msgstr "OP <昵称>,委任 <昵称> 为频道管理员(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4033
+#: ../src/common/outbound.c:3990
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
 msgstr "PART [<频道>] [<离开原因>],离开频道,默认为当前的频道"
 
-#: ../src/common/outbound.c:4035
+#: ../src/common/outbound.c:3992
 msgid "PING <nick | channel>, CTCP pings nick or channel"
 msgstr "PING <昵称 | 频道>,向某位用户或频道发送 CTCP PING 消息"
 
-#: ../src/common/outbound.c:4037
+#: ../src/common/outbound.c:3994
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
 msgstr "QUERY [-nofocus] <昵称> [消息],打开新私聊窗口,选择性地发送信息"
 
-#: ../src/common/outbound.c:4039
+#: ../src/common/outbound.c:3996
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
 msgstr "QUIET <掩码> [<静默类型>],在服务器支持的情况下将当前服务器中满足掩码的每个人设为静默状态。"
 
-#: ../src/common/outbound.c:4041
+#: ../src/common/outbound.c:3998
 msgid "QUIT [<reason>], disconnects from the current server"
 msgstr "QUIT [<退出原因>],从与当前服务器断开连接"
 
-#: ../src/common/outbound.c:4043
+#: ../src/common/outbound.c:4000
 msgid "QUOTE <text>, sends the text in raw form to the server"
 msgstr "QUOTE <文本>,向服务器发送原始格式的文本"
 
-#: ../src/common/outbound.c:4046
+#: ../src/common/outbound.c:4003
 msgid ""
 "RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
 "/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
 "reconnect to all the open servers"
 msgstr "RECONNECT [-ssl] [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前的服务器或用 /RECONNECT ALL 重新连接所有服务器"
 
-#: ../src/common/outbound.c:4049
+#: ../src/common/outbound.c:4006
 msgid ""
 "RECONNECT [<host>] [<port>] [<password>], Can be called just as /RECONNECT "
 "to reconnect to the current server or with /RECONNECT ALL to reconnect to "
 "all the open servers"
 msgstr "RECONNECT [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前服务器或用 /RECONNECT ALL 重新连接所有服务器"
 
-#: ../src/common/outbound.c:4051
+#: ../src/common/outbound.c:4008
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
 msgstr "RECV <text>,向 HexChat 发送原始数据,就好像从 IRC 服务器上接收到的一样"
 
-#: ../src/common/outbound.c:4052
+#: ../src/common/outbound.c:4009
 msgid "RELOAD <name>, reloads a plugin or script"
 msgstr "RELOAD <名称>,重新载入插件/脚本"
 
-#: ../src/common/outbound.c:4054
+#: ../src/common/outbound.c:4011
 msgid "SAY <text>, sends the text to the object in the current window"
 msgstr "SAY <文本>,向当前窗口中的对象发送文本"
 
-#: ../src/common/outbound.c:4055
+#: ../src/common/outbound.c:4012
 msgid "SEND <nick> [<file>]"
 msgstr "SEND <昵称> [<文件>]"
 
-#: ../src/common/outbound.c:4058
+#: ../src/common/outbound.c:4015
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
 msgstr "SERVCHAN [-ssl] <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: ../src/common/outbound.c:4061
+#: ../src/common/outbound.c:4018
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
 msgstr "SERVCHAN <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: ../src/common/outbound.c:4065
+#: ../src/common/outbound.c:4022
 msgid ""
 "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the "
 "default port is 6667 for normal connections, and 6697 for ssl connections"
 msgstr "SERVER [-ssl] <主机> [<端口号>] [<密码>],连接到服务器。普通连接的默认端口是6667,SSL连接的默认端口是6697。"
 
-#: ../src/common/outbound.c:4068
+#: ../src/common/outbound.c:4025
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
 msgstr "SERVER <主机> [<端口号>] [<密码>],连接服务器。默认端口为 6667"
 
-#: ../src/common/outbound.c:4070
+#: ../src/common/outbound.c:4027
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
 msgstr "SET [-e] [-off|-on] [-quiet] <变量名> [<值>]"
 
-#: ../src/common/outbound.c:4071
+#: ../src/common/outbound.c:4028
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
 msgstr "SETCURSOR [-|+]<位置>,重新定位输入框中光标的位置。"
 
-#: ../src/common/outbound.c:4072
+#: ../src/common/outbound.c:4029
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
 msgstr "SETTAB <新名称>,改变选项卡的名字,tab_trunc 变量的限制仍然有效"
 
-#: ../src/common/outbound.c:4073
+#: ../src/common/outbound.c:4030
 msgid "SETTEXT <new text>, replace the text in the input box"
 msgstr "SETTEXT <新文本>,替换输入框中的文本"
 
-#: ../src/common/outbound.c:4076
+#: ../src/common/outbound.c:4033
 msgid ""
 "TOPIC [<topic>], sets the topic if one is given, else shows the current "
 "topic"
 msgstr "TOPIC [<频道主题>],设置频道主题,如果未指定内容则显示当前主题"
 
-#: ../src/common/outbound.c:4078
+#: ../src/common/outbound.c:4035
 msgid ""
 "\n"
 "TRAY -f <timeout> <file1> [<file2>] Blink tray between two icons.\n"
@@ -759,104 +786,142 @@ msgid ""
 "TRAY -b <title> <text>              Set the tray balloon."
 msgstr "\nTRAY -f <时间> <文件1> [<文件2>] 在托盘中使用两个图标进行闪烁。\nTRAY -f <文件名>                  设置托盘为固定图标。\nTRAY -i <数字>                    使用内部图标闪烁托盘。\nTRAY -t <文本>                      设置托盘工具提示。\nTRAY -b <标题> <文本>              设置托盘气泡通知。"
 
-#: ../src/common/outbound.c:4085
+#: ../src/common/outbound.c:4042
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
 msgstr "UNBAN <掩码> [<掩码>...],解禁指定的掩码。"
 
-#: ../src/common/outbound.c:4086
+#: ../src/common/outbound.c:4043
 msgid "UNIGNORE <mask> [QUIET]"
 msgstr "UNIGNORE <掩码> [QUIET]"
 
-#: ../src/common/outbound.c:4087
+#: ../src/common/outbound.c:4044
 msgid "UNLOAD <name>, unloads a plugin or script"
 msgstr "UNLOAD <名称>,卸载插件或脚本"
 
-#: ../src/common/outbound.c:4089
+#: ../src/common/outbound.c:4046
 msgid ""
 "UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
 " server."
 msgstr "UNQUIET <掩码> [<掩码>...],在服务器支持测情况下解除指定掩码的静默状态。"
 
-#: ../src/common/outbound.c:4090
+#: ../src/common/outbound.c:4047
 msgid "URL <url>, opens a URL in your browser"
 msgstr "URL <url>,在浏览器中打开 URL"
 
-#: ../src/common/outbound.c:4092
+#: ../src/common/outbound.c:4049
 msgid ""
 "USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
 "userlist"
 msgstr "USELECT [-a] [-s] <昵称1> <昵称2>...,在频道用户列表中以高亮度标示昵称"
 
-#: ../src/common/outbound.c:4095
+#: ../src/common/outbound.c:4052
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
 msgstr "VOICE <昵称>,给予昵称为 <昵称> 者发言权(需要具有频道管理员身份)"
 
-#: ../src/common/outbound.c:4097
+#: ../src/common/outbound.c:4054
 msgid "WALLCHAN <message>, writes the message to all channels"
 msgstr "WALLCHAN <消息>,发送信息到所有的频道"
 
-#: ../src/common/outbound.c:4099
+#: ../src/common/outbound.c:4056
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
 msgstr "WALLCHOP <消息>,给当前频道中所有管理员发送消息"
 
-#: ../src/common/outbound.c:4132
+#: ../src/common/outbound.c:4089
 #, c-format
 msgid "User Command for: %s\n"
 msgstr "用户命令:%s\n"
 
-#: ../src/common/outbound.c:4159
+#: ../src/common/outbound.c:4116
 #, c-format
 msgid "Usage: %s\n"
 msgstr "用法:%s\n"
 
-#: ../src/common/outbound.c:4164
+#: ../src/common/outbound.c:4121
 msgid ""
 "\n"
 "No help available on that command.\n"
 msgstr "\n没有关于该命令的帮助信息。\n"
 
-#: ../src/common/outbound.c:4170
+#: ../src/common/outbound.c:4127
 msgid "No such command.\n"
 msgstr "此命令不存在。\n"
 
-#: ../src/common/outbound.c:4506
+#: ../src/common/outbound.c:4460
 msgid "Bad arguments for user command.\n"
 msgstr "用户命令的参数有误。\n"
 
-#: ../src/common/outbound.c:4720
+#: ../src/common/outbound.c:4666
 msgid "Too many recursive usercommands, aborting."
 msgstr "用户命令产生太多递归,中止执行。"
 
-#: ../src/common/outbound.c:4825
-msgid "Unknown Command. Try /help\n"
-msgstr "未知命令。请尝试键入 /help\n"
+#: ../src/common/outbound.c:4755
+#, c-format
+msgid "Unknown Command %s. Try /help\n"
+msgstr "未知命令 %s。请尝试键入 /help\n"
 
-#: ../src/common/plugin.c:412 ../src/common/plugin.c:448
+#: ../src/common/plugin.c:401
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
 msgstr "无 hexchat_plugin_init 符号,这确实是 HexChat 的插件吗?"
 
-#: ../src/common/server.c:644
+#: ../src/common/plugin-identd.c:132
+#, c-format
+msgid "*\tServicing ident request from %s as %s"
+msgstr "*\t服务器识别需要从 %s 作为 %s"
+
+#: ../src/common/plugin-identd.c:195
+#, c-format
+msgid "*\tError starting identd server: %s"
+msgstr "*\t开始 identd 服务器错误: %s"
+
+#: ../src/common/plugin-identd.c:218
+msgid "IDENTD <port> <username>"
+msgstr "IDENTD <端口> <用户名>"
+
+#: ../src/common/plugin-timer.c:75
+#, c-format
+msgid "Timer %d deleted.\n"
+msgstr "定时器 %d 已删除。\n"
+
+#: ../src/common/plugin-timer.c:81
+msgid "No such ref number found.\n"
+msgstr "找不到此参考数字。\n"
+
+#: ../src/common/plugin-timer.c:145
+msgid "No timers installed.\n"
+msgstr "未安装定时器。\n"
+
+#. 00000 00000000 0000000 abc
+#: ../src/common/plugin-timer.c:150
+msgid " Ref#  Seconds  Repeat  Command \n"
+msgstr "重复命令的秒数\n"
+
+#: ../src/common/plugin-timer.c:155
+#, c-format
+msgid "%5d %8.1f %7d  %s\n"
+msgstr "%5d %8.1f %7d  %s\n"
+
+#: ../src/common/server.c:508
 msgid "Are you sure this is a SSL capable server and port?\n"
 msgstr "您确信该服务器的此端口支持 SSL?\n"
 
-#: ../src/common/server.c:1012
+#: ../src/common/server.c:866
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
 msgstr "无法解析主机名 %s\n请检查您的 IP 设置!\n"
 
-#: ../src/common/server.c:1017
+#: ../src/common/server.c:871
 msgid "Proxy traversal failed.\n"
 msgstr "代理传送失败。\n"
 
-#: ../src/common/servlist.c:762
+#: ../src/common/servlist.c:574
 #, c-format
 msgid "Cycling to next server in %s...\n"
 msgstr "跳转至 %s 的下一个服务器...\n"
 
-#: ../src/common/servlist.c:1404
+#: ../src/common/servlist.c:1199
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -985,7 +1050,7 @@ msgstr "%C22*%O$t%C26$1%O 给了 %C18$2%O 发言权"
 
 #: ../src/common/textevents.h:114
 msgid "%C23*%O$tConnected. Now logging in."
-msgstr "%C23*%O$tC 已连接。正在登录..."
+msgstr "%C23*%O$t 已连接。正在登录..."
 
 #: ../src/common/textevents.h:117
 msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
@@ -1367,1714 +1432,1712 @@ msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr "%C20*%O$t 您已改名为 %C18$2%O"
 
 #. get rid of the \n
-#: ../src/common/text.c:369
+#: ../src/common/text.c:365
 msgid "Loaded log from"
-msgstr "从以下位置载入聊天记录:"
+msgstr "从以下位置载入聊天记录"
 
-#: ../src/common/text.c:386
+#: ../src/common/text.c:382
 #, c-format
 msgid "**** ENDING LOGGING AT %s\n"
 msgstr "**** 聊天记录于 %s 结束记录\n"
 
-#: ../src/common/text.c:611
+#: ../src/common/text.c:575
 #, c-format
 msgid "**** BEGIN LOGGING AT %s\n"
 msgstr "**** 聊天记录于 %s 开始记录\n"
 
-#: ../src/common/text.c:630
+#: ../src/common/text.c:593
 #, c-format
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
 msgstr "* 无法以可写入方式打开日志(log)文件。\n请检查 %s 的权限"
 
-#: ../src/common/text.c:1020
+#: ../src/common/text.c:936
 msgid "Left message"
 msgstr "左侧信息"
 
-#: ../src/common/text.c:1021
+#: ../src/common/text.c:937
 msgid "Right message"
 msgstr "右侧信息"
 
-#: ../src/common/text.c:1026 ../src/common/text.c:1405
-#: ../src/common/text.c:1443 ../src/common/text.c:1448
-#: ../src/common/text.c:1489
+#: ../src/common/text.c:942 ../src/common/text.c:1321
+#: ../src/common/text.c:1359 ../src/common/text.c:1364
+#: ../src/common/text.c:1405
 msgid "IP address"
 msgstr "IP 地址"
 
-#: ../src/common/text.c:1027 ../src/common/text.c:1266
-#: ../src/common/text.c:1325 ../src/common/text.c:1332
+#: ../src/common/text.c:943 ../src/common/text.c:1182
+#: ../src/common/text.c:1241 ../src/common/text.c:1248
 msgid "Username"
 msgstr "用户名"
 
-#: ../src/common/text.c:1032
+#: ../src/common/text.c:948
 msgid "The nick of the joining person"
 msgstr "进入用户的昵称"
 
-#: ../src/common/text.c:1033
+#: ../src/common/text.c:949
 msgid "The channel being joined"
 msgstr "进入的频道"
 
-#: ../src/common/text.c:1034 ../src/common/text.c:1097
-#: ../src/common/text.c:1148
+#: ../src/common/text.c:950 ../src/common/text.c:1013
+#: ../src/common/text.c:1064
 msgid "The host of the person"
 msgstr "此人的主机名"
 
-#: ../src/common/text.c:1035
+#: ../src/common/text.c:951
 msgid "The account of the person"
-msgstr ""
-
-#: ../src/common/text.c:1039 ../src/common/text.c:1046
-#: ../src/common/text.c:1053 ../src/common/text.c:1265
-#: ../src/common/text.c:1272 ../src/common/text.c:1277
-#: ../src/common/text.c:1282 ../src/common/text.c:1287
-#: ../src/common/text.c:1293 ../src/common/text.c:1298
-#: ../src/common/text.c:1302 ../src/common/text.c:1308
-#: ../src/common/text.c:1314 ../src/common/text.c:1378
-#: ../src/common/text.c:1394 ../src/common/text.c:1399
-#: ../src/common/text.c:1404 ../src/common/text.c:1413
-#: ../src/common/text.c:1424 ../src/common/text.c:1431
-#: ../src/common/text.c:1437 ../src/common/text.c:1442
-#: ../src/common/text.c:1447 ../src/common/text.c:1454
-#: ../src/common/text.c:1460 ../src/common/text.c:1466
-#: ../src/common/text.c:1471 ../src/common/text.c:1476
-#: ../src/common/text.c:1480 ../src/common/text.c:1486
-#: ../src/common/text.c:1494 ../src/common/text.c:1498
-#: ../src/common/text.c:1533 ../src/common/text.c:1538
+msgstr "这个人的帐号"
+
+#: ../src/common/text.c:955 ../src/common/text.c:962 ../src/common/text.c:969
+#: ../src/common/text.c:1181 ../src/common/text.c:1188
+#: ../src/common/text.c:1193 ../src/common/text.c:1198
+#: ../src/common/text.c:1203 ../src/common/text.c:1209
+#: ../src/common/text.c:1214 ../src/common/text.c:1218
+#: ../src/common/text.c:1224 ../src/common/text.c:1230
+#: ../src/common/text.c:1294 ../src/common/text.c:1310
+#: ../src/common/text.c:1315 ../src/common/text.c:1320
+#: ../src/common/text.c:1329 ../src/common/text.c:1340
+#: ../src/common/text.c:1347 ../src/common/text.c:1353
+#: ../src/common/text.c:1358 ../src/common/text.c:1363
+#: ../src/common/text.c:1370 ../src/common/text.c:1376
+#: ../src/common/text.c:1382 ../src/common/text.c:1387
+#: ../src/common/text.c:1392 ../src/common/text.c:1396
+#: ../src/common/text.c:1402 ../src/common/text.c:1410
+#: ../src/common/text.c:1414 ../src/common/text.c:1449
+#: ../src/common/text.c:1454
 msgid "Nickname"
 msgstr "昵称"
 
-#: ../src/common/text.c:1040
+#: ../src/common/text.c:956
 msgid "The action"
 msgstr "动作"
 
-#: ../src/common/text.c:1041 ../src/common/text.c:1048
+#: ../src/common/text.c:957 ../src/common/text.c:964
 msgid "Mode char"
 msgstr "模式字符"
 
-#: ../src/common/text.c:1042 ../src/common/text.c:1049
-#: ../src/common/text.c:1055
+#: ../src/common/text.c:958 ../src/common/text.c:965 ../src/common/text.c:971
 msgid "Identified text"
 msgstr "验证文本"
 
-#: ../src/common/text.c:1047
+#: ../src/common/text.c:963
 msgid "The text"
 msgstr "文本"
 
-#: ../src/common/text.c:1054 ../src/common/text.c:1125
-#: ../src/common/text.c:1131
+#: ../src/common/text.c:970 ../src/common/text.c:1041
+#: ../src/common/text.c:1047
 msgid "The message"
 msgstr "信息"
 
-#: ../src/common/text.c:1059 ../src/common/text.c:1064
-#: ../src/common/text.c:1330 ../src/common/text.c:1338
-#: ../src/common/text.c:1344 ../src/common/text.c:1350
-#: ../src/common/text.c:1379 ../src/common/text.c:1507
-#: ../src/common/text.c:1549
+#: ../src/common/text.c:975 ../src/common/text.c:980 ../src/common/text.c:1246
+#: ../src/common/text.c:1254 ../src/common/text.c:1260
+#: ../src/common/text.c:1266 ../src/common/text.c:1295
+#: ../src/common/text.c:1423 ../src/common/text.c:1465
 msgid "Server Name"
 msgstr "服务器名"
 
-#: ../src/common/text.c:1060
+#: ../src/common/text.c:976
 msgid "Acknowledged Capabilities"
 msgstr "已知能力"
 
-#: ../src/common/text.c:1065
+#: ../src/common/text.c:981
 msgid "Server Capabilities"
 msgstr "服务器能力"
 
-#: ../src/common/text.c:1069
+#: ../src/common/text.c:985
 msgid "Requested Capabilities"
 msgstr "请求能力"
 
-#: ../src/common/text.c:1073 ../src/common/text.c:1135
+#: ../src/common/text.c:989 ../src/common/text.c:1051
 msgid "Old nickname"
 msgstr "原昵称"
 
-#: ../src/common/text.c:1074 ../src/common/text.c:1136
+#: ../src/common/text.c:990 ../src/common/text.c:1052
 msgid "New nickname"
 msgstr "新昵称"
 
-#: ../src/common/text.c:1078
+#: ../src/common/text.c:994
 msgid "Nick of person who changed the topic"
 msgstr "更改主题的用户"
 
-#: ../src/common/text.c:1079 ../src/common/text.c:1085
+#: ../src/common/text.c:995 ../src/common/text.c:1001
 #: ../src/fe-gtk/chanlist.c:779 ../src/fe-gtk/chanlist.c:881
-#: ../src/fe-gtk/setup.c:335
+#: ../src/fe-gtk/setup.c:338
 msgid "Topic"
 msgstr "主题"
 
-#: ../src/common/text.c:1080 ../src/common/text.c:1084
-#: ../src/common/text.c:1553 ../src/fe-gtk/chanlist.c:777
-#: ../src/fe-gtk/ignoregui.c:159 ../src/fe-gtk/servlistgui.c:1785
+#: ../src/common/text.c:996 ../src/common/text.c:1000
+#: ../src/common/text.c:1469 ../src/fe-gtk/chanlist.c:777
+#: ../src/fe-gtk/ignoregui.c:159 ../src/fe-gtk/servlistgui.c:1783
 msgid "Channel"
 msgstr "频道"
 
-#: ../src/common/text.c:1089 ../src/common/text.c:1142
+#: ../src/common/text.c:1005 ../src/common/text.c:1058
 msgid "The nickname of the kicker"
 msgstr "能踢人的用户"
 
-#: ../src/common/text.c:1090 ../src/common/text.c:1140
+#: ../src/common/text.c:1006 ../src/common/text.c:1056
 msgid "The person being kicked"
 msgstr "被踢者"
 
-#: ../src/common/text.c:1091 ../src/common/text.c:1098
-#: ../src/common/text.c:1102 ../src/common/text.c:1107
-#: ../src/common/text.c:1141 ../src/common/text.c:1149
-#: ../src/common/text.c:1156
+#: ../src/common/text.c:1007 ../src/common/text.c:1014
+#: ../src/common/text.c:1018 ../src/common/text.c:1023
+#: ../src/common/text.c:1057 ../src/common/text.c:1065
+#: ../src/common/text.c:1072
 msgid "The channel"
 msgstr "频道"
 
-#: ../src/common/text.c:1092 ../src/common/text.c:1143
-#: ../src/common/text.c:1150
+#: ../src/common/text.c:1008 ../src/common/text.c:1059
+#: ../src/common/text.c:1066
 msgid "The reason"
 msgstr "原因"
 
-#: ../src/common/text.c:1096 ../src/common/text.c:1147
+#: ../src/common/text.c:1012 ../src/common/text.c:1063
 msgid "The nick of the person leaving"
 msgstr "离开的用户"
 
-#: ../src/common/text.c:1103 ../src/common/text.c:1109
+#: ../src/common/text.c:1019 ../src/common/text.c:1025
 msgid "The time"
 msgstr "时间"
 
-#: ../src/common/text.c:1108
+#: ../src/common/text.c:1024
 msgid "The creator"
 msgstr "建立者"
 
-#: ../src/common/text.c:1113 ../src/fe-gtk/dccgui.c:822
-#: ../src/fe-gtk/dccgui.c:1057
+#: ../src/common/text.c:1029 ../src/fe-gtk/dccgui.c:821
+#: ../src/fe-gtk/dccgui.c:1056
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/common/text.c:1114 ../src/common/text.c:1400
+#: ../src/common/text.c:1030 ../src/common/text.c:1316
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/common/text.c:1115 ../src/common/text.c:1267
-#: ../src/common/text.c:1368
+#: ../src/common/text.c:1031 ../src/common/text.c:1183
+#: ../src/common/text.c:1284
 msgid "Host"
 msgstr "主机"
 
-#: ../src/common/text.c:1119 ../src/common/text.c:1124
-#: ../src/common/text.c:1129
+#: ../src/common/text.c:1035 ../src/common/text.c:1040
+#: ../src/common/text.c:1045
 msgid "Who it's from"
 msgstr "来自于"
 
-#: ../src/common/text.c:1120
+#: ../src/common/text.c:1036
 msgid "The time in x.x format (see below)"
 msgstr "时间格式为 x.x (见下)"
 
-#: ../src/common/text.c:1130 ../src/common/text.c:1167
+#: ../src/common/text.c:1046 ../src/common/text.c:1083
 msgid "The Channel it's going to"
 msgstr "要进入的频道"
 
-#: ../src/common/text.c:1154
+#: ../src/common/text.c:1070
 msgid "The sound"
 msgstr "声音"
 
-#: ../src/common/text.c:1155 ../src/common/text.c:1161
-#: ../src/common/text.c:1166
+#: ../src/common/text.c:1071 ../src/common/text.c:1077
+#: ../src/common/text.c:1082
 msgid "The nick of the person"
 msgstr "此人的昵称"
 
-#: ../src/common/text.c:1160 ../src/common/text.c:1165
+#: ../src/common/text.c:1076 ../src/common/text.c:1081
 msgid "The CTCP event"
 msgstr "CTCP 事件"
 
-#: ../src/common/text.c:1171
+#: ../src/common/text.c:1087
 msgid "The nick of the person who set the key"
 msgstr "设置密码的用户"
 
-#: ../src/common/text.c:1172
+#: ../src/common/text.c:1088
 msgid "The key"
 msgstr "密码"
 
-#: ../src/common/text.c:1176
+#: ../src/common/text.c:1092
 msgid "The nick of the person who set the limit"
 msgstr "设置限制的用户"
 
-#: ../src/common/text.c:1177
+#: ../src/common/text.c:1093
 msgid "The limit"
 msgstr "限制"
 
-#: ../src/common/text.c:1181
+#: ../src/common/text.c:1097
 msgid "The nick of the person who did the op'ing"
 msgstr "使用了 op 命令的用户"
 
-#: ../src/common/text.c:1182
+#: ../src/common/text.c:1098
 msgid "The nick of the person who has been op'ed"
 msgstr "被授予管理员身份的用户"
 
-#: ../src/common/text.c:1186
+#: ../src/common/text.c:1102
 msgid "The nick of the person who has been halfop'ed"
 msgstr "被授予副管理员身份的用户"
 
-#: ../src/common/text.c:1187
+#: ../src/common/text.c:1103
 msgid "The nick of the person who did the halfop'ing"
 msgstr "使用 halfop 命令的用户"
 
-#: ../src/common/text.c:1191
+#: ../src/common/text.c:1107
 msgid "The nick of the person who did the voice'ing"
 msgstr "使用 voice 命令的用户"
 
-#: ../src/common/text.c:1192
+#: ../src/common/text.c:1108
 msgid "The nick of the person who has been voice'ed"
 msgstr "被赋予发言权的用户"
 
-#: ../src/common/text.c:1196
+#: ../src/common/text.c:1112
 msgid "The nick of the person who did the banning"
 msgstr "使用 ban 命令的用户"
 
-#: ../src/common/text.c:1197 ../src/common/text.c:1229
+#: ../src/common/text.c:1113 ../src/common/text.c:1145
 msgid "The ban mask"
 msgstr "ban 掩码"
 
-#: ../src/common/text.c:1201
+#: ../src/common/text.c:1117
 msgid "The nick of the person who did the quieting"
 msgstr "使用了静默选项的用户昵称"
 
-#: ../src/common/text.c:1202 ../src/common/text.c:1234
+#: ../src/common/text.c:1118 ../src/common/text.c:1150
 msgid "The quiet mask"
 msgstr "quiet 掩码"
 
-#: ../src/common/text.c:1206
+#: ../src/common/text.c:1122
 msgid "The nick who removed the key"
 msgstr "取消密码的用户"
 
-#: ../src/common/text.c:1210
+#: ../src/common/text.c:1126
 msgid "The nick who removed the limit"
 msgstr "取消用户限制的用户"
 
-#: ../src/common/text.c:1214
-msgid "The nick of the person of did the deop'ing"
+#: ../src/common/text.c:1130
+msgid "The nick of the person who did the deop'ing"
 msgstr "使用 deop 命令的用户"
 
-#: ../src/common/text.c:1215
+#: ../src/common/text.c:1131
 msgid "The nick of the person who has been deop'ed"
 msgstr "被取消管理员身份的用户"
 
-#: ../src/common/text.c:1218
-msgid "The nick of the person of did the dehalfop'ing"
+#: ../src/common/text.c:1134
+msgid "The nick of the person who did the dehalfop'ing"
 msgstr "使用 dehalfop 命令的用户"
 
-#: ../src/common/text.c:1219
+#: ../src/common/text.c:1135
 msgid "The nick of the person who has been dehalfop'ed"
 msgstr "被取消副管理员身份的用户"
 
-#: ../src/common/text.c:1223
-msgid "The nick of the person of did the devoice'ing"
+#: ../src/common/text.c:1139
+msgid "The nick of the person who did the devoice'ing"
 msgstr "使用 devoice 命令的用户"
 
-#: ../src/common/text.c:1224
+#: ../src/common/text.c:1140
 msgid "The nick of the person who has been devoice'ed"
 msgstr "被取消发言权的用户"
 
-#: ../src/common/text.c:1228
-msgid "The nick of the person of did the unban'ing"
+#: ../src/common/text.c:1144
+msgid "The nick of the person who did the unban'ing"
 msgstr "使用 unban 命令的用户"
 
-#: ../src/common/text.c:1233
-msgid "The nick of the person of did the unquiet'ing"
+#: ../src/common/text.c:1149
+msgid "The nick of the person who did the unquiet'ing"
 msgstr "使用了 unquiet 选项的用户昵称"
 
-#: ../src/common/text.c:1238
+#: ../src/common/text.c:1154
 msgid "The nick of the person who did the exempt"
 msgstr "使用 exempt 命令的用户"
 
-#: ../src/common/text.c:1239 ../src/common/text.c:1244
+#: ../src/common/text.c:1155 ../src/common/text.c:1160
 msgid "The exempt mask"
 msgstr "exempt 掩码"
 
-#: ../src/common/text.c:1243
+#: ../src/common/text.c:1159
 msgid "The nick of the person removed the exempt"
 msgstr "取消 exempt 的用户"
 
-#: ../src/common/text.c:1248
+#: ../src/common/text.c:1164
 msgid "The nick of the person who did the invite"
 msgstr "使用 invite 命令的用户"
 
-#: ../src/common/text.c:1249 ../src/common/text.c:1254
+#: ../src/common/text.c:1165 ../src/common/text.c:1170
 msgid "The invite mask"
 msgstr "invite 掩码"
 
-#: ../src/common/text.c:1253
+#: ../src/common/text.c:1169
 msgid "The nick of the person removed the invite"
 msgstr "取消 invite 的用户"
 
-#: ../src/common/text.c:1258
+#: ../src/common/text.c:1174
 msgid "The nick of the person setting the mode"
 msgstr "设置模式的用户"
 
-#: ../src/common/text.c:1259
+#: ../src/common/text.c:1175
 msgid "The mode's sign (+/-)"
 msgstr "模式符号(+/-)"
 
-#: ../src/common/text.c:1260
+#: ../src/common/text.c:1176
 msgid "The mode letter"
 msgstr "模式字符"
 
-#: ../src/common/text.c:1261
+#: ../src/common/text.c:1177
 msgid "The channel it's being set on"
 msgstr "被设置的频道"
 
-#: ../src/common/text.c:1268
+#: ../src/common/text.c:1184
 msgid "Full name"
 msgstr "全名"
 
-#: ../src/common/text.c:1273
+#: ../src/common/text.c:1189
 msgid "Channel Membership/\"is an IRC operator\""
 msgstr "频道成员/“是 IRC 管理员”"
 
-#: ../src/common/text.c:1278
+#: ../src/common/text.c:1194
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../src/common/text.c:1283 ../src/common/text.c:1288
+#: ../src/common/text.c:1199 ../src/common/text.c:1204
 msgid "Idle time"
 msgstr "发呆时间"
 
-#: ../src/common/text.c:1289
+#: ../src/common/text.c:1205
 msgid "Signon time"
 msgstr "登录时间"
 
-#: ../src/common/text.c:1294
+#: ../src/common/text.c:1210
 msgid "Away reason"
 msgstr "离开原因"
 
-#: ../src/common/text.c:1303 ../src/common/text.c:1309
-#: ../src/common/text.c:1317 ../src/common/text.c:1333
-#: ../src/common/text.c:1525
+#: ../src/common/text.c:1219 ../src/common/text.c:1225
+#: ../src/common/text.c:1233 ../src/common/text.c:1249
+#: ../src/common/text.c:1441
 msgid "Message"
 msgstr "信息"
 
-#: ../src/common/text.c:1310
+#: ../src/common/text.c:1226
 msgid "Account"
 msgstr "帐户"
 
-#: ../src/common/text.c:1315
+#: ../src/common/text.c:1231
 msgid "Real user@host"
 msgstr "真实 user@host"
 
-#: ../src/common/text.c:1316
+#: ../src/common/text.c:1232
 msgid "Real IP"
 msgstr "真实 IP"
 
-#: ../src/common/text.c:1321 ../src/common/text.c:1348
-#: ../src/common/text.c:1354 ../src/common/text.c:1384
-#: ../src/common/text.c:1389 ../src/common/text.c:1548
+#: ../src/common/text.c:1237 ../src/common/text.c:1264
+#: ../src/common/text.c:1270 ../src/common/text.c:1300
+#: ../src/common/text.c:1305 ../src/common/text.c:1464
 msgid "Channel Name"
 msgstr "频道名"
 
-#: ../src/common/text.c:1326
+#: ../src/common/text.c:1242
 msgid "Mechanism"
 msgstr "机制"
 
-#: ../src/common/text.c:1331 ../src/common/text.c:1339
+#: ../src/common/text.c:1247 ../src/common/text.c:1255
 msgid "Raw Numeric or Identifier"
 msgstr "原始数字/标识符"
 
-#: ../src/common/text.c:1337 ../src/common/text.c:1343
-#: ../src/common/text.c:1511 ../src/fe-gtk/menu.c:1541
-#: ../src/fe-gtk/menu.c:1781 ../src/fe-gtk/setup.c:214
-#: ../src/fe-gtk/textgui.c:382
+#: ../src/common/text.c:1253 ../src/common/text.c:1259
+#: ../src/common/text.c:1427 ../src/fe-gtk/menu.c:1541
+#: ../src/fe-gtk/menu.c:1781 ../src/fe-gtk/setup.c:216
+#: ../src/fe-gtk/textgui.c:378
 msgid "Text"
 msgstr "文本"
 
-#: ../src/common/text.c:1349
+#: ../src/common/text.c:1265
 msgid "Nick of person who invited you"
 msgstr "邀请您的用户"
 
-#: ../src/common/text.c:1355 ../src/fe-gtk/chanlist.c:778
+#: ../src/common/text.c:1271 ../src/fe-gtk/chanlist.c:778
 msgid "Users"
 msgstr "用户"
 
-#: ../src/common/text.c:1359
+#: ../src/common/text.c:1275
 msgid "Nickname in use"
 msgstr "昵称已被使用"
 
-#: ../src/common/text.c:1360
+#: ../src/common/text.c:1276
 msgid "Nick being tried"
 msgstr "已尝试过的昵称"
 
-#: ../src/common/text.c:1369 ../src/common/text.c:1515
+#: ../src/common/text.c:1285 ../src/common/text.c:1431
 msgid "IP"
 msgstr "IP"
 
-#: ../src/common/text.c:1370 ../src/common/text.c:1406
+#: ../src/common/text.c:1286 ../src/common/text.c:1322
 msgid "Port"
 msgstr "端口"
 
-#: ../src/common/text.c:1380 ../src/fe-gtk/notifygui.c:125
-#: ../src/fe-gtk/setup.c:1820
+#: ../src/common/text.c:1296 ../src/fe-gtk/notifygui.c:125
+#: ../src/fe-gtk/setup.c:1878
 msgid "Network"
 msgstr "网络"
 
-#: ../src/common/text.c:1385 ../src/common/text.c:1395
+#: ../src/common/text.c:1301 ../src/common/text.c:1311
 msgid "Modes string"
 msgstr "模式字符串"
 
-#: ../src/common/text.c:1390 ../src/fe-gtk/urlgrab.c:96
+#: ../src/common/text.c:1306 ../src/fe-gtk/urlgrab.c:96
 msgid "URL"
 msgstr "URL"
 
-#: ../src/common/text.c:1411 ../src/common/text.c:1436
+#: ../src/common/text.c:1327 ../src/common/text.c:1352
 msgid "DCC Type"
 msgstr "DCC 类型"
 
-#: ../src/common/text.c:1412 ../src/common/text.c:1417
-#: ../src/common/text.c:1422 ../src/common/text.c:1429
-#: ../src/common/text.c:1449 ../src/common/text.c:1453
-#: ../src/common/text.c:1459 ../src/common/text.c:1465
-#: ../src/common/text.c:1472 ../src/common/text.c:1481
-#: ../src/common/text.c:1487
+#: ../src/common/text.c:1328 ../src/common/text.c:1333
+#: ../src/common/text.c:1338 ../src/common/text.c:1345
+#: ../src/common/text.c:1365 ../src/common/text.c:1369
+#: ../src/common/text.c:1375 ../src/common/text.c:1381
+#: ../src/common/text.c:1388 ../src/common/text.c:1397
+#: ../src/common/text.c:1403
 msgid "Filename"
 msgstr "文件名"
 
-#: ../src/common/text.c:1423 ../src/common/text.c:1430
+#: ../src/common/text.c:1339 ../src/common/text.c:1346
 msgid "Destination filename"
 msgstr "目标文件名"
 
-#: ../src/common/text.c:1432 ../src/common/text.c:1461
+#: ../src/common/text.c:1348 ../src/common/text.c:1377
 msgid "CPS"
 msgstr "CPS"
 
-#: ../src/common/text.c:1467
+#: ../src/common/text.c:1383
 msgid "Pathname"
 msgstr "路径名"
 
-#: ../src/common/text.c:1482 ../src/fe-gtk/dccgui.c:818
+#: ../src/common/text.c:1398 ../src/fe-gtk/dccgui.c:817
 msgid "Position"
 msgstr "位置"
 
-#: ../src/common/text.c:1488 ../src/fe-gtk/dccgui.c:817
+#: ../src/common/text.c:1404 ../src/fe-gtk/dccgui.c:816
 msgid "Size"
 msgstr "大小"
 
-#: ../src/common/text.c:1493
+#: ../src/common/text.c:1409
 msgid "DCC String"
 msgstr "DCC 字符串"
 
-#: ../src/common/text.c:1499
+#: ../src/common/text.c:1415
 msgid "Away Reason"
 msgstr "离开原因"
 
-#: ../src/common/text.c:1503
+#: ../src/common/text.c:1419
 msgid "Number of notify items"
 msgstr "通知条目数"
 
-#: ../src/common/text.c:1519
+#: ../src/common/text.c:1435
 msgid "Old Filename"
 msgstr "原文件名"
 
-#: ../src/common/text.c:1520
+#: ../src/common/text.c:1436
 msgid "New Filename"
 msgstr "新文件名"
 
-#: ../src/common/text.c:1524
+#: ../src/common/text.c:1440
 msgid "Receiver"
 msgstr "接收者"
 
-#: ../src/common/text.c:1529
+#: ../src/common/text.c:1445
 msgid "Hostmask"
 msgstr "主机掩码"
 
-#: ../src/common/text.c:1534
+#: ../src/common/text.c:1450
 msgid "Hostname"
 msgstr "主机名"
 
-#: ../src/common/text.c:1539
+#: ../src/common/text.c:1455
 msgid "The Packet"
 msgstr "包"
 
-#: ../src/common/text.c:1543
+#: ../src/common/text.c:1459
 msgid "Seconds"
 msgstr "秒"
 
-#: ../src/common/text.c:1547
+#: ../src/common/text.c:1463
 msgid "Nick of person who have been invited"
 msgstr "被邀请的用户"
 
-#: ../src/common/text.c:1554
+#: ../src/common/text.c:1470
 msgid "Banmask"
 msgstr "屏蔽掩码"
 
-#: ../src/common/text.c:1555
+#: ../src/common/text.c:1471
 msgid "Who set the ban"
 msgstr "设置屏蔽的用户"
 
-#: ../src/common/text.c:1556
+#: ../src/common/text.c:1472
 msgid "Ban time"
 msgstr "屏蔽时间"
 
-#: ../src/common/text.c:1596
+#: ../src/common/text.c:1510
 #, c-format
 msgid ""
 "Error parsing event %s.\n"
 "Loading default."
 msgstr "解析事件 %s 出错。\n正在载入默认值。"
 
-#: ../src/common/text.c:2334
+#: ../src/common/text.c:2214
 #, c-format
 msgid ""
 "Cannot read sound file:\n"
 "%s"
 msgstr "无法读取声音文件:\n%s"
 
-#: ../src/common/util.c:313
+#: ../src/common/util.c:121
 msgid "Remote host closed socket"
 msgstr "远程主机已关闭套接字"
 
-#: ../src/common/util.c:318
+#: ../src/common/util.c:126
 msgid "Connection refused"
 msgstr "连接被拒绝"
 
-#: ../src/common/util.c:321
+#: ../src/common/util.c:129
 msgid "No route to host"
 msgstr "没有到主机的路由"
 
-#: ../src/common/util.c:323
+#: ../src/common/util.c:131
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: ../src/common/util.c:325
+#: ../src/common/util.c:133
 msgid "Cannot assign that address"
 msgstr "无法分配该地址"
 
-#: ../src/common/util.c:327
+#: ../src/common/util.c:135
 msgid "Connection reset by peer"
 msgstr "连接被重置"
 
-#: ../src/common/util.c:985
+#: ../src/common/util.c:687
 msgid "Ascension Island"
 msgstr "阿森松岛"
 
-#: ../src/common/util.c:986
+#: ../src/common/util.c:688
 msgid "Andorra"
 msgstr "安道尔"
 
-#: ../src/common/util.c:987
+#: ../src/common/util.c:689
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
-#: ../src/common/util.c:988
+#: ../src/common/util.c:690
 msgid "Aviation-Related Fields"
 msgstr "航空相关领域"
 
-#: ../src/common/util.c:989
+#: ../src/common/util.c:691
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: ../src/common/util.c:990
+#: ../src/common/util.c:692
 msgid "Antigua and Barbuda"
 msgstr "安提瓜和巴布达"
 
-#: ../src/common/util.c:991
+#: ../src/common/util.c:693
 msgid "Anguilla"
 msgstr "安圭拉岛"
 
-#: ../src/common/util.c:992
+#: ../src/common/util.c:694
 msgid "Albania"
 msgstr "阿尔巴尼亚"
 
-#: ../src/common/util.c:993
+#: ../src/common/util.c:695
 msgid "Armenia"
 msgstr "亚美尼亚"
 
-#: ../src/common/util.c:994
+#: ../src/common/util.c:696
 msgid "Netherlands Antilles"
 msgstr "荷属安的列斯群岛"
 
-#: ../src/common/util.c:995
+#: ../src/common/util.c:697
 msgid "Angola"
 msgstr "安哥拉"
 
-#: ../src/common/util.c:996
+#: ../src/common/util.c:698
 msgid "Antarctica"
 msgstr "南极洲"
 
-#: ../src/common/util.c:997
+#: ../src/common/util.c:699
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: ../src/common/util.c:998
+#: ../src/common/util.c:700
 msgid "Reverse DNS"
 msgstr "反向 DNS"
 
-#: ../src/common/util.c:999
+#: ../src/common/util.c:701
 msgid "American Samoa"
 msgstr "美属萨摩亚"
 
-#: ../src/common/util.c:1000
+#: ../src/common/util.c:702
 msgid "Asia-Pacific Region"
 msgstr "亚太区"
 
-#: ../src/common/util.c:1001
+#: ../src/common/util.c:703
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../src/common/util.c:1002
+#: ../src/common/util.c:704
 msgid "Nato Fiel"
 msgstr "北大西洋公约组织"
 
-#: ../src/common/util.c:1003
+#: ../src/common/util.c:705
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../src/common/util.c:1004
+#: ../src/common/util.c:706
 msgid "Aruba"
 msgstr "阿鲁巴"
 
-#: ../src/common/util.c:1005
+#: ../src/common/util.c:707
 msgid "Aland Islands"
 msgstr "奥兰群岛"
 
-#: ../src/common/util.c:1006
+#: ../src/common/util.c:708
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
-#: ../src/common/util.c:1007
+#: ../src/common/util.c:709
 msgid "Bosnia and Herzegovina"
 msgstr "波斯尼亚和黑塞哥维那"
 
-#: ../src/common/util.c:1008
+#: ../src/common/util.c:710
 msgid "Barbados"
 msgstr "巴巴多斯"
 
-#: ../src/common/util.c:1009
+#: ../src/common/util.c:711
 msgid "Bangladesh"
 msgstr "孟加拉国"
 
-#: ../src/common/util.c:1010
+#: ../src/common/util.c:712
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../src/common/util.c:1011
+#: ../src/common/util.c:713
 msgid "Burkina Faso"
 msgstr "布基纳法索"
 
-#: ../src/common/util.c:1012
+#: ../src/common/util.c:714
 msgid "Bulgaria"
 msgstr "保加利亚"
 
-#: ../src/common/util.c:1013
+#: ../src/common/util.c:715
 msgid "Bahrain"
 msgstr "巴林"
 
-#: ../src/common/util.c:1014
+#: ../src/common/util.c:716
 msgid "Burundi"
 msgstr "布隆迪"
 
-#: ../src/common/util.c:1015
+#: ../src/common/util.c:717
 msgid "Businesses"
 msgstr "商业"
 
-#: ../src/common/util.c:1016
+#: ../src/common/util.c:718
 msgid "Benin"
 msgstr "贝宁"
 
-#: ../src/common/util.c:1017
+#: ../src/common/util.c:719
 msgid "Bermuda"
 msgstr "百慕大群岛"
 
-#: ../src/common/util.c:1018
+#: ../src/common/util.c:720
 msgid "Brunei Darussalam"
 msgstr "文莱"
 
-#: ../src/common/util.c:1019
+#: ../src/common/util.c:721
 msgid "Bolivia"
 msgstr "玻利维亚"
 
-#: ../src/common/util.c:1020
+#: ../src/common/util.c:722
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../src/common/util.c:1021
+#: ../src/common/util.c:723
 msgid "Bahamas"
 msgstr "巴哈马群岛"
 
-#: ../src/common/util.c:1022
+#: ../src/common/util.c:724
 msgid "Bhutan"
 msgstr "不丹"
 
-#: ../src/common/util.c:1023
+#: ../src/common/util.c:725
 msgid "Bouvet Island"
 msgstr "布韦岛"
 
-#: ../src/common/util.c:1024
+#: ../src/common/util.c:726
 msgid "Botswana"
 msgstr "博茨瓦纳"
 
-#: ../src/common/util.c:1025
+#: ../src/common/util.c:727
 msgid "Belarus"
 msgstr "白俄罗斯"
 
-#: ../src/common/util.c:1026
+#: ../src/common/util.c:728
 msgid "Belize"
 msgstr "伯利兹"
 
-#: ../src/common/util.c:1027
+#: ../src/common/util.c:729
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../src/common/util.c:1028 ../src/fe-gtk/setup.c:96
+#: ../src/common/util.c:730 ../src/fe-gtk/setup.c:98
 msgid "Catalan"
 msgstr "加泰罗尼亚"
 
-#: ../src/common/util.c:1029
+#: ../src/common/util.c:731
 msgid "Cocos Islands"
 msgstr "科科斯群岛"
 
-#: ../src/common/util.c:1030
+#: ../src/common/util.c:732
 msgid "Democratic Republic of Congo"
 msgstr "刚果民主共和国"
 
-#: ../src/common/util.c:1031
+#: ../src/common/util.c:733
 msgid "Central African Republic"
 msgstr "中非共和国"
 
-#: ../src/common/util.c:1032
+#: ../src/common/util.c:734
 msgid "Congo"
 msgstr "刚果"
 
-#: ../src/common/util.c:1033
+#: ../src/common/util.c:735
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../src/common/util.c:1034
+#: ../src/common/util.c:736
 msgid "Cote d'Ivoire"
 msgstr "科特迪瓦共和国"
 
-#: ../src/common/util.c:1035
+#: ../src/common/util.c:737
 msgid "Cook Islands"
 msgstr "库克群岛"
 
-#: ../src/common/util.c:1036
+#: ../src/common/util.c:738
 msgid "Chile"
 msgstr "智利"
 
-#: ../src/common/util.c:1037
+#: ../src/common/util.c:739
 msgid "Cameroon"
 msgstr "喀麦隆"
 
-#: ../src/common/util.c:1038
+#: ../src/common/util.c:740
 msgid "China"
 msgstr "中国"
 
-#: ../src/common/util.c:1039
+#: ../src/common/util.c:741
 msgid "Colombia"
 msgstr "哥伦比亚"
 
-#: ../src/common/util.c:1040
+#: ../src/common/util.c:742
 msgid "Internic Commercial"
 msgstr "Internic 商业组织"
 
-#: ../src/common/util.c:1041
+#: ../src/common/util.c:743
 msgid "Cooperatives"
 msgstr "联合体"
 
-#: ../src/common/util.c:1042
+#: ../src/common/util.c:744
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../src/common/util.c:1043
+#: ../src/common/util.c:745
 msgid "Serbia and Montenegro"
 msgstr "塞尔维亚和黑山"
 
-#: ../src/common/util.c:1044
+#: ../src/common/util.c:746
 msgid "Cuba"
 msgstr "古巴"
 
-#: ../src/common/util.c:1045
+#: ../src/common/util.c:747
 msgid "Cape Verde"
 msgstr "佛得角"
 
-#: ../src/common/util.c:1046
+#: ../src/common/util.c:748
 msgid "Christmas Island"
 msgstr "圣诞岛"
 
-#: ../src/common/util.c:1047
+#: ../src/common/util.c:749
 msgid "Cyprus"
 msgstr "塞浦路斯"
 
-#: ../src/common/util.c:1048
+#: ../src/common/util.c:750
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../src/common/util.c:1049
+#: ../src/common/util.c:751
 msgid "East Germany"
 msgstr "东德"
 
-#: ../src/common/util.c:1050
+#: ../src/common/util.c:752
 msgid "Germany"
 msgstr "德国"
 
-#: ../src/common/util.c:1051
+#: ../src/common/util.c:753
 msgid "Djibouti"
 msgstr "吉布提"
 
-#: ../src/common/util.c:1052
+#: ../src/common/util.c:754
 msgid "Denmark"
 msgstr "丹麦"
 
-#: ../src/common/util.c:1053
+#: ../src/common/util.c:755
 msgid "Dominica"
 msgstr "多米尼克"
 
-#: ../src/common/util.c:1054
+#: ../src/common/util.c:756
 msgid "Dominican Republic"
 msgstr "多米尼加共和国"
 
-#: ../src/common/util.c:1055
+#: ../src/common/util.c:757
 msgid "Algeria"
 msgstr "阿尔及利亚"
 
-#: ../src/common/util.c:1056
+#: ../src/common/util.c:758
 msgid "Ecuador"
 msgstr "厄瓜多尔"
 
-#: ../src/common/util.c:1057
+#: ../src/common/util.c:759
 msgid "Educational Institution"
 msgstr "教育机构"
 
-#: ../src/common/util.c:1058
+#: ../src/common/util.c:760
 msgid "Estonia"
 msgstr "爱沙尼亚"
 
-#: ../src/common/util.c:1059
+#: ../src/common/util.c:761
 msgid "Egypt"
 msgstr "埃及"
 
-#: ../src/common/util.c:1060
+#: ../src/common/util.c:762
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: ../src/common/util.c:1061
+#: ../src/common/util.c:763
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
-#: ../src/common/util.c:1062
+#: ../src/common/util.c:764
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../src/common/util.c:1063
+#: ../src/common/util.c:765
 msgid "Ethiopia"
 msgstr "埃塞俄比亚"
 
-#: ../src/common/util.c:1064
+#: ../src/common/util.c:766
 msgid "European Union"
 msgstr "欧盟"
 
-#: ../src/common/util.c:1065
+#: ../src/common/util.c:767
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../src/common/util.c:1066
+#: ../src/common/util.c:768
 msgid "Fiji"
 msgstr "斐济"
 
-#: ../src/common/util.c:1067
+#: ../src/common/util.c:769
 msgid "Falkland Islands"
 msgstr "福克兰群岛/马尔维纳斯群岛"
 
-#: ../src/common/util.c:1068
+#: ../src/common/util.c:770
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
-#: ../src/common/util.c:1069
+#: ../src/common/util.c:771
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
-#: ../src/common/util.c:1070
+#: ../src/common/util.c:772
 msgid "France"
 msgstr "法国"
 
-#: ../src/common/util.c:1071
+#: ../src/common/util.c:773
 msgid "Gabon"
 msgstr "加蓬"
 
-#: ../src/common/util.c:1072
+#: ../src/common/util.c:774
 msgid "Great Britain"
 msgstr "大不列颠"
 
-#: ../src/common/util.c:1073
+#: ../src/common/util.c:775
 msgid "Grenada"
 msgstr "格林纳达"
 
-#: ../src/common/util.c:1074
+#: ../src/common/util.c:776
 msgid "Georgia"
 msgstr "格鲁吉亚"
 
-#: ../src/common/util.c:1075
+#: ../src/common/util.c:777
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
-#: ../src/common/util.c:1076
+#: ../src/common/util.c:778
 msgid "British Channel Isles"
 msgstr "不列颠群岛"
 
-#: ../src/common/util.c:1077
+#: ../src/common/util.c:779
 msgid "Ghana"
 msgstr "加纳"
 
-#: ../src/common/util.c:1078
+#: ../src/common/util.c:780
 msgid "Gibraltar"
 msgstr "直布罗陀"
 
-#: ../src/common/util.c:1079
+#: ../src/common/util.c:781
 msgid "Greenland"
 msgstr "格陵兰"
 
-#: ../src/common/util.c:1080
+#: ../src/common/util.c:782
 msgid "Gambia"
 msgstr "冈比亚"
 
-#: ../src/common/util.c:1081
+#: ../src/common/util.c:783
 msgid "Guinea"
 msgstr "几内亚"
 
-#: ../src/common/util.c:1082
+#: ../src/common/util.c:784
 msgid "Government"
 msgstr "政府部门"
 
-#: ../src/common/util.c:1083
+#: ../src/common/util.c:785
 msgid "Guadeloupe"
 msgstr "法属瓜德罗普岛"
 
-#: ../src/common/util.c:1084
+#: ../src/common/util.c:786
 msgid "Equatorial Guinea"
 msgstr "赤道几内亚"
 
-#: ../src/common/util.c:1085
+#: ../src/common/util.c:787
 msgid "Greece"
 msgstr "希腊"
 
-#: ../src/common/util.c:1086
+#: ../src/common/util.c:788
 msgid "S. Georgia and S. Sandwich Isles"
 msgstr "南乔治亚及南桑威奇群岛"
 
-#: ../src/common/util.c:1087
+#: ../src/common/util.c:789
 msgid "Guatemala"
 msgstr "危地马拉"
 
-#: ../src/common/util.c:1088
+#: ../src/common/util.c:790
 msgid "Guam"
 msgstr "关岛"
 
-#: ../src/common/util.c:1089
+#: ../src/common/util.c:791
 msgid "Guinea-Bissau"
 msgstr "几内亚比绍"
 
-#: ../src/common/util.c:1090
+#: ../src/common/util.c:792
 msgid "Guyana"
 msgstr "圭亚那"
 
-#: ../src/common/util.c:1091
+#: ../src/common/util.c:793
 msgid "Hong Kong"
-msgstr "中国香港特别行政区"
+msgstr "香港"
 
-#: ../src/common/util.c:1092
+#: ../src/common/util.c:794
 msgid "Heard and McDonald Islands"
 msgstr "赫德岛和麦克唐纳群岛"
 
-#: ../src/common/util.c:1093
+#: ../src/common/util.c:795
 msgid "Honduras"
 msgstr "洪都拉斯"
 
-#: ../src/common/util.c:1094
+#: ../src/common/util.c:796
 msgid "Croatia"
 msgstr "克罗地亚"
 
-#: ../src/common/util.c:1095
+#: ../src/common/util.c:797
 msgid "Haiti"
 msgstr "海地"
 
-#: ../src/common/util.c:1096
+#: ../src/common/util.c:798
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../src/common/util.c:1097
+#: ../src/common/util.c:799
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
-#: ../src/common/util.c:1098
+#: ../src/common/util.c:800
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: ../src/common/util.c:1099
+#: ../src/common/util.c:801
 msgid "Israel"
 msgstr "以色列"
 
-#: ../src/common/util.c:1100
+#: ../src/common/util.c:802
 msgid "Isle of Man"
 msgstr "马恩岛"
 
-#: ../src/common/util.c:1101
+#: ../src/common/util.c:803
 msgid "India"
 msgstr "印度"
 
-#: ../src/common/util.c:1102
+#: ../src/common/util.c:804
 msgid "Informational"
 msgstr "信息机构"
 
-#: ../src/common/util.c:1103
+#: ../src/common/util.c:805
 msgid "International"
 msgstr "国际组织"
 
-#: ../src/common/util.c:1104
+#: ../src/common/util.c:806
 msgid "British Indian Ocean Territory"
 msgstr "英属印度洋地区"
 
-#: ../src/common/util.c:1105
+#: ../src/common/util.c:807
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: ../src/common/util.c:1106
+#: ../src/common/util.c:808
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../src/common/util.c:1107
+#: ../src/common/util.c:809
 msgid "Iceland"
 msgstr "冰岛"
 
-#: ../src/common/util.c:1108
+#: ../src/common/util.c:810
 msgid "Italy"
 msgstr "意大利"
 
-#: ../src/common/util.c:1109
+#: ../src/common/util.c:811
 msgid "Jersey"
 msgstr "泽西岛"
 
-#: ../src/common/util.c:1110
+#: ../src/common/util.c:812
 msgid "Jamaica"
 msgstr "牙买加"
 
-#: ../src/common/util.c:1111
+#: ../src/common/util.c:813
 msgid "Jordan"
 msgstr "约旦"
 
-#: ../src/common/util.c:1112
+#: ../src/common/util.c:814
 msgid "Company Jobs"
 msgstr "公司职位"
 
-#: ../src/common/util.c:1113
+#: ../src/common/util.c:815
 msgid "Japan"
 msgstr "日本"
 
-#: ../src/common/util.c:1114
+#: ../src/common/util.c:816
 msgid "Kenya"
 msgstr "肯尼亚"
 
-#: ../src/common/util.c:1115
+#: ../src/common/util.c:817
 msgid "Kyrgyzstan"
 msgstr "吉尔吉斯斯坦"
 
-#: ../src/common/util.c:1116
+#: ../src/common/util.c:818
 msgid "Cambodia"
 msgstr "柬埔寨"
 
-#: ../src/common/util.c:1117
+#: ../src/common/util.c:819
 msgid "Kiribati"
 msgstr "基里巴斯"
 
-#: ../src/common/util.c:1118
+#: ../src/common/util.c:820
 msgid "Comoros"
 msgstr "科摩罗"
 
-#: ../src/common/util.c:1119
+#: ../src/common/util.c:821
 msgid "St. Kitts and Nevis"
 msgstr "圣基茨和尼维斯"
 
-#: ../src/common/util.c:1120
+#: ../src/common/util.c:822
 msgid "North Korea"
 msgstr "朝鲜"
 
-#: ../src/common/util.c:1121
+#: ../src/common/util.c:823
 msgid "South Korea"
 msgstr "韩国"
 
-#: ../src/common/util.c:1122
+#: ../src/common/util.c:824
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../src/common/util.c:1123
+#: ../src/common/util.c:825
 msgid "Cayman Islands"
 msgstr "开曼群岛"
 
-#: ../src/common/util.c:1124
+#: ../src/common/util.c:826
 msgid "Kazakhstan"
 msgstr "哈萨克斯坦"
 
-#: ../src/common/util.c:1125
+#: ../src/common/util.c:827
 msgid "Laos"
 msgstr "老挝"
 
-#: ../src/common/util.c:1126
+#: ../src/common/util.c:828
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: ../src/common/util.c:1127
+#: ../src/common/util.c:829
 msgid "Saint Lucia"
 msgstr "圣卢西亚"
 
-#: ../src/common/util.c:1128
+#: ../src/common/util.c:830
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
-#: ../src/common/util.c:1129
+#: ../src/common/util.c:831
 msgid "Sri Lanka"
 msgstr "斯里兰卡"
 
-#: ../src/common/util.c:1130
+#: ../src/common/util.c:832
 msgid "Liberia"
 msgstr "利比里亚"
 
-#: ../src/common/util.c:1131
+#: ../src/common/util.c:833
 msgid "Lesotho"
 msgstr "莱索托"
 
-#: ../src/common/util.c:1132
+#: ../src/common/util.c:834
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../src/common/util.c:1133
+#: ../src/common/util.c:835
 msgid "Luxembourg"
 msgstr "卢森堡"
 
-#: ../src/common/util.c:1134
+#: ../src/common/util.c:836
 msgid "Latvia"
 msgstr "拉脱维亚"
 
-#: ../src/common/util.c:1135
+#: ../src/common/util.c:837
 msgid "Libya"
 msgstr "利比亚"
 
-#: ../src/common/util.c:1136
+#: ../src/common/util.c:838
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../src/common/util.c:1137
+#: ../src/common/util.c:839
 msgid "Monaco"
 msgstr "摩纳哥"
 
-#: ../src/common/util.c:1138
+#: ../src/common/util.c:840
 msgid "Moldova"
 msgstr "摩尔多瓦"
 
-#: ../src/common/util.c:1139
+#: ../src/common/util.c:841
 msgid "Montenegro"
 msgstr "黑山共和国"
 
-#: ../src/common/util.c:1140
+#: ../src/common/util.c:842
 msgid "United States Medical"
 msgstr "美国医疗组织"
 
-#: ../src/common/util.c:1141
+#: ../src/common/util.c:843
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: ../src/common/util.c:1142
+#: ../src/common/util.c:844
 msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
-#: ../src/common/util.c:1143
+#: ../src/common/util.c:845
 msgid "Military"
 msgstr "军事机构"
 
-#: ../src/common/util.c:1144
+#: ../src/common/util.c:846
 msgid "Macedonia"
 msgstr "马其顿"
 
-#: ../src/common/util.c:1145
+#: ../src/common/util.c:847
 msgid "Mali"
 msgstr "马里"
 
-#: ../src/common/util.c:1146
+#: ../src/common/util.c:848
 msgid "Myanmar"
 msgstr "缅甸"
 
-#: ../src/common/util.c:1147
+#: ../src/common/util.c:849
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: ../src/common/util.c:1148
+#: ../src/common/util.c:850
 msgid "Macau"
-msgstr "中国澳门特别行政区"
+msgstr "澳门"
 
-#: ../src/common/util.c:1149
+#: ../src/common/util.c:851
 msgid "Mobile Devices"
 msgstr "移动设备"
 
-#: ../src/common/util.c:1150
+#: ../src/common/util.c:852
 msgid "Northern Mariana Islands"
 msgstr "北马里亚那群岛"
 
-#: ../src/common/util.c:1151
+#: ../src/common/util.c:853
 msgid "Martinique"
 msgstr "马提尼克岛"
 
-#: ../src/common/util.c:1152
+#: ../src/common/util.c:854
 msgid "Mauritania"
 msgstr "毛里塔尼亚"
 
-#: ../src/common/util.c:1153
+#: ../src/common/util.c:855
 msgid "Montserrat"
 msgstr "蒙特塞拉特"
 
-#: ../src/common/util.c:1154
+#: ../src/common/util.c:856
 msgid "Malta"
 msgstr "马尔他"
 
-#: ../src/common/util.c:1155
+#: ../src/common/util.c:857
 msgid "Mauritius"
 msgstr "毛里求斯"
 
-#: ../src/common/util.c:1156
+#: ../src/common/util.c:858
 msgid "Museums"
 msgstr "博物馆"
 
-#: ../src/common/util.c:1157
+#: ../src/common/util.c:859
 msgid "Maldives"
 msgstr "马尔代夫"
 
-#: ../src/common/util.c:1158
+#: ../src/common/util.c:860
 msgid "Malawi"
 msgstr "马拉维"
 
-#: ../src/common/util.c:1159
+#: ../src/common/util.c:861
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../src/common/util.c:1160
+#: ../src/common/util.c:862
 msgid "Malaysia"
 msgstr "马来西亚"
 
-#: ../src/common/util.c:1161
+#: ../src/common/util.c:863
 msgid "Mozambique"
 msgstr "莫桑比克"
 
-#: ../src/common/util.c:1162
+#: ../src/common/util.c:864
 msgid "Namibia"
 msgstr "纳米比亚"
 
-#: ../src/common/util.c:1163
+#: ../src/common/util.c:865
 msgid "Individual's Names"
 msgstr "个体名称"
 
-#: ../src/common/util.c:1164
+#: ../src/common/util.c:866
 msgid "New Caledonia"
 msgstr "新喀里多尼亚岛"
 
-#: ../src/common/util.c:1165
+#: ../src/common/util.c:867
 msgid "Niger"
 msgstr "尼日尔"
 
-#: ../src/common/util.c:1166
+#: ../src/common/util.c:868
 msgid "Internic Network"
 msgstr "Internic 网络"
 
-#: ../src/common/util.c:1167
+#: ../src/common/util.c:869
 msgid "Norfolk Island"
 msgstr "诺福克岛"
 
-#: ../src/common/util.c:1168
+#: ../src/common/util.c:870
 msgid "Nigeria"
 msgstr "尼日利亚"
 
-#: ../src/common/util.c:1169
+#: ../src/common/util.c:871
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../src/common/util.c:1170
+#: ../src/common/util.c:872
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../src/common/util.c:1171
+#: ../src/common/util.c:873
 msgid "Norway"
 msgstr "挪威"
 
-#: ../src/common/util.c:1172
+#: ../src/common/util.c:874
 msgid "Nepal"
 msgstr "尼泊尔"
 
-#: ../src/common/util.c:1173
+#: ../src/common/util.c:875
 msgid "Nauru"
 msgstr "瑙鲁"
 
-#: ../src/common/util.c:1174
+#: ../src/common/util.c:876
 msgid "Niue"
 msgstr "纽埃岛"
 
-#: ../src/common/util.c:1175
+#: ../src/common/util.c:877
 msgid "New Zealand"
 msgstr "新西兰"
 
-#: ../src/common/util.c:1176
+#: ../src/common/util.c:878
 msgid "Oman"
 msgstr "阿曼"
 
-#: ../src/common/util.c:1177
+#: ../src/common/util.c:879
 msgid "Internic Non-Profit Organization"
 msgstr "Internic 非营利性组织"
 
-#: ../src/common/util.c:1178
+#: ../src/common/util.c:880
 msgid "Panama"
 msgstr "巴拿马"
 
-#: ../src/common/util.c:1179
+#: ../src/common/util.c:881
 msgid "Peru"
 msgstr "秘鲁"
 
-#: ../src/common/util.c:1180
+#: ../src/common/util.c:882
 msgid "French Polynesia"
 msgstr "法属波利尼西亚"
 
-#: ../src/common/util.c:1181
+#: ../src/common/util.c:883
 msgid "Papua New Guinea"
 msgstr "巴布亚新几内亚"
 
-#: ../src/common/util.c:1182
+#: ../src/common/util.c:884
 msgid "Philippines"
 msgstr "菲律宾"
 
-#: ../src/common/util.c:1183
+#: ../src/common/util.c:885
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../src/common/util.c:1184
+#: ../src/common/util.c:886
 msgid "Poland"
 msgstr "波兰"
 
-#: ../src/common/util.c:1185
+#: ../src/common/util.c:887
 msgid "St. Pierre and Miquelon"
 msgstr "圣皮埃尔和密克隆"
 
-#: ../src/common/util.c:1186
+#: ../src/common/util.c:888
 msgid "Pitcairn"
 msgstr "皮特凯恩群岛"
 
-#: ../src/common/util.c:1187
+#: ../src/common/util.c:889
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
-#: ../src/common/util.c:1188
+#: ../src/common/util.c:890
 msgid "Professions"
 msgstr "专业人士"
 
-#: ../src/common/util.c:1189
+#: ../src/common/util.c:891
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地区"
 
-#: ../src/common/util.c:1190
+#: ../src/common/util.c:892
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../src/common/util.c:1191
+#: ../src/common/util.c:893
 msgid "Palau"
 msgstr "帕劳"
 
-#: ../src/common/util.c:1192
+#: ../src/common/util.c:894
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: ../src/common/util.c:1193
+#: ../src/common/util.c:895
 msgid "Qatar"
 msgstr "卡塔尔"
 
-#: ../src/common/util.c:1194
+#: ../src/common/util.c:896
 msgid "Reunion"
 msgstr "留尼汪岛"
 
-#: ../src/common/util.c:1195
+#: ../src/common/util.c:897
 msgid "Romania"
 msgstr "罗马尼亚"
 
-#: ../src/common/util.c:1196
+#: ../src/common/util.c:898
 msgid "Old School ARPAnet"
 msgstr "教育用 ARPAnet"
 
-#: ../src/common/util.c:1197
+#: ../src/common/util.c:899
 msgid "Serbia"
 msgstr "塞尔维亚共和国"
 
-#: ../src/common/util.c:1198
+#: ../src/common/util.c:900
 msgid "Russian Federation"
 msgstr "俄罗斯联邦"
 
-#: ../src/common/util.c:1199
+#: ../src/common/util.c:901
 msgid "Rwanda"
 msgstr "卢旺达"
 
-#: ../src/common/util.c:1200
+#: ../src/common/util.c:902
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
 
-#: ../src/common/util.c:1201
+#: ../src/common/util.c:903
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
-#: ../src/common/util.c:1202
+#: ../src/common/util.c:904
 msgid "Seychelles"
 msgstr "塞舌尔群岛"
 
-#: ../src/common/util.c:1203
+#: ../src/common/util.c:905
 msgid "Sudan"
 msgstr "苏丹"
 
-#: ../src/common/util.c:1204
+#: ../src/common/util.c:906
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../src/common/util.c:1205
+#: ../src/common/util.c:907
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../src/common/util.c:1206
+#: ../src/common/util.c:908
 msgid "St. Helena"
 msgstr "圣赫勒拿岛"
 
-#: ../src/common/util.c:1207
+#: ../src/common/util.c:909
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
 
-#: ../src/common/util.c:1208
+#: ../src/common/util.c:910
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "斯瓦尔巴群岛和扬马延岛"
 
-#: ../src/common/util.c:1209
+#: ../src/common/util.c:911
 msgid "Slovak Republic"
 msgstr "斯洛伐克共和国"
 
-#: ../src/common/util.c:1210
+#: ../src/common/util.c:912
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
-#: ../src/common/util.c:1211
+#: ../src/common/util.c:913
 msgid "San Marino"
 msgstr "圣马力诺"
 
-#: ../src/common/util.c:1212
+#: ../src/common/util.c:914
 msgid "Senegal"
 msgstr "塞内加尔"
 
-#: ../src/common/util.c:1213
+#: ../src/common/util.c:915
 msgid "Somalia"
 msgstr "索马里"
 
-#: ../src/common/util.c:1214
+#: ../src/common/util.c:916
 msgid "Suriname"
 msgstr "苏里南"
 
-#: ../src/common/util.c:1215
+#: ../src/common/util.c:917
 msgid "South Sudan"
 msgstr "南苏丹"
 
-#: ../src/common/util.c:1216
+#: ../src/common/util.c:918
 msgid "Sao Tome and Principe"
 msgstr "圣多美和普林西比"
 
-#: ../src/common/util.c:1217
+#: ../src/common/util.c:919
 msgid "Former USSR"
 msgstr "前苏联"
 
-#: ../src/common/util.c:1218
+#: ../src/common/util.c:920
 msgid "El Salvador"
 msgstr "萨尔瓦多"
 
-#: ../src/common/util.c:1219
+#: ../src/common/util.c:921
 msgid "Syria"
 msgstr "叙利亚"
 
-#: ../src/common/util.c:1220
+#: ../src/common/util.c:922
 msgid "Swaziland"
 msgstr "斯威士兰"
 
-#: ../src/common/util.c:1221
+#: ../src/common/util.c:923
 msgid "Turks and Caicos Islands"
 msgstr "特克斯和凯科斯群岛"
 
-#: ../src/common/util.c:1222
+#: ../src/common/util.c:924
 msgid "Chad"
 msgstr "乍得"
 
-#: ../src/common/util.c:1223
+#: ../src/common/util.c:925
 msgid "Internet Communication Services"
 msgstr "互联网通信服务"
 
-#: ../src/common/util.c:1224
+#: ../src/common/util.c:926
 msgid "French Southern Territories"
 msgstr "法属南半球领地"
 
-#: ../src/common/util.c:1225
+#: ../src/common/util.c:927
 msgid "Togo"
 msgstr "多哥"
 
-#: ../src/common/util.c:1226
+#: ../src/common/util.c:928
 msgid "Thailand"
 msgstr "泰国"
 
-#: ../src/common/util.c:1227
+#: ../src/common/util.c:929
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
-#: ../src/common/util.c:1228
+#: ../src/common/util.c:930
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
-#: ../src/common/util.c:1229 ../src/common/util.c:1233
+#: ../src/common/util.c:931 ../src/common/util.c:935
 msgid "East Timor"
 msgstr "东帝汶"
 
-#: ../src/common/util.c:1230
+#: ../src/common/util.c:932
 msgid "Turkmenistan"
 msgstr "土库曼斯坦"
 
-#: ../src/common/util.c:1231
+#: ../src/common/util.c:933
 msgid "Tunisia"
 msgstr "突尼斯"
 
-#: ../src/common/util.c:1232
+#: ../src/common/util.c:934
 msgid "Tonga"
 msgstr "汤加"
 
-#: ../src/common/util.c:1234
+#: ../src/common/util.c:936
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../src/common/util.c:1235
+#: ../src/common/util.c:937
 msgid "Travel and Tourism"
 msgstr "旅游和旅游业"
 
-#: ../src/common/util.c:1236
+#: ../src/common/util.c:938
 msgid "Trinidad and Tobago"
 msgstr "特立尼达和多巴哥"
 
-#: ../src/common/util.c:1237
+#: ../src/common/util.c:939
 msgid "Tuvalu"
 msgstr "图瓦卢"
 
-#: ../src/common/util.c:1238
+#: ../src/common/util.c:940
 msgid "Taiwan"
-msgstr "中国台湾"
+msgstr "台湾"
 
-#: ../src/common/util.c:1239
+#: ../src/common/util.c:941
 msgid "Tanzania"
 msgstr "坦桑尼亚"
 
-#: ../src/common/util.c:1240
+#: ../src/common/util.c:942
 msgid "Ukraine"
 msgstr "乌克兰"
 
-#: ../src/common/util.c:1241
+#: ../src/common/util.c:943
 msgid "Uganda"
 msgstr "乌干达"
 
-#: ../src/common/util.c:1242
+#: ../src/common/util.c:944
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../src/common/util.c:1243
+#: ../src/common/util.c:945
 msgid "United States of America"
 msgstr "美国"
 
-#: ../src/common/util.c:1244
+#: ../src/common/util.c:946
 msgid "Uruguay"
 msgstr "乌拉圭"
 
-#: ../src/common/util.c:1245
+#: ../src/common/util.c:947
 msgid "Uzbekistan"
 msgstr "乌兹别克斯坦"
 
-#: ../src/common/util.c:1246
+#: ../src/common/util.c:948
 msgid "Vatican City State"
 msgstr "梵蒂冈"
 
-#: ../src/common/util.c:1247
+#: ../src/common/util.c:949
 msgid "St. Vincent and the Grenadines"
 msgstr "圣文森特和格林纳丁斯"
 
-#: ../src/common/util.c:1248
+#: ../src/common/util.c:950
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
-#: ../src/common/util.c:1249
+#: ../src/common/util.c:951
 msgid "British Virgin Islands"
 msgstr "英属维尔京群岛"
 
-#: ../src/common/util.c:1250
+#: ../src/common/util.c:952
 msgid "US Virgin Islands"
 msgstr "美属维尔京群岛"
 
-#: ../src/common/util.c:1251
+#: ../src/common/util.c:953
 msgid "Vietnam"
 msgstr "越南"
 
-#: ../src/common/util.c:1252
+#: ../src/common/util.c:954
 msgid "Vanuatu"
 msgstr "瓦努阿图"
 
-#: ../src/common/util.c:1253
+#: ../src/common/util.c:955
 msgid "Wallis and Futuna Islands"
 msgstr "瓦利斯和富图纳群岛"
 
-#: ../src/common/util.c:1254
+#: ../src/common/util.c:956
 msgid "Samoa"
 msgstr "萨摩亚群岛"
 
-#: ../src/common/util.c:1255
+#: ../src/common/util.c:957
 msgid "Adult Entertainment"
 msgstr "成人娱乐"
 
-#: ../src/common/util.c:1256
+#: ../src/common/util.c:958
 msgid "Yemen"
 msgstr "也门"
 
-#: ../src/common/util.c:1257
+#: ../src/common/util.c:959
 msgid "Mayotte"
 msgstr "马约特岛"
 
-#: ../src/common/util.c:1258
+#: ../src/common/util.c:960
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: ../src/common/util.c:1259
+#: ../src/common/util.c:961
 msgid "South Africa"
 msgstr "南非"
 
-#: ../src/common/util.c:1260
+#: ../src/common/util.c:962
 msgid "Zambia"
 msgstr "赞比亚"
 
-#: ../src/common/util.c:1261
+#: ../src/common/util.c:963
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: ../src/common/dbus/dbus-client.c:74
+#: ../src/common/dbus/dbus-client.c:76
 msgid "Couldn't connect to session bus"
 msgstr "无法连接到会话 bus"
 
-#: ../src/common/dbus/dbus-client.c:88
+#: ../src/common/dbus/dbus-client.c:90
 msgid "Failed to complete NameHasOwner"
 msgstr "完成 NameHasOwner 失败"
 
-#: ../src/common/dbus/dbus-client.c:114 ../src/common/dbus/dbus-client.c:128
+#: ../src/common/dbus/dbus-client.c:116 ../src/common/dbus/dbus-client.c:130
 msgid "Failed to complete Command"
 msgstr "完成命令失败"
 
-#: ../src/common/dbus/dbus-plugin.c:30
+#: ../src/common/dbus/dbus-plugin.c:31
 msgid "remote access"
 msgstr "远程访问"
 
-#: ../src/common/dbus/dbus-plugin.c:31
+#: ../src/common/dbus/dbus-plugin.c:32
 msgid "plugin for remote access using DBUS"
 msgstr "用 DBUS 远程访问的插件"
 
-#: ../src/common/dbus/dbus-plugin.c:897
+#: ../src/common/dbus/dbus-plugin.c:900
 #, c-format
 msgid "Couldn't connect to session bus: %s\n"
 msgstr "无法连接到会话 bus:%s\n"
 
-#: ../src/common/dbus/dbus-plugin.c:914
+#: ../src/common/dbus/dbus-plugin.c:917
 #, c-format
 msgid "Failed to acquire %s: %s\n"
 msgstr "获取 %s 失败:%s\n"
@@ -3112,21 +3175,21 @@ msgid "Quiet"
 msgstr "静默"
 
 #. poor way to get which is selected but it works
-#: ../src/fe-gtk/banlist.c:351 ../src/fe-gtk/banlist.c:385
+#: ../src/fe-gtk/banlist.c:354 ../src/fe-gtk/banlist.c:388
 msgid "Copy mask"
 msgstr "复制掩码"
 
-#: ../src/fe-gtk/banlist.c:354
+#: ../src/fe-gtk/banlist.c:357
 #, c-format
 msgid "%s on %s by %s"
 msgstr "%s 在 %s 由 %s"
 
-#: ../src/fe-gtk/banlist.c:386
+#: ../src/fe-gtk/banlist.c:389
 msgid "Copy entry"
 msgstr "复制项"
 
 #: ../src/fe-gtk/banlist.c:459 ../src/fe-gtk/chanlist.c:292
-#: ../src/fe-gtk/plugin-tray.c:267
+#: ../src/fe-gtk/plugin-tray.c:179
 msgid "Not connected."
 msgstr "未连接。"
 
@@ -3159,24 +3222,20 @@ msgstr "日期"
 msgid "You can only open the Ban List window while in a channel tab."
 msgstr "您只能在一个频道的标签页下打开屏蔽列表窗口。"
 
-#: ../src/fe-gtk/banlist.c:794
-msgid "Banlist initialization failed."
-msgstr "屏蔽列表初始化失败。"
-
-#: ../src/fe-gtk/banlist.c:813
+#: ../src/fe-gtk/banlist.c:808
 #, c-format
 msgid ": Ban List (%s)"
 msgstr ":屏蔽列表(%s)"
 
-#: ../src/fe-gtk/banlist.c:848 ../src/fe-gtk/notifygui.c:425
+#: ../src/fe-gtk/banlist.c:843 ../src/fe-gtk/notifygui.c:427
 msgid "Remove"
 msgstr "删除"
 
-#: ../src/fe-gtk/banlist.c:850
+#: ../src/fe-gtk/banlist.c:845
 msgid "Crop"
 msgstr "裁剪"
 
-#: ../src/fe-gtk/banlist.c:854
+#: ../src/fe-gtk/banlist.c:849
 msgid "Refresh"
 msgstr "刷新"
 
@@ -3263,21 +3322,21 @@ msgid "Regular Expression"
 msgstr "正则表达式"
 
 #. =============================================================
-#: ../src/fe-gtk/chanlist.c:913 ../src/fe-gtk/maingui.c:2918
+#: ../src/fe-gtk/chanlist.c:913 ../src/fe-gtk/maingui.c:2925
 msgid "Find:"
 msgstr "查找:"
 
-#: ../src/fe-gtk/dccgui.c:150
+#: ../src/fe-gtk/dccgui.c:141
 #, c-format
 msgid "Send file to %s"
 msgstr "给 %s 发送文件"
 
 #. unknown error
-#: ../src/fe-gtk/dccgui.c:526
+#: ../src/fe-gtk/dccgui.c:525
 msgid "That file is not resumable."
 msgstr "该文件不可续传。"
 
-#: ../src/fe-gtk/dccgui.c:530
+#: ../src/fe-gtk/dccgui.c:529
 #, c-format
 msgid ""
 "Cannot access file: %s\n"
@@ -3285,152 +3344,153 @@ msgid ""
 "Resuming not possible."
 msgstr "不能访问文件:%s\n%s。\n无法续传。"
 
-#: ../src/fe-gtk/dccgui.c:537
+#: ../src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
 msgstr "下载目录中的文件比所提供的文件大,无法续传。"
 
-#: ../src/fe-gtk/dccgui.c:541
+#: ../src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
 msgstr "不能续传来自两个人的同一文件"
 
-#: ../src/fe-gtk/dccgui.c:798
+#: ../src/fe-gtk/dccgui.c:797
 msgid ": Uploads and Downloads"
 msgstr ":文件传输列表"
 
-#: ../src/fe-gtk/dccgui.c:815 ../src/fe-gtk/dccgui.c:1056
+#: ../src/fe-gtk/dccgui.c:814 ../src/fe-gtk/dccgui.c:1055
 #: ../src/fe-gtk/notifygui.c:124
 msgid "Status"
 msgstr "状态"
 
-#: ../src/fe-gtk/dccgui.c:816 ../src/fe-gtk/plugingui.c:65
+#: ../src/fe-gtk/dccgui.c:815 ../src/fe-gtk/plugingui.c:65
 msgid "File"
 msgstr "文件"
 
-#: ../src/fe-gtk/dccgui.c:821
+#: ../src/fe-gtk/dccgui.c:820
 msgid "ETA"
 msgstr "剩余时间"
 
-#: ../src/fe-gtk/dccgui.c:846 ../src/fe-gtk/menu.c:1782
-#: ../src/fe-gtk/setup.c:215
+#: ../src/fe-gtk/dccgui.c:845 ../src/fe-gtk/menu.c:1782
+#: ../src/fe-gtk/setup.c:217
 msgid "Both"
 msgstr "两者"
 
-#: ../src/fe-gtk/dccgui.c:852
+#: ../src/fe-gtk/dccgui.c:851
 msgid "Uploads"
 msgstr "上传"
 
-#: ../src/fe-gtk/dccgui.c:858
+#: ../src/fe-gtk/dccgui.c:857
 msgid "Downloads"
 msgstr "下载"
 
-#: ../src/fe-gtk/dccgui.c:863
+#: ../src/fe-gtk/dccgui.c:862
 msgid "Details"
 msgstr "详细信息"
 
-#: ../src/fe-gtk/dccgui.c:874
+#: ../src/fe-gtk/dccgui.c:873
 msgid "File:"
 msgstr "文件:"
 
-#: ../src/fe-gtk/dccgui.c:875
+#: ../src/fe-gtk/dccgui.c:874
 msgid "Address:"
 msgstr "地址:"
 
-#: ../src/fe-gtk/dccgui.c:881 ../src/fe-gtk/dccgui.c:1080
+#: ../src/fe-gtk/dccgui.c:880 ../src/fe-gtk/dccgui.c:1079
 msgid "Abort"
 msgstr "中止"
 
-#: ../src/fe-gtk/dccgui.c:882 ../src/fe-gtk/dccgui.c:1081
+#: ../src/fe-gtk/dccgui.c:881 ../src/fe-gtk/dccgui.c:1080
 msgid "Accept"
 msgstr "接受"
 
-#: ../src/fe-gtk/dccgui.c:883
+#: ../src/fe-gtk/dccgui.c:882
 msgid "Resume"
 msgstr "续传"
 
-#: ../src/fe-gtk/dccgui.c:885
+#: ../src/fe-gtk/dccgui.c:884
 msgid "Open Folder..."
 msgstr "打开目录..."
 
-#: ../src/fe-gtk/dccgui.c:1045
+#: ../src/fe-gtk/dccgui.c:1044
 msgid ": DCC Chat List"
 msgstr ":DCC 直连聊天列表"
 
-#: ../src/fe-gtk/dccgui.c:1058
+#: ../src/fe-gtk/dccgui.c:1057
 msgid "Recv"
 msgstr "已接收"
 
-#: ../src/fe-gtk/dccgui.c:1059
+#: ../src/fe-gtk/dccgui.c:1058
 msgid "Sent"
 msgstr "已发送"
 
-#: ../src/fe-gtk/dccgui.c:1060
+#: ../src/fe-gtk/dccgui.c:1059
 msgid "Start Time"
 msgstr "开始时间"
 
-#: ../src/fe-gtk/editlist.c:358 ../src/fe-gtk/fkeys.c:826
+#: ../src/fe-gtk/editlist.c:358 ../src/fe-gtk/fkeys.c:827
 msgid "Add"
 msgstr "添加"
 
-#: ../src/fe-gtk/editlist.c:360 ../src/fe-gtk/fkeys.c:828
+#: ../src/fe-gtk/editlist.c:360 ../src/fe-gtk/fkeys.c:829
 #: ../src/fe-gtk/ignoregui.c:383
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/fe-gtk/editlist.c:362 ../src/fe-gtk/fkeys.c:830
+#: ../src/fe-gtk/editlist.c:362 ../src/fe-gtk/fkeys.c:831
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/fe-gtk/editlist.c:364 ../src/fe-gtk/fkeys.c:832
+#: ../src/fe-gtk/editlist.c:364 ../src/fe-gtk/fkeys.c:833
 msgid "Save"
 msgstr "保存"
 
-#: ../src/fe-gtk/fe-gtk.c:80
+#: ../src/fe-gtk/fe-gtk.c:81 ../src/fe-text/fe-text.c:461
 msgid "Don't auto connect to servers"
 msgstr "不要自动连接到服务器"
 
-#: ../src/fe-gtk/fe-gtk.c:81
+#: ../src/fe-gtk/fe-gtk.c:82 ../src/fe-text/fe-text.c:462
 msgid "Use a different config directory"
 msgstr "使用不同的配置目录"
 
-#: ../src/fe-gtk/fe-gtk.c:82
+#: ../src/fe-gtk/fe-gtk.c:83 ../src/fe-text/fe-text.c:463
 msgid "Don't auto load any plugins"
 msgstr "不自动载入任何插件"
 
-#: ../src/fe-gtk/fe-gtk.c:83
+#: ../src/fe-gtk/fe-gtk.c:84 ../src/fe-text/fe-text.c:464
 msgid "Show plugin/script auto-load directory"
 msgstr "显示自动载入插件/脚本的目录"
 
-#: ../src/fe-gtk/fe-gtk.c:84
+#: ../src/fe-gtk/fe-gtk.c:85 ../src/fe-text/fe-text.c:465
 msgid "Show user config directory"
 msgstr "显示用户配置目录"
 
-#: ../src/fe-gtk/fe-gtk.c:85 ../src/fe-gtk/fe-gtk.c:92
+#: ../src/fe-gtk/fe-gtk.c:86 ../src/fe-gtk/fe-gtk.c:93
+#: ../src/fe-text/fe-text.c:468
 msgid "Open an irc://server:port/channel?key URL"
 msgstr "打开一个 irc://server:port/channel?key URL"
 
-#: ../src/fe-gtk/fe-gtk.c:86 ../src/fe-gtk/setup.c:267
+#: ../src/fe-gtk/fe-gtk.c:87 ../src/fe-gtk/setup.c:269
 msgid "Execute command:"
 msgstr "执行命令:"
 
-#: ../src/fe-gtk/fe-gtk.c:88
+#: ../src/fe-gtk/fe-gtk.c:89
 msgid "Open URL or execute command in an existing HexChat"
 msgstr "在已有的 HexChat 中打开 URL 或执行命令"
 
-#: ../src/fe-gtk/fe-gtk.c:90
+#: ../src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
 msgstr "启动后最小化。最小化级别 0=正常 1=仅图标 2=托盘"
 
-#: ../src/fe-gtk/fe-gtk.c:90
+#: ../src/fe-gtk/fe-gtk.c:91
 msgid "level"
 msgstr "级别"
 
-#: ../src/fe-gtk/fe-gtk.c:91
+#: ../src/fe-gtk/fe-gtk.c:92 ../src/fe-text/fe-text.c:467
 msgid "Show version information"
 msgstr "显示版本信息"
 
-#: ../src/fe-gtk/fe-gtk.c:268
+#: ../src/fe-gtk/fe-gtk.c:269
 #, c-format
 msgid ""
 "Failed to open font:\n"
@@ -3438,16 +3498,16 @@ msgid ""
 "%s"
 msgstr "打开字体失败:\n\n%s"
 
-#: ../src/fe-gtk/fe-gtk.c:683
+#: ../src/fe-gtk/fe-gtk.c:692
 msgid "Search buffer is empty.\n"
 msgstr "搜索缓冲区当前为空。\n"
 
-#: ../src/fe-gtk/fe-gtk.c:796
+#: ../src/fe-gtk/fe-gtk.c:803
 #, c-format
 msgid "%d bytes"
 msgstr "%d 字节"
 
-#: ../src/fe-gtk/fe-gtk.c:797
+#: ../src/fe-gtk/fe-gtk.c:804
 #, c-format
 msgid "Network send queue: %d bytes"
 msgstr "网络发送队列:%d 字节"
@@ -3470,13 +3530,13 @@ msgid ""
 "switch to the page with the most recent and important activity (queries "
 "first, then channels with hilight, channels with dialogue, channels with "
 "other data)"
-msgstr "“Change Page”命令在您的笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签页。如果 Data 2 被设置成任意值,切换标签页的数将相对于当前位置。Data 1 设置为自动将自动切换到切换到最近最重要的活动中(优先处理最近请求,其次显示频道,再次显示有对话的频道,最后显示其他 data 的频道)"
+msgstr "“Change Page”命令在您笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签页。如果 Data 2 被设置成任意值,切换标签页的数将相对于当前位置。Data 1 设置为自动将自动切换到最近最重要的活动中(优先处理最近请求,其次显示高亮频道,再次显示有对话的频道,最后显示其他 data 的频道)"
 
 #: ../src/fe-gtk/fkeys.c:145
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr "“Insert in Buffer” 命令把数据 1 中的内容插入到接收到按键序列的当前光标处"
+msgstr "“Insert in Buffer” 命令把数据 1 中的内容插入到接收按键序列的当前光标处"
 
 #: ../src/fe-gtk/fkeys.c:147
 msgid ""
@@ -3507,7 +3567,7 @@ msgid ""
 "This command changes the text in the entry to finish an incomplete nickname "
 "or command. If Data 1 is set then double-tabbing in a string will select the"
 " last nick, not the next"
-msgstr "该命令改变输入区域中的文本,补全未输入完毕的用户昵称或命令。如果数据 1 被设置,那么,按两次 Tab 键会选择最后一个昵称,而非下一个昵称"
+msgstr "该命令改变输入区域中的文本,补全未输入完毕的用户昵称或命令。如果数据 1 被设置,那么,按两次 Tab 键会选择上一次使用的昵称,而非下一个昵称"
 
 #: ../src/fe-gtk/fkeys.c:157
 msgid ""
@@ -3541,23 +3601,23 @@ msgstr "该命令把当前标签页向右移一格"
 msgid "Push input line into history but doesn't send to server"
 msgstr "把输入存入历史,但不发送到服务器"
 
-#: ../src/fe-gtk/fkeys.c:216
+#: ../src/fe-gtk/fkeys.c:217
 msgid "There was an error loading key bindings configuration"
 msgstr "加载键绑定配置时出错"
 
-#: ../src/fe-gtk/fkeys.c:540
+#: ../src/fe-gtk/fkeys.c:539
 msgid "Select a row to get help information on its Action."
 msgstr "选择一行查看对应动作的信息。"
 
-#: ../src/fe-gtk/fkeys.c:809
+#: ../src/fe-gtk/fkeys.c:810
 msgid ": Keyboard Shortcuts"
 msgstr ":键盘快捷键"
 
-#: ../src/fe-gtk/gtkutil.c:108
+#: ../src/fe-gtk/gtkutil.c:126
 msgid "Cannot write to that file."
 msgstr "无法写入到该文件。"
 
-#: ../src/fe-gtk/gtkutil.c:110
+#: ../src/fe-gtk/gtkutil.c:130
 msgid "Cannot read that file."
 msgstr "无法读取该文件。"
 
@@ -3622,7 +3682,7 @@ msgstr "CTCP:"
 msgid "Invite:"
 msgstr "邀请:"
 
-#: ../src/fe-gtk/ignoregui.c:381 ../src/fe-gtk/notifygui.c:421
+#: ../src/fe-gtk/ignoregui.c:381 ../src/fe-gtk/notifygui.c:423
 msgid "Add..."
 msgstr "添加..."
 
@@ -3637,13 +3697,13 @@ msgstr ":连接完毕"
 #: ../src/fe-gtk/joind.c:161
 #, c-format
 msgid "Connection to %s complete."
-msgstr "成功建立到 %s 的连接"
+msgstr "成功建立到 %s 的连接。"
 
 #: ../src/fe-gtk/joind.c:170
 msgid ""
 "In the Server-List window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr "在服务器列表窗口,没有添加自动进入的频道名称"
+msgstr "在服务器列表窗口,没有添加自动进入的频道(聊天室)。"
 
 #: ../src/fe-gtk/joind.c:176
 msgid "What would you like to do next?"
@@ -3665,214 +3725,205 @@ msgstr "如果您知道想要进入的频道的名称,请在此输入。"
 msgid "O_pen the Channel-List window."
 msgstr "打开频道列表窗口(_P):"
 
-#: ../src/fe-gtk/joind.c:216
+#: ../src/fe-gtk/joind.c:215
 msgid "Retrieving the Channel-List may take a minute or two."
 msgstr "取回频道列表可能需要一两分钟。"
 
-#: ../src/fe-gtk/joind.c:223
+#: ../src/fe-gtk/joind.c:222
 msgid "_Always show this dialog after connecting."
 msgstr "每次连接后都显示该对话框。(_A)"
 
 #: ../src/fe-gtk/maingui.c:397
 msgid "Dialog with"
-msgstr "与以下用户对话:"
+msgstr "与以下用户对话"
 
-#: ../src/fe-gtk/maingui.c:695
+#: ../src/fe-gtk/maingui.c:696
 #, c-format
 msgid "Topic for %s is: %s"
 msgstr "%s 的主题:%s"
 
-#: ../src/fe-gtk/maingui.c:700
+#: ../src/fe-gtk/maingui.c:701
 msgid "No topic is set"
 msgstr "没有设置主题"
 
-#: ../src/fe-gtk/maingui.c:1102
+#: ../src/fe-gtk/maingui.c:1106
 #, c-format
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
 msgstr "这台服务器仍然有 %d 个与它相关的频道或对话。要全部关闭吗?"
 
-#: ../src/fe-gtk/maingui.c:1203
+#: ../src/fe-gtk/maingui.c:1207
 msgid "Quit HexChat?"
 msgstr "要退出 HexChat 吗?"
 
-#: ../src/fe-gtk/maingui.c:1223
+#: ../src/fe-gtk/maingui.c:1227
 msgid "Don't ask next time."
 msgstr "下次不再询问。"
 
-#: ../src/fe-gtk/maingui.c:1229
+#: ../src/fe-gtk/maingui.c:1233
 #, c-format
 msgid "You are connected to %i IRC networks."
 msgstr "您已连接到 %i 个 IRC 网络。"
 
-#: ../src/fe-gtk/maingui.c:1231
+#: ../src/fe-gtk/maingui.c:1235
 msgid "Are you sure you want to quit?"
 msgstr "您确定要退出吗?"
 
-#: ../src/fe-gtk/maingui.c:1233
+#: ../src/fe-gtk/maingui.c:1237
 msgid "Some file transfers are still active."
 msgstr "某些文件传输仍在进行。"
 
-#: ../src/fe-gtk/maingui.c:1251
+#: ../src/fe-gtk/maingui.c:1255
 msgid "_Minimize to Tray"
 msgstr "最小化至系统托盘(_M)"
 
-#: ../src/fe-gtk/maingui.c:1471
+#: ../src/fe-gtk/maingui.c:1474
 msgid "Insert Attribute or Color Code"
 msgstr "插入属性或颜色代码"
 
-#: ../src/fe-gtk/maingui.c:1473
+#: ../src/fe-gtk/maingui.c:1476
 msgid "<b>Bold</b>"
 msgstr "<b>粗体</b>"
 
-#: ../src/fe-gtk/maingui.c:1474
+#: ../src/fe-gtk/maingui.c:1477
 msgid "<u>Underline</u>"
 msgstr "<u>下划线</u>"
 
-#: ../src/fe-gtk/maingui.c:1475
+#: ../src/fe-gtk/maingui.c:1478
 msgid "<i>Italic</i>"
 msgstr "<i>斜体</i>"
 
-#: ../src/fe-gtk/maingui.c:1476
+#: ../src/fe-gtk/maingui.c:1479
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/fe-gtk/maingui.c:1478
+#: ../src/fe-gtk/maingui.c:1481
 msgid "Colors 0-7"
 msgstr "颜色 0-7"
 
-#: ../src/fe-gtk/maingui.c:1488
+#: ../src/fe-gtk/maingui.c:1491
 msgid "Colors 8-15"
 msgstr "颜色 8-15"
 
-#: ../src/fe-gtk/maingui.c:1534
+#: ../src/fe-gtk/maingui.c:1537
 msgid "_Settings"
 msgstr "设置(_S)"
 
-#: ../src/fe-gtk/maingui.c:1536
+#: ../src/fe-gtk/maingui.c:1539
 msgid "_Log to Disk"
 msgstr "聊天记录写入磁盘(_L)"
 
-#: ../src/fe-gtk/maingui.c:1537
+#: ../src/fe-gtk/maingui.c:1540
 msgid "_Reload Scrollback"
 msgstr "重新载入最近日志(_R)"
 
-#: ../src/fe-gtk/maingui.c:1540
+#: ../src/fe-gtk/maingui.c:1543
 msgid "Strip _Colors"
 msgstr "提取色彩(_C)"
 
-#: ../src/fe-gtk/maingui.c:1541
+#: ../src/fe-gtk/maingui.c:1544
 msgid "_Hide Join/Part Messages"
 msgstr "隐藏进入/离开信息(_H)"
 
-#: ../src/fe-gtk/maingui.c:1550
+#: ../src/fe-gtk/maingui.c:1553
 msgid "_Extra Alerts"
 msgstr "额外警报(_E)"
 
-#: ../src/fe-gtk/maingui.c:1552
+#: ../src/fe-gtk/maingui.c:1555
 msgid "Beep on _Message"
 msgstr "有信息时响铃提示(_M)"
 
-#: ../src/fe-gtk/maingui.c:1554
+#: ../src/fe-gtk/maingui.c:1557
 msgid "Blink Tray _Icon"
 msgstr "闪烁托盘图标(_I)"
 
-#: ../src/fe-gtk/maingui.c:1556
+#: ../src/fe-gtk/maingui.c:1559
 msgid "Blink Task _Bar"
 msgstr "闪烁任务栏图标(_B)"
 
-#: ../src/fe-gtk/maingui.c:1569 ../src/fe-gtk/maingui.c:1689
-#: ../src/fe-gtk/maingui.c:3386
-msgid "<none>"
-msgstr "<无>"
-
-#: ../src/fe-gtk/maingui.c:1596 ../src/fe-gtk/menu.c:2329
+#: ../src/fe-gtk/maingui.c:1599 ../src/fe-gtk/menu.c:2337
 msgid "_Detach"
 msgstr "分离(_D)"
 
-#: ../src/fe-gtk/maingui.c:1598 ../src/fe-gtk/menu.c:2330
-#: ../src/fe-gtk/menu.c:2335
+#: ../src/fe-gtk/maingui.c:1601 ../src/fe-gtk/menu.c:2338
+#: ../src/fe-gtk/menu.c:2343
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/fe-gtk/maingui.c:1938 ../src/fe-gtk/maingui.c:2044
+#: ../src/fe-gtk/maingui.c:1941 ../src/fe-gtk/maingui.c:2054
 msgid "User limit must be a number!\n"
 msgstr "用户限制必须是数字!\n"
 
-#: ../src/fe-gtk/maingui.c:2066
+#: ../src/fe-gtk/maingui.c:2076
 msgid "Filter Colors"
 msgstr "筛选颜色"
 
-#: ../src/fe-gtk/maingui.c:2067
+#: ../src/fe-gtk/maingui.c:2077
 msgid "No outside messages"
 msgstr "无室外信息"
 
-#: ../src/fe-gtk/maingui.c:2068
-msgid "Registered Only"
-msgstr "仅已注册"
-
-#: ../src/fe-gtk/maingui.c:2069
+#: ../src/fe-gtk/maingui.c:2078
 msgid "Topic Protection"
 msgstr "主题保护"
 
-#: ../src/fe-gtk/maingui.c:2070
+#: ../src/fe-gtk/maingui.c:2079
 msgid "Invite Only"
 msgstr "仅邀请"
 
-#: ../src/fe-gtk/maingui.c:2071
+#: ../src/fe-gtk/maingui.c:2080
 msgid "Moderated"
 msgstr "监管状态"
 
-#: ../src/fe-gtk/maingui.c:2072
+#: ../src/fe-gtk/maingui.c:2081
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: ../src/fe-gtk/maingui.c:2074
+#: ../src/fe-gtk/maingui.c:2083
 msgid "Keyword"
 msgstr "密码"
 
-#: ../src/fe-gtk/maingui.c:2086
+#: ../src/fe-gtk/maingui.c:2095
 msgid "User Limit"
 msgstr "用户限制"
 
-#: ../src/fe-gtk/maingui.c:2196
+#: ../src/fe-gtk/maingui.c:2205
 msgid "Show/Hide userlist"
 msgstr "显示/隐藏用户列表"
 
-#: ../src/fe-gtk/maingui.c:2609
+#: ../src/fe-gtk/maingui.c:2616
 msgid "Enter new nickname:"
 msgstr "输入新昵称:"
 
-#: ../src/fe-gtk/maingui.c:2832
+#: ../src/fe-gtk/maingui.c:2839
 msgid "No results found."
 msgstr "搜索无结果。"
 
-#: ../src/fe-gtk/maingui.c:2928
+#: ../src/fe-gtk/maingui.c:2935
 msgid "Search hit end or not found."
 msgstr "已搜索到尾部,未找到符合条件的结果。"
 
-#: ../src/fe-gtk/maingui.c:2944
-msgid "Highlight _all"
-msgstr "全部高亮(_A)"
+#: ../src/fe-gtk/maingui.c:2951
+msgid "_Highlight all"
+msgstr "高亮所有(_H)"
 
-#: ../src/fe-gtk/maingui.c:2950
+#: ../src/fe-gtk/maingui.c:2957
 msgid "Highlight all occurrences, and underline the current occurrence."
 msgstr "已高亮所有结果,并在当前匹配项下加上下划线。"
 
-#: ../src/fe-gtk/maingui.c:2952
+#: ../src/fe-gtk/maingui.c:2959
 msgid "Mat_ch case"
-msgstr "匹配大小写(_M)"
+msgstr "匹配大小写(_C)"
 
-#: ../src/fe-gtk/maingui.c:2957
+#: ../src/fe-gtk/maingui.c:2964
 msgid "Perform a case-sensitive search."
 msgstr "进行大小写敏感的搜索。"
 
-#: ../src/fe-gtk/maingui.c:2959
+#: ../src/fe-gtk/maingui.c:2966
 msgid "_Regex"
 msgstr "正则表达式(_R)"
 
-#: ../src/fe-gtk/maingui.c:2964
+#: ../src/fe-gtk/maingui.c:2971
 msgid "Regard search string as a regular expression."
 msgstr "将搜索字符串作为正则表达式使用。"
 
@@ -3885,45 +3936,45 @@ msgid "Account unknown"
 msgstr "未知账户"
 
 #. let the translators tweak this if need be
-#: ../src/fe-gtk/menu.c:613
+#: ../src/fe-gtk/menu.c:614
 #, c-format
 msgid "<tt><b>%-11s</b></tt> %s"
 msgstr "<tt><b>%-11s</b></tt> %s"
 
-#: ../src/fe-gtk/menu.c:614
+#: ../src/fe-gtk/menu.c:615
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/fe-gtk/menu.c:619 ../src/fe-gtk/menu.c:623
+#: ../src/fe-gtk/menu.c:620 ../src/fe-gtk/menu.c:624
 msgid "Real Name:"
 msgstr "真实姓名:"
 
-#: ../src/fe-gtk/menu.c:630
+#: ../src/fe-gtk/menu.c:631
 msgid "User:"
 msgstr "用户:"
 
-#: ../src/fe-gtk/menu.c:637
+#: ../src/fe-gtk/menu.c:638
 msgid "Account:"
 msgstr "账户:"
 
-#: ../src/fe-gtk/menu.c:647
+#: ../src/fe-gtk/menu.c:648
 msgid "Country:"
 msgstr "国家:"
 
-#: ../src/fe-gtk/menu.c:653
+#: ../src/fe-gtk/menu.c:654
 msgid "Server:"
 msgstr "服务器:"
 
-#: ../src/fe-gtk/menu.c:664
+#: ../src/fe-gtk/menu.c:665
 #, c-format
 msgid "%u minutes ago"
 msgstr "%u 分钟之前"
 
-#: ../src/fe-gtk/menu.c:666 ../src/fe-gtk/menu.c:669
+#: ../src/fe-gtk/menu.c:667 ../src/fe-gtk/menu.c:670
 msgid "Last Msg:"
 msgstr "最后发言:"
 
-#: ../src/fe-gtk/menu.c:679
+#: ../src/fe-gtk/menu.c:680
 msgid "Away Msg:"
 msgstr "离开信息:"
 
@@ -3938,23 +3989,23 @@ msgid ""
 "right-clicking in a blank part of the main text area."
 msgstr "菜单栏当前已隐藏。您可以通过按下 Control+F9 组合键或以鼠标右键点选主要文本区域的空白部分重新显示它。"
 
-#: ../src/fe-gtk/menu.c:970
+#: ../src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开链接"
 
-#: ../src/fe-gtk/menu.c:971
+#: ../src/fe-gtk/menu.c:973
 msgid "Copy Selected Link"
 msgstr "复制选取的链接"
 
-#: ../src/fe-gtk/menu.c:1033 ../src/fe-gtk/menu.c:1393
+#: ../src/fe-gtk/menu.c:1034 ../src/fe-gtk/menu.c:1393
 msgid "Join Channel"
 msgstr "进入频道"
 
-#: ../src/fe-gtk/menu.c:1037
+#: ../src/fe-gtk/menu.c:1038
 msgid "Part Channel"
 msgstr "离开频道"
 
-#: ../src/fe-gtk/menu.c:1039
+#: ../src/fe-gtk/menu.c:1040
 msgid "Cycle Channel"
 msgstr "离开频道,而后立即进入"
 
@@ -3981,27 +4032,27 @@ msgstr "编辑此菜单..."
 
 #: ../src/fe-gtk/menu.c:1292
 msgid "Marker line disabled."
-msgstr ""
+msgstr "标记线已禁用。"
 
 #: ../src/fe-gtk/menu.c:1298
 msgid "Marker line never set."
-msgstr ""
+msgstr "标记线永不设置。"
 
 #: ../src/fe-gtk/menu.c:1302
 msgid "Marker line reset manually."
-msgstr ""
+msgstr "标记线手动重设。"
 
 #: ../src/fe-gtk/menu.c:1304
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
+msgstr "因超越回滚限制重设标记线。"
 
 #: ../src/fe-gtk/menu.c:1306
 msgid "Marker line reset by CLEAR command."
-msgstr ""
+msgstr "使用CLEAR命令重设标记线。"
 
 #: ../src/fe-gtk/menu.c:1308
 msgid "Marker line state unknown."
-msgstr ""
+msgstr "标记线状态未知。"
 
 #: ../src/fe-gtk/menu.c:1395
 msgid "Retrieve channel list..."
@@ -4155,7 +4206,7 @@ msgstr "频道窗口..."
 msgid "_Load Plugin or Script..."
 msgstr "载入插件或脚本(_L)..."
 
-#: ../src/fe-gtk/menu.c:1762 ../src/fe-gtk/plugin-tray.c:659
+#: ../src/fe-gtk/menu.c:1762 ../src/fe-gtk/plugin-tray.c:575
 msgid "_Quit"
 msgstr "离开(_Q)"
 
@@ -4178,7 +4229,7 @@ msgstr "用户菜单(_U)"
 
 #: ../src/fe-gtk/menu.c:1769
 msgid "U_serlist Buttons"
-msgstr "用户列表按钮(_U)..."
+msgstr "用户列表按钮(_S)"
 
 #: ../src/fe-gtk/menu.c:1770
 msgid "M_ode Buttons"
@@ -4200,7 +4251,7 @@ msgstr "树状图(_R)"
 msgid "_Network Meters"
 msgstr "网络流量(_N)"
 
-#: ../src/fe-gtk/menu.c:1779 ../src/fe-gtk/setup.c:212
+#: ../src/fe-gtk/menu.c:1779 ../src/fe-gtk/setup.c:214
 msgid "Off"
 msgstr "离线"
 
@@ -4245,7 +4296,7 @@ msgstr "用户菜单(_U)"
 msgid "S_ettings"
 msgstr "设置(_E)"
 
-#: ../src/fe-gtk/menu.c:1799 ../src/fe-gtk/plugin-tray.c:656
+#: ../src/fe-gtk/menu.c:1799 ../src/fe-gtk/plugin-tray.c:573
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
@@ -4308,7 +4359,7 @@ msgstr "文件传输(_T)..."
 
 #: ../src/fe-gtk/menu.c:1816
 msgid "Friends List..."
-msgstr "好友列表"
+msgstr "好友列表…"
 
 #: ../src/fe-gtk/menu.c:1817
 msgid "Ignore List..."
@@ -4333,7 +4384,7 @@ msgstr "重置标记线"
 
 #: ../src/fe-gtk/menu.c:1823
 msgid "Move to Marker Line"
-msgstr ""
+msgstr "移动至标记线"
 
 #: ../src/fe-gtk/menu.c:1824
 msgid "_Copy Selection"
@@ -4363,7 +4414,7 @@ msgstr "搜索下一个"
 msgid "Search Previous"
 msgstr "搜索上一个"
 
-#: ../src/fe-gtk/menu.c:1834 ../src/fe-gtk/menu.c:2321
+#: ../src/fe-gtk/menu.c:1834 ../src/fe-gtk/menu.c:2329
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -4376,9 +4427,9 @@ msgstr "内容(_C)"
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/fe-gtk/menu.c:2334
+#: ../src/fe-gtk/menu.c:2342
 msgid "_Attach"
-msgstr "整合(_A)"
+msgstr "附加(_A)"
 
 #: ../src/fe-gtk/notifygui.c:123 ../src/fe-gtk/plugingui.c:63
 msgid "Name"
@@ -4392,7 +4443,7 @@ msgstr "上次发现"
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/fe-gtk/notifygui.c:188 ../src/fe-gtk/setup.c:285
+#: ../src/fe-gtk/notifygui.c:188 ../src/fe-gtk/setup.c:287
 msgid "Never"
 msgstr "从不"
 
@@ -4415,158 +4466,168 @@ msgstr "%d 小时之前"
 msgid "Online"
 msgstr "上线"
 
-#: ../src/fe-gtk/notifygui.c:341
+#: ../src/fe-gtk/notifygui.c:343
 msgid "Enter nickname to add:"
 msgstr "输入要添加的昵称:"
 
-#: ../src/fe-gtk/notifygui.c:370
+#: ../src/fe-gtk/notifygui.c:372
 msgid "Notify on these networks:"
 msgstr "在这些网络中进行通知:"
 
-#: ../src/fe-gtk/notifygui.c:381
+#: ../src/fe-gtk/notifygui.c:383
 msgid "Comma separated list of networks is accepted."
 msgstr "此处允许使用逗号分隔多个网络。"
 
-#: ../src/fe-gtk/notifygui.c:407
+#: ../src/fe-gtk/notifygui.c:409
 msgid ": Friends List"
 msgstr ":好友列表"
 
-#: ../src/fe-gtk/notifygui.c:429
+#: ../src/fe-gtk/notifygui.c:431
 msgid "Open Dialog"
 msgstr "打开对话框"
 
-#: ../src/fe-gtk/plugin-tray.c:264
+#: ../src/fe-gtk/plugin-notification.c:111
+#, c-format
+msgid "Highlighted message from: %s (%s)"
+msgstr "高亮消息来自于:%s (%s)"
+
+#: ../src/fe-gtk/plugin-notification.c:123
+#, c-format
+msgid "Channel message from: %s (%s)"
+msgstr "频道消息来自于: %s (%s)"
+
+#: ../src/fe-gtk/plugin-notification.c:144
+#, c-format
+msgid "File offer from: %s (%s)"
+msgstr "文件传输来自于: %s (%s)"
+
+#: ../src/fe-gtk/plugin-notification.c:149
+#, c-format
+msgid "Invited to channel by: %s (%s)"
+msgstr "受 %s (%s) 的邀请来到频道"
+
+#: ../src/fe-gtk/plugin-notification.c:154
+#, c-format
+msgid "Notice from: %s (%s)"
+msgstr "%s  (%s) 发的通知"
+
+#: ../src/fe-gtk/plugin-notification.c:158
+#, c-format
+msgid "Private message from: %s (%s)"
+msgstr "私聊消息来自于:%s (%s)"
+
+#: ../src/fe-gtk/plugin-tray.c:176
 #, c-format
 msgid ": Connected to %u networks and %u channels"
 msgstr ":已连接到 %u 个网络和 %u 个频道"
 
-#: ../src/fe-gtk/plugin-tray.c:628
+#: ../src/fe-gtk/plugin-tray.c:545
 msgid "_Restore Window"
 msgstr "还原窗口 (_R)"
 
-#: ../src/fe-gtk/plugin-tray.c:630
+#: ../src/fe-gtk/plugin-tray.c:547
 msgid "_Hide Window"
 msgstr "隐藏窗口 (_H)"
 
-#: ../src/fe-gtk/plugin-tray.c:634
+#: ../src/fe-gtk/plugin-tray.c:551
 msgid "_Blink on"
 msgstr "闪烁于(_B)"
 
-#: ../src/fe-gtk/plugin-tray.c:635 ../src/fe-gtk/setup.c:647
+#: ../src/fe-gtk/plugin-tray.c:552 ../src/fe-gtk/setup.c:706
 msgid "Channel Message"
 msgstr "频道消息"
 
-#: ../src/fe-gtk/plugin-tray.c:636 ../src/fe-gtk/setup.c:648
+#: ../src/fe-gtk/plugin-tray.c:553 ../src/fe-gtk/setup.c:707
 msgid "Private Message"
 msgstr "私聊消息"
 
-#: ../src/fe-gtk/plugin-tray.c:637 ../src/fe-gtk/setup.c:649
+#: ../src/fe-gtk/plugin-tray.c:554 ../src/fe-gtk/setup.c:708
 msgid "Highlighted Message"
 msgstr "高亮显示的消息"
 
 #. blink_item (BIT_FILEOFFER, submenu, _("File Offer"));
-#: ../src/fe-gtk/plugin-tray.c:640
+#: ../src/fe-gtk/plugin-tray.c:557
 msgid "_Change status"
 msgstr "更改状态(_C)"
 
-#: ../src/fe-gtk/plugin-tray.c:646
+#: ../src/fe-gtk/plugin-tray.c:563
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: ../src/fe-gtk/plugin-tray.c:649
+#: ../src/fe-gtk/plugin-tray.c:566
 msgid "_Back"
 msgstr "返回(_B)"
 
-#: ../src/fe-gtk/plugin-tray.c:714
+#: ../src/fe-gtk/plugin-tray.c:630
 #, c-format
 msgid ": Highlighted message from: %s (%s)"
 msgstr ":高亮消息来自于:%s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:717
+#: ../src/fe-gtk/plugin-tray.c:633
 #, c-format
 msgid ": %u highlighted messages, latest from: %s (%s)"
 msgstr ":%u 条高亮消息,最近一条来自于:%s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:722
-#, c-format
-msgid "Highlighted message from: %s (%s)"
-msgstr "高亮消息来自于:%s (%s)"
-
-#: ../src/fe-gtk/plugin-tray.c:740
+#: ../src/fe-gtk/plugin-tray.c:652
 #, c-format
 msgid ": Channel message from: %s (%s)"
 msgstr ": 频道消息来自于: %s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:743
+#: ../src/fe-gtk/plugin-tray.c:655
 #, c-format
 msgid ": %u channel messages."
 msgstr ": %u 频道消息。"
 
-#: ../src/fe-gtk/plugin-tray.c:747
-#, c-format
-msgid "Channel message from: %s (%s)"
-msgstr "频道消息来自于: %s (%s)"
-
-#: ../src/fe-gtk/plugin-tray.c:771
+#: ../src/fe-gtk/plugin-tray.c:679
 #, c-format
 msgid ": Private message from: %s (%s)"
 msgstr ":私聊消息来自于:%s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:774
+#: ../src/fe-gtk/plugin-tray.c:682
 #, c-format
 msgid ": %u private messages, latest from: %s (%s)"
 msgstr ":%u 条私聊消息,最近的一个来自于: %s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:779
-#, c-format
-msgid "Private message from: %s (%s)"
-msgstr "私聊消息来自于:%s (%s)"
-
-#: ../src/fe-gtk/plugin-tray.c:818
+#: ../src/fe-gtk/plugin-tray.c:722
 #, c-format
 msgid ": File offer from: %s (%s)"
 msgstr "XChat: 文件传输来自于: %s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:821
+#: ../src/fe-gtk/plugin-tray.c:725
 #, c-format
 msgid ": %u file offers, latest from: %s (%s)"
 msgstr "Xchat: %u 个文件传输,最近的一个来自于:%s (%s)"
 
-#: ../src/fe-gtk/plugin-tray.c:826
-#, c-format
-msgid "File offer from: %s (%s)"
-msgstr "文件传输来自于: %s (%s)"
-
 #: ../src/fe-gtk/plugingui.c:64
 msgid "Version"
 msgstr "版本"
 
-#: ../src/fe-gtk/plugingui.c:66 ../src/fe-gtk/textgui.c:428
+#: ../src/fe-gtk/plugingui.c:66 ../src/fe-gtk/textgui.c:424
 msgid "Description"
 msgstr "描述"
 
-#: ../src/fe-gtk/plugingui.c:163
+#: ../src/fe-gtk/plugingui.c:161
 msgid "Select a Plugin or Script to load"
 msgstr "选择要载入的插件或脚本"
 
-#: ../src/fe-gtk/plugingui.c:252
+#: ../src/fe-gtk/plugingui.c:237
 msgid ": Plugins and Scripts"
 msgstr ":插件和脚本"
 
-#: ../src/fe-gtk/plugingui.c:267
+#: ../src/fe-gtk/plugingui.c:252
 msgid "_Load..."
 msgstr "载入(_L)..."
 
-#: ../src/fe-gtk/plugingui.c:270
+#: ../src/fe-gtk/plugingui.c:255
 msgid "_Unload"
 msgstr "卸载(_U)"
 
-#: ../src/fe-gtk/plugingui.c:273
+#: ../src/fe-gtk/plugingui.c:258
 msgid "_Reload"
 msgstr "重新载入(_R)"
 
 #: ../src/fe-gtk/rawlog.c:80 ../src/fe-gtk/rawlog.c:136
-#: ../src/fe-gtk/textgui.c:479 ../src/fe-gtk/urlgrab.c:216
+#: ../src/fe-gtk/textgui.c:475 ../src/fe-gtk/urlgrab.c:216
 msgid "Save As..."
 msgstr "另存为..."
 
@@ -4583,43 +4644,43 @@ msgstr "清除原始记录"
 msgid "New Network"
 msgstr "添加网络"
 
-#: ../src/fe-gtk/servlistgui.c:757
+#: ../src/fe-gtk/servlistgui.c:756
 #, c-format
 msgid "Really remove network \"%s\" and all its servers?"
 msgstr "确实要删除网络 “%s” 以及它的所有服务器吗?"
 
-#: ../src/fe-gtk/servlistgui.c:1126 ../src/fe-gtk/servlistgui.c:1557
+#: ../src/fe-gtk/servlistgui.c:1125 ../src/fe-gtk/servlistgui.c:1556
 msgid "User name cannot be left blank."
 msgstr "用户名不可留空。"
 
-#: ../src/fe-gtk/servlistgui.c:1578
+#: ../src/fe-gtk/servlistgui.c:1577
 msgid "You must have two unique nick names."
-msgstr ""
+msgstr "您必须拥有两个昵称."
 
-#: ../src/fe-gtk/servlistgui.c:1630
+#: ../src/fe-gtk/servlistgui.c:1628
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
 msgstr "您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
 
-#: ../src/fe-gtk/servlistgui.c:1704
+#: ../src/fe-gtk/servlistgui.c:1702
 #, c-format
 msgid ": Edit %s"
 msgstr ":编辑 %s"
 
-#: ../src/fe-gtk/servlistgui.c:1725
+#: ../src/fe-gtk/servlistgui.c:1723
 msgid "Servers"
 msgstr "服务器"
 
-#: ../src/fe-gtk/servlistgui.c:1726
+#: ../src/fe-gtk/servlistgui.c:1724
 msgid "Autojoin channels"
 msgstr "自动加入频道"
 
-#: ../src/fe-gtk/servlistgui.c:1727
+#: ../src/fe-gtk/servlistgui.c:1725
 msgid "Connect commands"
 msgstr "连接命令"
 
-#: ../src/fe-gtk/servlistgui.c:1739
+#: ../src/fe-gtk/servlistgui.c:1737
 msgid ""
 "%n=Nick name\n"
 "%p=Password\n"
@@ -4627,1404 +4688,1434 @@ msgid ""
 "%u=User name"
 msgstr "%n=昵称\n%p=密码\n%r=真实姓名\n%u=用户名"
 
-#: ../src/fe-gtk/servlistgui.c:1795
+#: ../src/fe-gtk/servlistgui.c:1793
 msgid "Key (Password)"
 msgstr "密码"
 
-#: ../src/fe-gtk/servlistgui.c:1847
+#: ../src/fe-gtk/servlistgui.c:1845
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/fe-gtk/servlistgui.c:1860
+#: ../src/fe-gtk/servlistgui.c:1858
 msgid "Connect to selected server only"
 msgstr "只连接到选取的服务器"
 
-#: ../src/fe-gtk/servlistgui.c:1861
+#: ../src/fe-gtk/servlistgui.c:1859
 msgid "Don't cycle through all the servers when the connection fails."
 msgstr "当连接失败时不要循环跳至所有的服务器。"
 
-#: ../src/fe-gtk/servlistgui.c:1862
+#: ../src/fe-gtk/servlistgui.c:1860
 msgid "Connect to this network automatically"
 msgstr "自动连接到此网络"
 
-#: ../src/fe-gtk/servlistgui.c:1863
+#: ../src/fe-gtk/servlistgui.c:1861
 msgid "Bypass proxy server"
-msgstr "代理服务器"
+msgstr "忽略代理服务器"
 
-#: ../src/fe-gtk/servlistgui.c:1864
+#: ../src/fe-gtk/servlistgui.c:1862
 msgid "Use SSL for all the servers on this network"
 msgstr "在本网络的所有服务器上使用 SSL"
 
-#: ../src/fe-gtk/servlistgui.c:1868
+#: ../src/fe-gtk/servlistgui.c:1866
 msgid "Accept invalid SSL certificates"
 msgstr "接受无效的 SSL 证书"
 
-#: ../src/fe-gtk/servlistgui.c:1872
+#: ../src/fe-gtk/servlistgui.c:1870
 msgid "Use global user information"
 msgstr "使用全局用户信息"
 
-#: ../src/fe-gtk/servlistgui.c:1874 ../src/fe-gtk/servlistgui.c:1991
+#: ../src/fe-gtk/servlistgui.c:1872 ../src/fe-gtk/servlistgui.c:1989
 msgid "_Nick name:"
 msgstr "昵称(_N):"
 
-#: ../src/fe-gtk/servlistgui.c:1875 ../src/fe-gtk/servlistgui.c:1998
+#: ../src/fe-gtk/servlistgui.c:1873 ../src/fe-gtk/servlistgui.c:1996
 msgid "Second choice:"
 msgstr "第二选择:"
 
-#: ../src/fe-gtk/servlistgui.c:1876
+#: ../src/fe-gtk/servlistgui.c:1874
 msgid "Rea_l name:"
 msgstr "真实姓名(_L):"
 
-#: ../src/fe-gtk/servlistgui.c:1877 ../src/fe-gtk/servlistgui.c:2012
+#: ../src/fe-gtk/servlistgui.c:1875 ../src/fe-gtk/servlistgui.c:2010
 msgid "_User name:"
 msgstr "用户名(_U):"
 
-#: ../src/fe-gtk/servlistgui.c:1879
+#: ../src/fe-gtk/servlistgui.c:1877
 msgid "Login method:"
 msgstr "登录方法:"
 
-#: ../src/fe-gtk/servlistgui.c:1885 ../src/fe-gtk/setup.c:607
+#: ../src/fe-gtk/servlistgui.c:1883 ../src/fe-gtk/setup.c:656
 msgid "Password:"
 msgstr "密码:"
 
-#: ../src/fe-gtk/servlistgui.c:1885
+#: ../src/fe-gtk/servlistgui.c:1883
 msgid "Password used for login. If in doubt, leave blank."
 msgstr "登录时使用的密码。如果不确定请留空。"
 
-#: ../src/fe-gtk/servlistgui.c:1890
+#: ../src/fe-gtk/servlistgui.c:1888
 msgid "Character set:"
 msgstr "字符集:"
 
-#: ../src/fe-gtk/servlistgui.c:1970
+#: ../src/fe-gtk/servlistgui.c:1968
 msgid ": Network List"
 msgstr ":网络列表"
 
-#: ../src/fe-gtk/servlistgui.c:1981
+#: ../src/fe-gtk/servlistgui.c:1979
 msgid "User Information"
 msgstr "用户信息"
 
-#: ../src/fe-gtk/servlistgui.c:2005
+#: ../src/fe-gtk/servlistgui.c:2003
 msgid "Third choice:"
 msgstr "第三选择:"
 
-#: ../src/fe-gtk/servlistgui.c:2065
+#: ../src/fe-gtk/servlistgui.c:2063
 msgid "Networks"
 msgstr "网络"
 
-#: ../src/fe-gtk/servlistgui.c:2113
+#: ../src/fe-gtk/servlistgui.c:2111
 msgid "Skip network list on startup"
 msgstr "启动时不打开网络列表"
 
-#: ../src/fe-gtk/servlistgui.c:2122
+#: ../src/fe-gtk/servlistgui.c:2120
 msgid "Show favorites only"
 msgstr "只显示已收藏的"
 
-#: ../src/fe-gtk/servlistgui.c:2152
+#: ../src/fe-gtk/servlistgui.c:2150
 msgid "_Edit..."
-msgstr "编辑(_E)"
+msgstr "编辑(_E)…"
 
-#: ../src/fe-gtk/servlistgui.c:2159
+#: ../src/fe-gtk/servlistgui.c:2157
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: ../src/fe-gtk/servlistgui.c:2160
+#: ../src/fe-gtk/servlistgui.c:2158
 msgid ""
 "Sorts the network list in alphabetical order. Use SHIFT-UP and SHIFT-DOWN "
 "keys to move a row."
 msgstr "按字母顺序排练网络列表。使用SHIFT+上下方向键来移动行。"
 
-#: ../src/fe-gtk/servlistgui.c:2168
+#: ../src/fe-gtk/servlistgui.c:2166
 msgid "_Favor"
-msgstr "收藏 (_F)"
+msgstr "收藏(_F)"
 
-#: ../src/fe-gtk/servlistgui.c:2169
+#: ../src/fe-gtk/servlistgui.c:2167
 msgid "Mark or unmark this network as a favorite."
 msgstr "标记/取消标记 收藏此网络"
 
-#: ../src/fe-gtk/servlistgui.c:2193
+#: ../src/fe-gtk/servlistgui.c:2191
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../src/fe-gtk/setup.c:88
+#: ../src/fe-gtk/setup.c:90
 msgid "Afrikaans"
 msgstr "南非语"
 
-#: ../src/fe-gtk/setup.c:89
+#: ../src/fe-gtk/setup.c:91
 msgid "Albanian"
 msgstr "阿尔巴尼亚语"
 
-#: ../src/fe-gtk/setup.c:90
+#: ../src/fe-gtk/setup.c:92
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: ../src/fe-gtk/setup.c:91
+#: ../src/fe-gtk/setup.c:93
 msgid "Asturian"
 msgstr "阿斯图里亚斯语"
 
-#: ../src/fe-gtk/setup.c:92
+#: ../src/fe-gtk/setup.c:94
 msgid "Azerbaijani"
 msgstr "阿塞拜疆语"
 
-#: ../src/fe-gtk/setup.c:93
+#: ../src/fe-gtk/setup.c:95
 msgid "Basque"
 msgstr "巴斯克语"
 
-#: ../src/fe-gtk/setup.c:94
+#: ../src/fe-gtk/setup.c:96
 msgid "Belarusian"
 msgstr "白俄罗斯语"
 
-#: ../src/fe-gtk/setup.c:95
+#: ../src/fe-gtk/setup.c:97
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: ../src/fe-gtk/setup.c:97
+#: ../src/fe-gtk/setup.c:99
 msgid "Chinese (Simplified)"
 msgstr "简体中文"
 
-#: ../src/fe-gtk/setup.c:98
+#: ../src/fe-gtk/setup.c:100
 msgid "Chinese (Traditional)"
 msgstr "正体中文"
 
-#: ../src/fe-gtk/setup.c:99
+#: ../src/fe-gtk/setup.c:101
 msgid "Czech"
 msgstr "捷克语"
 
-#: ../src/fe-gtk/setup.c:100
+#: ../src/fe-gtk/setup.c:102
 msgid "Danish"
 msgstr "丹麦语"
 
-#: ../src/fe-gtk/setup.c:101
+#: ../src/fe-gtk/setup.c:103
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../src/fe-gtk/setup.c:102
+#: ../src/fe-gtk/setup.c:104
 msgid "English (British)"
 msgstr "英语(英国)"
 
-#: ../src/fe-gtk/setup.c:103
+#: ../src/fe-gtk/setup.c:105
 msgid "English"
 msgstr "英语"
 
-#: ../src/fe-gtk/setup.c:104
+#: ../src/fe-gtk/setup.c:106
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
-#: ../src/fe-gtk/setup.c:105
+#: ../src/fe-gtk/setup.c:107
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: ../src/fe-gtk/setup.c:106
+#: ../src/fe-gtk/setup.c:108
 msgid "French"
 msgstr "法语"
 
-#: ../src/fe-gtk/setup.c:107
+#: ../src/fe-gtk/setup.c:109
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: ../src/fe-gtk/setup.c:108
+#: ../src/fe-gtk/setup.c:110
 msgid "German"
 msgstr "德语"
 
-#: ../src/fe-gtk/setup.c:109
+#: ../src/fe-gtk/setup.c:111
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../src/fe-gtk/setup.c:110
+#: ../src/fe-gtk/setup.c:112
 msgid "Gujarati"
 msgstr "古吉拉特语"
 
-#: ../src/fe-gtk/setup.c:111
+#: ../src/fe-gtk/setup.c:113
 msgid "Hindi"
 msgstr "印度语"
 
-#: ../src/fe-gtk/setup.c:112
+#: ../src/fe-gtk/setup.c:114
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: ../src/fe-gtk/setup.c:113
+#: ../src/fe-gtk/setup.c:115
 msgid "Indonesian"
 msgstr "印度尼西亚语"
 
-#: ../src/fe-gtk/setup.c:114
+#: ../src/fe-gtk/setup.c:116
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../src/fe-gtk/setup.c:115
+#: ../src/fe-gtk/setup.c:117
 msgid "Japanese"
 msgstr "日本语"
 
-#: ../src/fe-gtk/setup.c:116
+#: ../src/fe-gtk/setup.c:118
 msgid "Kannada"
 msgstr "卡纳达语"
 
-#: ../src/fe-gtk/setup.c:117
+#: ../src/fe-gtk/setup.c:119
 msgid "Kinyarwanda"
 msgstr "卢旺达语"
 
-#: ../src/fe-gtk/setup.c:118
+#: ../src/fe-gtk/setup.c:120
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../src/fe-gtk/setup.c:119
+#: ../src/fe-gtk/setup.c:121
 msgid "Latvian"
 msgstr "拉脱维亚语"
 
-#: ../src/fe-gtk/setup.c:120
+#: ../src/fe-gtk/setup.c:122
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: ../src/fe-gtk/setup.c:121
+#: ../src/fe-gtk/setup.c:123
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: ../src/fe-gtk/setup.c:122
+#: ../src/fe-gtk/setup.c:124
 msgid "Malay"
 msgstr "马来西亚语"
 
-#: ../src/fe-gtk/setup.c:123
+#: ../src/fe-gtk/setup.c:125
 msgid "Malayalam"
 msgstr "马拉雅拉姆语"
 
-#: ../src/fe-gtk/setup.c:124
+#: ../src/fe-gtk/setup.c:126
 msgid "Norwegian (Bokmal)"
 msgstr "挪威语(波克默尔语)"
 
-#: ../src/fe-gtk/setup.c:125
+#: ../src/fe-gtk/setup.c:127
 msgid "Norwegian (Nynorsk)"
 msgstr "挪威语(尼诺斯克语)"
 
-#: ../src/fe-gtk/setup.c:126
+#: ../src/fe-gtk/setup.c:128
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../src/fe-gtk/setup.c:127
+#: ../src/fe-gtk/setup.c:129
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../src/fe-gtk/setup.c:128
+#: ../src/fe-gtk/setup.c:130
 msgid "Portuguese (Brazilian)"
 msgstr "葡萄牙语(巴西)"
 
-#: ../src/fe-gtk/setup.c:129
+#: ../src/fe-gtk/setup.c:131
 msgid "Punjabi"
 msgstr "旁遮普语"
 
-#: ../src/fe-gtk/setup.c:130
+#: ../src/fe-gtk/setup.c:132
 msgid "Russian"
 msgstr "俄语"
 
-#: ../src/fe-gtk/setup.c:131
+#: ../src/fe-gtk/setup.c:133
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: ../src/fe-gtk/setup.c:132
+#: ../src/fe-gtk/setup.c:134
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: ../src/fe-gtk/setup.c:133
+#: ../src/fe-gtk/setup.c:135
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: ../src/fe-gtk/setup.c:134
+#: ../src/fe-gtk/setup.c:136
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../src/fe-gtk/setup.c:135
+#: ../src/fe-gtk/setup.c:137
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../src/fe-gtk/setup.c:136
+#: ../src/fe-gtk/setup.c:138
 msgid "Thai"
 msgstr "泰语"
 
-#: ../src/fe-gtk/setup.c:137
+#: ../src/fe-gtk/setup.c:139
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../src/fe-gtk/setup.c:138
+#: ../src/fe-gtk/setup.c:140
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: ../src/fe-gtk/setup.c:139
+#: ../src/fe-gtk/setup.c:141
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../src/fe-gtk/setup.c:140
+#: ../src/fe-gtk/setup.c:142
 msgid "Walloon"
 msgstr "瓦隆语"
 
-#: ../src/fe-gtk/setup.c:147 ../src/fe-gtk/setup.c:1814
+#: ../src/fe-gtk/setup.c:149 ../src/fe-gtk/setup.c:1872
 msgid "General"
 msgstr "一般"
 
-#: ../src/fe-gtk/setup.c:149
+#: ../src/fe-gtk/setup.c:151
 msgid "Language:"
 msgstr "语言:"
 
-#: ../src/fe-gtk/setup.c:150
+#: ../src/fe-gtk/setup.c:152
 msgid "Main font:"
 msgstr "主要字体:"
 
-#: ../src/fe-gtk/setup.c:152
+#: ../src/fe-gtk/setup.c:154
 msgid "Font:"
 msgstr "字体:"
 
-#: ../src/fe-gtk/setup.c:155
+#: ../src/fe-gtk/setup.c:157
 msgid "Text Box"
 msgstr "文本框"
 
-#: ../src/fe-gtk/setup.c:156
+#: ../src/fe-gtk/setup.c:158
 msgid "Colored nick names"
 msgstr "彩色昵称"
 
-#: ../src/fe-gtk/setup.c:156
+#: ../src/fe-gtk/setup.c:158
 msgid "Give each person on IRC a different color"
 msgstr "给 IRC 上的每名用户使用一种不同的颜色"
 
-#: ../src/fe-gtk/setup.c:157
+#: ../src/fe-gtk/setup.c:159
 msgid "Indent nick names"
 msgstr "昵称缩进"
 
-#: ../src/fe-gtk/setup.c:157
+#: ../src/fe-gtk/setup.c:159
 msgid "Make nick names right-justified"
 msgstr "让昵称右侧对齐"
 
-#: ../src/fe-gtk/setup.c:158
+#: ../src/fe-gtk/setup.c:160
 msgid "Show marker line"
 msgstr "显示标记线"
 
-#: ../src/fe-gtk/setup.c:158
+#: ../src/fe-gtk/setup.c:160
 msgid "Insert a red line after the last read text."
 msgstr "在最后读取的文本后添加一条红线。"
 
-#: ../src/fe-gtk/setup.c:159
+#: ../src/fe-gtk/setup.c:161
 msgid "Background image:"
 msgstr "背景图像:"
 
-#: ../src/fe-gtk/setup.c:161
+#: ../src/fe-gtk/setup.c:163
 msgid "Transparency Settings"
 msgstr "透明度设置"
 
-#: ../src/fe-gtk/setup.c:162
+#: ../src/fe-gtk/setup.c:164
 msgid "Window Opacity:"
 msgstr "窗口透明度:"
 
-#: ../src/fe-gtk/setup.c:164 ../src/fe-gtk/setup.c:538
+#: ../src/fe-gtk/setup.c:166 ../src/fe-gtk/setup.c:594
 msgid "Time Stamps"
 msgstr "时间戳"
 
-#: ../src/fe-gtk/setup.c:165
+#: ../src/fe-gtk/setup.c:167
 msgid "Enable time stamps"
 msgstr "启用时间戳"
 
-#: ../src/fe-gtk/setup.c:166
+#: ../src/fe-gtk/setup.c:168
 msgid "Time stamp format:"
 msgstr "时间戳格式:"
 
-#: ../src/fe-gtk/setup.c:168 ../src/fe-gtk/setup.c:542
+#: ../src/fe-gtk/setup.c:170 ../src/fe-gtk/setup.c:598
 msgid "See the strftime MSDN article for details."
 msgstr "请参考 MSDN 上 strftime 的详细解释。"
 
-#: ../src/fe-gtk/setup.c:170 ../src/fe-gtk/setup.c:544
+#: ../src/fe-gtk/setup.c:172 ../src/fe-gtk/setup.c:600
 msgid "See the strftime manpage for details."
 msgstr "请参考手册页上 strftime 的详细解释。"
 
-#: ../src/fe-gtk/setup.c:173
+#: ../src/fe-gtk/setup.c:175
 msgid "Title Bar"
 msgstr "标题栏"
 
-#: ../src/fe-gtk/setup.c:174
+#: ../src/fe-gtk/setup.c:176
 msgid "Show channel modes"
 msgstr "显示频道模式"
 
-#: ../src/fe-gtk/setup.c:175
+#: ../src/fe-gtk/setup.c:177
 msgid "Show number of users"
 msgstr "显示用户数"
 
-#: ../src/fe-gtk/setup.c:182 ../src/fe-gtk/setup.c:222
+#: ../src/fe-gtk/setup.c:184 ../src/fe-gtk/setup.c:224
 msgid "A-Z"
 msgstr "A-Z"
 
-#: ../src/fe-gtk/setup.c:183
+#: ../src/fe-gtk/setup.c:185
 msgid "Last-spoke order"
 msgstr "按最后发言时间"
 
-#: ../src/fe-gtk/setup.c:189
+#: ../src/fe-gtk/setup.c:191
 msgid "Input Box"
 msgstr "输入框"
 
-#: ../src/fe-gtk/setup.c:190 ../src/fe-gtk/setup.c:254
+#: ../src/fe-gtk/setup.c:192 ../src/fe-gtk/setup.c:256
 msgid "Use the Text box font and colors"
 msgstr "使用文本框字体及颜色"
 
-#: ../src/fe-gtk/setup.c:191
+#: ../src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
 msgstr "渲染色彩和属性"
 
-#: ../src/fe-gtk/setup.c:192
+#: ../src/fe-gtk/setup.c:194
 msgid "Show nick box"
 msgstr "显示昵称框"
 
-#: ../src/fe-gtk/setup.c:193
+#: ../src/fe-gtk/setup.c:195
 msgid "Show user mode icon in nick box"
 msgstr "在昵称框中显示用户模式图标"
 
-#: ../src/fe-gtk/setup.c:194
+#: ../src/fe-gtk/setup.c:196
 msgid "Spell checking"
 msgstr "拼写检查"
 
-#: ../src/fe-gtk/setup.c:195
+#: ../src/fe-gtk/setup.c:197
 msgid "Dictionaries to use:"
 msgstr "要使用的字典:"
 
-#: ../src/fe-gtk/setup.c:197
+#: ../src/fe-gtk/setup.c:199
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
 msgstr "要使用的语言代码 (位于 \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" 中).\n以英文逗号分隔每一项。"
 
-#: ../src/fe-gtk/setup.c:199
+#: ../src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
 msgstr "要使用的语言代码,以英文逗号分隔每一项。"
 
-#: ../src/fe-gtk/setup.c:202
+#: ../src/fe-gtk/setup.c:204
 msgid "Nick Completion"
 msgstr "昵称自动补全"
 
-#: ../src/fe-gtk/setup.c:203
+#: ../src/fe-gtk/setup.c:205
 msgid "Nick completion suffix:"
 msgstr "昵称自动补全后缀:"
 
-#: ../src/fe-gtk/setup.c:204
+#: ../src/fe-gtk/setup.c:206
 msgid "Nick completion sorted:"
 msgstr "昵称排序:"
 
-#: ../src/fe-gtk/setup.c:205
+#: ../src/fe-gtk/setup.c:207
 msgid "Nick completion amount:"
 msgstr "昵称自动补全量:"
 
-#: ../src/fe-gtk/setup.c:205
+#: ../src/fe-gtk/setup.c:207
 msgid "Threshold of nicks to start listing instead of completing"
 msgstr "开始列出昵称而不是补全昵称的"
 
-#: ../src/fe-gtk/setup.c:205
+#: ../src/fe-gtk/setup.c:207
 msgid "nicks."
-msgstr "阈值。"
+msgstr "昵称。"
 
-#: ../src/fe-gtk/setup.c:213
+#: ../src/fe-gtk/setup.c:215
 msgid "Graphical"
 msgstr "图形化的"
 
-#: ../src/fe-gtk/setup.c:221
+#: ../src/fe-gtk/setup.c:223
 msgid "A-Z, Ops first"
 msgstr "A-Z,管理员在最先"
 
-#: ../src/fe-gtk/setup.c:223
+#: ../src/fe-gtk/setup.c:225
 msgid "Z-A, Ops last"
 msgstr "Z-A,管理员在最后"
 
-#: ../src/fe-gtk/setup.c:224
+#: ../src/fe-gtk/setup.c:226
 msgid "Z-A"
 msgstr "Z-A"
 
-#: ../src/fe-gtk/setup.c:225
+#: ../src/fe-gtk/setup.c:227
 msgid "Unsorted"
 msgstr "不排序"
 
-#: ../src/fe-gtk/setup.c:231 ../src/fe-gtk/setup.c:243
+#: ../src/fe-gtk/setup.c:233 ../src/fe-gtk/setup.c:245
 msgid "Left (Upper)"
 msgstr "左上"
 
-#: ../src/fe-gtk/setup.c:232 ../src/fe-gtk/setup.c:244
+#: ../src/fe-gtk/setup.c:234 ../src/fe-gtk/setup.c:246
 msgid "Left (Lower)"
 msgstr "左下"
 
-#: ../src/fe-gtk/setup.c:233 ../src/fe-gtk/setup.c:245
+#: ../src/fe-gtk/setup.c:235 ../src/fe-gtk/setup.c:247
 msgid "Right (Upper)"
 msgstr "右上"
 
-#: ../src/fe-gtk/setup.c:234 ../src/fe-gtk/setup.c:246
+#: ../src/fe-gtk/setup.c:236 ../src/fe-gtk/setup.c:248
 msgid "Right (Lower)"
 msgstr "右下"
 
-#: ../src/fe-gtk/setup.c:235
+#: ../src/fe-gtk/setup.c:237
 msgid "Top"
 msgstr "顶部"
 
-#: ../src/fe-gtk/setup.c:236
+#: ../src/fe-gtk/setup.c:238
 msgid "Bottom"
 msgstr "底部"
 
-#: ../src/fe-gtk/setup.c:237
+#: ../src/fe-gtk/setup.c:239
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../src/fe-gtk/setup.c:252
+#: ../src/fe-gtk/setup.c:254
 msgid "User List"
 msgstr "用户列表"
 
-#: ../src/fe-gtk/setup.c:253
+#: ../src/fe-gtk/setup.c:255
 msgid "Show hostnames in user list"
 msgstr "在用户列表中显示主机名"
 
-#: ../src/fe-gtk/setup.c:255
+#: ../src/fe-gtk/setup.c:257
 msgid "Show icons for user modes"
 msgstr "显示用户模式的图标"
 
-#: ../src/fe-gtk/setup.c:255
+#: ../src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
 msgstr "在用户列表中使用图形化图标,而不是文本图标"
 
-#: ../src/fe-gtk/setup.c:256
+#: ../src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
 msgstr "用户列表中的昵称着色"
 
-#: ../src/fe-gtk/setup.c:256
+#: ../src/fe-gtk/setup.c:258
 msgid "Will color nicknames the same as in chat."
 msgstr "昵称色彩与聊天窗口中一致。"
 
-#: ../src/fe-gtk/setup.c:257
+#: ../src/fe-gtk/setup.c:259
 msgid "Show user count in channels"
 msgstr "显示当前频道用户数"
 
 #. {ST_TOGGLE, N_("Resizable user list"),
 #. P_OFFINTNL(hex_gui_ulist_resizable),0,0,0},
-#: ../src/fe-gtk/setup.c:259
+#: ../src/fe-gtk/setup.c:261
 msgid "User list sorted by:"
 msgstr "用户列表排列方式:"
 
-#: ../src/fe-gtk/setup.c:260
+#: ../src/fe-gtk/setup.c:262
 msgid "Show user list at:"
 msgstr "显示用户列表于:"
 
-#: ../src/fe-gtk/setup.c:262
+#: ../src/fe-gtk/setup.c:264
 msgid "Away Tracking"
 msgstr "追踪离开状态"
 
-#: ../src/fe-gtk/setup.c:263
+#: ../src/fe-gtk/setup.c:265
 msgid "Track the Away status of users and mark them in a different color"
 msgstr "追踪用户的离开状态并且以不同颜色标记"
 
-#: ../src/fe-gtk/setup.c:264
+#: ../src/fe-gtk/setup.c:266
 msgid "On channels smaller than:"
 msgstr "在小于此值的频道里:"
 
-#: ../src/fe-gtk/setup.c:266
+#: ../src/fe-gtk/setup.c:268
 msgid "Action Upon Double Click"
 msgstr "双击时的动作"
 
-#: ../src/fe-gtk/setup.c:269
+#: ../src/fe-gtk/setup.c:271
 msgid "Extra Gadgets"
 msgstr "附加小程序"
 
-#: ../src/fe-gtk/setup.c:270
+#: ../src/fe-gtk/setup.c:272
 msgid "Lag meter:"
 msgstr "延时表:"
 
-#: ../src/fe-gtk/setup.c:271
+#: ../src/fe-gtk/setup.c:273
 msgid "Throttle meter:"
 msgstr "流量表;"
 
-#: ../src/fe-gtk/setup.c:278
+#: ../src/fe-gtk/setup.c:280
 msgid "Windows"
 msgstr "窗口"
 
-#: ../src/fe-gtk/setup.c:279 ../src/fe-gtk/setup.c:301
+#: ../src/fe-gtk/setup.c:281 ../src/fe-gtk/setup.c:303
 msgid "Tabs"
 msgstr "标签页"
 
-#: ../src/fe-gtk/setup.c:286
+#: ../src/fe-gtk/setup.c:288
 msgid "Always"
 msgstr "总是"
 
-#: ../src/fe-gtk/setup.c:287
+#: ../src/fe-gtk/setup.c:289
 msgid "Only requested tabs"
 msgstr "只有请求的标签页"
 
-#: ../src/fe-gtk/setup.c:293
+#: ../src/fe-gtk/setup.c:295
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/fe-gtk/setup.c:294
+#: ../src/fe-gtk/setup.c:296
 msgid "In an extra tab"
 msgstr "在另外的标签页中"
 
-#: ../src/fe-gtk/setup.c:295
+#: ../src/fe-gtk/setup.c:297
 msgid "In the front tab"
 msgstr "在最前的标签页中"
 
 #. 0 tabs
 #. 1 reserved
-#: ../src/fe-gtk/setup.c:303
+#: ../src/fe-gtk/setup.c:305
 msgid "Tree"
 msgstr "树状图"
 
 #. {ST_HEADER,	N_("Channel Switcher"),0,0,0},
-#: ../src/fe-gtk/setup.c:310
+#: ../src/fe-gtk/setup.c:312
 msgid "Switcher type:"
 msgstr "转换器类型:"
 
-#: ../src/fe-gtk/setup.c:311
+#: ../src/fe-gtk/setup.c:313
 msgid "Open an extra tab for server messages"
 msgstr "打开额外的标签页存放服务器信息"
 
-#: ../src/fe-gtk/setup.c:312
+#: ../src/fe-gtk/setup.c:314
 msgid "Open a new tab when you receive a private message"
 msgstr "当您收到私聊消息时打开新的标签页"
 
-#: ../src/fe-gtk/setup.c:313
+#: ../src/fe-gtk/setup.c:315
 msgid "Sort tabs in alphabetical order"
 msgstr "按字母表顺序排序标签页"
 
-#: ../src/fe-gtk/setup.c:314
+#: ../src/fe-gtk/setup.c:316
 msgid "Show icons in the channel tree"
 msgstr "在频道树中显示图标"
 
-#: ../src/fe-gtk/setup.c:315
+#: ../src/fe-gtk/setup.c:317
 msgid "Show dotted lines in the channel tree"
 msgstr "在频道树中显示虚线"
 
-#: ../src/fe-gtk/setup.c:316
+#: ../src/fe-gtk/setup.c:318
 msgid "Scroll mouse-wheel to change tabs"
 msgstr "用鼠标滚轮改变当前标签页"
 
-#: ../src/fe-gtk/setup.c:317
+#: ../src/fe-gtk/setup.c:319
+msgid "Middle click to close tab"
+msgstr "中键关闭标签页"
+
+#: ../src/fe-gtk/setup.c:320
 msgid "Smaller text"
 msgstr "小字"
 
-#: ../src/fe-gtk/setup.c:318
+#: ../src/fe-gtk/setup.c:321
 msgid "Focus new tabs:"
 msgstr "聚焦到新标签页:"
 
-#: ../src/fe-gtk/setup.c:319
+#: ../src/fe-gtk/setup.c:322
 msgid "Placement of notices:"
 msgstr "放置通知:"
 
-#: ../src/fe-gtk/setup.c:320
+#: ../src/fe-gtk/setup.c:323
 msgid "Show channel switcher at:"
 msgstr "显示频道转换器于:"
 
-#: ../src/fe-gtk/setup.c:321
+#: ../src/fe-gtk/setup.c:324
 msgid "Shorten tab labels to:"
 msgstr "缩短标签页标签页至:"
 
-#: ../src/fe-gtk/setup.c:321
+#: ../src/fe-gtk/setup.c:324
 msgid "letters."
 msgstr "个字母。"
 
-#: ../src/fe-gtk/setup.c:323
+#: ../src/fe-gtk/setup.c:326
 msgid "Tabs or Windows"
 msgstr "标签页或窗口"
 
-#: ../src/fe-gtk/setup.c:324
+#: ../src/fe-gtk/setup.c:327
 msgid "Open channels in:"
 msgstr "打开频道于:"
 
-#: ../src/fe-gtk/setup.c:325
+#: ../src/fe-gtk/setup.c:328
 msgid "Open dialogs in:"
 msgstr "打开对话框于:"
 
-#: ../src/fe-gtk/setup.c:326
+#: ../src/fe-gtk/setup.c:329
 msgid "Open utilities in:"
 msgstr "打开工具于:"
 
-#: ../src/fe-gtk/setup.c:326
+#: ../src/fe-gtk/setup.c:329
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
 msgstr "打开 DCC、忽略、通知等动作时使用标签页还是窗口?"
 
-#: ../src/fe-gtk/setup.c:333
+#: ../src/fe-gtk/setup.c:336
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/fe-gtk/setup.c:334
+#: ../src/fe-gtk/setup.c:337
 msgid "Scrollback"
 msgstr "往回滚动"
 
-#: ../src/fe-gtk/setup.c:342
+#: ../src/fe-gtk/setup.c:345
 msgid "Ask for confirmation"
 msgstr "请求确认"
 
-#: ../src/fe-gtk/setup.c:343
+#: ../src/fe-gtk/setup.c:346
 msgid "Ask for download folder"
 msgstr "请求指定下载文件夹"
 
-#: ../src/fe-gtk/setup.c:344
+#: ../src/fe-gtk/setup.c:347
 msgid "Save without interaction"
 msgstr "直接保存无需交互"
 
-#: ../src/fe-gtk/setup.c:350
+#: ../src/fe-gtk/setup.c:353
 msgid "Files and Directories"
 msgstr "文件和目录"
 
-#: ../src/fe-gtk/setup.c:351
+#: ../src/fe-gtk/setup.c:354
 msgid "Auto accept file offers:"
 msgstr "自动接受文件传输:"
 
-#: ../src/fe-gtk/setup.c:352
+#: ../src/fe-gtk/setup.c:355
 msgid "Download files to:"
 msgstr "把文件下载到:"
 
-#: ../src/fe-gtk/setup.c:353
+#: ../src/fe-gtk/setup.c:356
 msgid "Move completed files to:"
 msgstr "将完成下载的文件移动到:"
 
-#: ../src/fe-gtk/setup.c:354
+#: ../src/fe-gtk/setup.c:357
 msgid "Save nick name in filenames"
 msgstr "把昵称存入文件名"
 
-#: ../src/fe-gtk/setup.c:356
+#: ../src/fe-gtk/setup.c:359
 msgid "Auto Open DCC Windows"
 msgstr "自动打开 DDC 窗口"
 
-#: ../src/fe-gtk/setup.c:357
+#: ../src/fe-gtk/setup.c:360
 msgid "Send window"
 msgstr "发送窗口"
 
-#: ../src/fe-gtk/setup.c:358
+#: ../src/fe-gtk/setup.c:361
 msgid "Receive window"
 msgstr "接收窗口"
 
-#: ../src/fe-gtk/setup.c:359
+#: ../src/fe-gtk/setup.c:362
 msgid "Chat window"
 msgstr "聊天窗口"
 
-#: ../src/fe-gtk/setup.c:361
+#: ../src/fe-gtk/setup.c:364
 msgid "Maximum File Transfer Speeds (bytes per second)"
 msgstr "最大文件传输速度(字节每秒)"
 
-#: ../src/fe-gtk/setup.c:362
+#: ../src/fe-gtk/setup.c:365
 msgid "One upload:"
 msgstr "每个上传任务:"
 
-#: ../src/fe-gtk/setup.c:363 ../src/fe-gtk/setup.c:365
+#: ../src/fe-gtk/setup.c:366 ../src/fe-gtk/setup.c:368
 msgid "Maximum speed for one transfer"
 msgstr "一个传送进程的最大速度"
 
-#: ../src/fe-gtk/setup.c:364
+#: ../src/fe-gtk/setup.c:367
 msgid "One download:"
 msgstr "每个下载任务:"
 
-#: ../src/fe-gtk/setup.c:366
+#: ../src/fe-gtk/setup.c:369
 msgid "All uploads combined:"
 msgstr "所有上传:"
 
-#: ../src/fe-gtk/setup.c:367 ../src/fe-gtk/setup.c:369
+#: ../src/fe-gtk/setup.c:370 ../src/fe-gtk/setup.c:372
 msgid "Maximum speed for all files"
 msgstr "所有文件的最大速度"
 
-#: ../src/fe-gtk/setup.c:368
+#: ../src/fe-gtk/setup.c:371
 msgid "All downloads combined:"
 msgstr "所有下载"
 
-#: ../src/fe-gtk/setup.c:396 ../src/fe-gtk/setup.c:449
-#: ../src/fe-gtk/setup.c:1815
+#: ../src/fe-gtk/setup.c:399 ../src/fe-gtk/setup.c:440
+#: ../src/fe-gtk/setup.c:483 ../src/fe-gtk/setup.c:506
+#: ../src/fe-gtk/setup.c:1873
 msgid "Alerts"
 msgstr "提示"
 
-#: ../src/fe-gtk/setup.c:400 ../src/fe-gtk/setup.c:452
-msgid "Show tray balloons on:"
-msgstr "托盘气泡提示显示于:"
+#: ../src/fe-gtk/setup.c:404 ../src/fe-gtk/setup.c:486
+msgid "Show notifications on:"
+msgstr "显示通知于:"
 
-#: ../src/fe-gtk/setup.c:402
+#: ../src/fe-gtk/setup.c:405 ../src/fe-gtk/setup.c:443
 msgid "Blink tray icon on:"
 msgstr "托盘图标闪烁于:"
 
-#: ../src/fe-gtk/setup.c:404
-msgid "Bounce dock icon on:"
-msgstr ""
-
-#: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:453
+#: ../src/fe-gtk/setup.c:406 ../src/fe-gtk/setup.c:448
+#: ../src/fe-gtk/setup.c:487 ../src/fe-gtk/setup.c:509
 msgid "Blink task bar on:"
 msgstr "任务栏图标闪烁于:"
 
-#: ../src/fe-gtk/setup.c:411 ../src/fe-gtk/setup.c:414
-#: ../src/fe-gtk/setup.c:416 ../src/fe-gtk/setup.c:454
+#: ../src/fe-gtk/setup.c:408 ../src/fe-gtk/setup.c:411
+#: ../src/fe-gtk/setup.c:413 ../src/fe-gtk/setup.c:452
+#: ../src/fe-gtk/setup.c:455 ../src/fe-gtk/setup.c:457
+#: ../src/fe-gtk/setup.c:488 ../src/fe-gtk/setup.c:510
 msgid "Make a beep sound on:"
 msgstr "响铃于:"
 
-#: ../src/fe-gtk/setup.c:411
+#: ../src/fe-gtk/setup.c:408 ../src/fe-gtk/setup.c:452
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
 msgstr "在选择的事件上播放系统 \"即时消息提醒\" 声音"
 
-#: ../src/fe-gtk/setup.c:414
+#: ../src/fe-gtk/setup.c:411 ../src/fe-gtk/setup.c:455
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
 msgstr "在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
 
-#: ../src/fe-gtk/setup.c:416
+#: ../src/fe-gtk/setup.c:413 ../src/fe-gtk/setup.c:457
 msgid "Play a GTK beep upon the selected events"
 msgstr "在已选择的事件上播放 GTK beep 声"
 
-#: ../src/fe-gtk/setup.c:420 ../src/fe-gtk/setup.c:456
+#: ../src/fe-gtk/setup.c:417 ../src/fe-gtk/setup.c:461
+#: ../src/fe-gtk/setup.c:490 ../src/fe-gtk/setup.c:512
 msgid "Omit alerts when marked as being away"
 msgstr "标记为离开时不提醒"
 
-#: ../src/fe-gtk/setup.c:421 ../src/fe-gtk/setup.c:457
+#: ../src/fe-gtk/setup.c:418 ../src/fe-gtk/setup.c:462
+#: ../src/fe-gtk/setup.c:491 ../src/fe-gtk/setup.c:513
 msgid "Omit alerts while the window is focused"
 msgstr "窗口获得焦点时不提醒"
 
-#: ../src/fe-gtk/setup.c:423
+#: ../src/fe-gtk/setup.c:420 ../src/fe-gtk/setup.c:464
 msgid "Tray Behavior"
 msgstr "托盘行为"
 
-#: ../src/fe-gtk/setup.c:425 ../src/fe-gtk/setup.c:427
+#: ../src/fe-gtk/setup.c:421 ../src/fe-gtk/setup.c:465
 msgid "Enable system tray icon"
 msgstr "激活系统托盘图标"
 
-#: ../src/fe-gtk/setup.c:429
+#: ../src/fe-gtk/setup.c:422 ../src/fe-gtk/setup.c:466
 msgid "Minimize to tray"
 msgstr "最小化至系统托盘"
 
-#: ../src/fe-gtk/setup.c:430
+#: ../src/fe-gtk/setup.c:423 ../src/fe-gtk/setup.c:467
 msgid "Close to tray"
 msgstr "关闭到系统托盘"
 
-#: ../src/fe-gtk/setup.c:431
+#: ../src/fe-gtk/setup.c:424 ../src/fe-gtk/setup.c:468
 msgid "Automatically mark away/back"
 msgstr "自动取消离开状态"
 
-#: ../src/fe-gtk/setup.c:431
+#: ../src/fe-gtk/setup.c:424 ../src/fe-gtk/setup.c:468
 msgid "Automatically change status when hiding to tray."
 msgstr "在隐藏到托盘后自动改变状态。"
 
-#: ../src/fe-gtk/setup.c:433
-msgid "Only show tray balloons when hidden or iconified"
-msgstr "仅在隐藏或缩小为图标是显示托盘气泡"
+#: ../src/fe-gtk/setup.c:425
+msgid "Only show notifications when hidden or iconified"
+msgstr "仅在隐藏或缩小为图标是显示通知"
 
-#: ../src/fe-gtk/setup.c:436 ../src/fe-gtk/setup.c:459
+#: ../src/fe-gtk/setup.c:427 ../src/fe-gtk/setup.c:470
+#: ../src/fe-gtk/setup.c:493 ../src/fe-gtk/setup.c:515
 msgid "Highlighted Messages"
 msgstr "高亮显示消息"
 
-#: ../src/fe-gtk/setup.c:437 ../src/fe-gtk/setup.c:460
+#: ../src/fe-gtk/setup.c:428 ../src/fe-gtk/setup.c:471
+#: ../src/fe-gtk/setup.c:494 ../src/fe-gtk/setup.c:516
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
 msgstr "高亮消息是当您的昵称被提到时所显示的消息,同时还显示:"
 
-#: ../src/fe-gtk/setup.c:439 ../src/fe-gtk/setup.c:462
+#: ../src/fe-gtk/setup.c:430 ../src/fe-gtk/setup.c:473
+#: ../src/fe-gtk/setup.c:496 ../src/fe-gtk/setup.c:518
 msgid "Extra words to highlight:"
 msgstr "需要高亮显示的其他单词:"
 
-#: ../src/fe-gtk/setup.c:440 ../src/fe-gtk/setup.c:463
+#: ../src/fe-gtk/setup.c:431 ../src/fe-gtk/setup.c:474
+#: ../src/fe-gtk/setup.c:497 ../src/fe-gtk/setup.c:519
 msgid "Nick names not to highlight:"
 msgstr "不高亮显示的昵称:"
 
-#: ../src/fe-gtk/setup.c:441 ../src/fe-gtk/setup.c:464
+#: ../src/fe-gtk/setup.c:432 ../src/fe-gtk/setup.c:475
+#: ../src/fe-gtk/setup.c:498 ../src/fe-gtk/setup.c:520
 msgid "Nick names to always highlight:"
 msgstr "总是高亮显示的昵称:"
 
-#: ../src/fe-gtk/setup.c:442 ../src/fe-gtk/setup.c:465
+#: ../src/fe-gtk/setup.c:433 ../src/fe-gtk/setup.c:476
+#: ../src/fe-gtk/setup.c:499 ../src/fe-gtk/setup.c:521
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
 msgstr "请用逗号分隔多个词组。\n可以使用通配符。"
 
-#: ../src/fe-gtk/setup.c:472
+#: ../src/fe-gtk/setup.c:445
+msgid "Bounce dock icon on:"
+msgstr "弹跳托盘图标于:"
+
+#: ../src/fe-gtk/setup.c:528
 msgid "Default Messages"
 msgstr "默认信息"
 
-#: ../src/fe-gtk/setup.c:473
+#: ../src/fe-gtk/setup.c:529
 msgid "Quit:"
 msgstr "退出:"
 
-#: ../src/fe-gtk/setup.c:474
+#: ../src/fe-gtk/setup.c:530
 msgid "Leave channel:"
 msgstr "离开频道:"
 
-#: ../src/fe-gtk/setup.c:475
+#: ../src/fe-gtk/setup.c:531
 msgid "Away:"
 msgstr "离开:"
 
-#: ../src/fe-gtk/setup.c:477
+#: ../src/fe-gtk/setup.c:533
 msgid "Away"
 msgstr "离开"
 
-#: ../src/fe-gtk/setup.c:478
+#: ../src/fe-gtk/setup.c:534
 msgid "Show away once"
 msgstr "只显示离开一次"
 
-#: ../src/fe-gtk/setup.c:478
+#: ../src/fe-gtk/setup.c:534
 msgid "Show identical away messages only once."
 msgstr "同样的离开信息只显示一次"
 
-#: ../src/fe-gtk/setup.c:479
+#: ../src/fe-gtk/setup.c:535
 msgid "Automatically unmark away"
 msgstr "自动取消离开状态"
 
-#: ../src/fe-gtk/setup.c:479
+#: ../src/fe-gtk/setup.c:535
 msgid "Unmark yourself as away before sending messages."
 msgstr "发送信息前取消您的离开状态"
 
-#: ../src/fe-gtk/setup.c:481 ../src/fe-gtk/setup.c:514
+#: ../src/fe-gtk/setup.c:537 ../src/fe-gtk/setup.c:570
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: ../src/fe-gtk/setup.c:482
+#: ../src/fe-gtk/setup.c:538
 msgid "Display MODEs in raw form"
 msgstr "使用原始格式显示模式"
 
-#: ../src/fe-gtk/setup.c:483
+#: ../src/fe-gtk/setup.c:539
 msgid "WHOIS on notify"
 msgstr "通知列表 Whois"
 
-#: ../src/fe-gtk/setup.c:483
+#: ../src/fe-gtk/setup.c:539
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr "当您通知列表中的某位用户上线时发送 /WHOIS 命令"
+msgstr "当您通知列表中的某位用户上线时发送 /WHOIS 命令。"
 
-#: ../src/fe-gtk/setup.c:484
+#: ../src/fe-gtk/setup.c:540
 msgid "Hide join and part messages"
 msgstr "隐藏进入/离开信息"
 
-#: ../src/fe-gtk/setup.c:484
+#: ../src/fe-gtk/setup.c:540
 msgid "Hide channel join/part messages by default."
 msgstr "默认隐藏频道里的进入/离开信息"
 
-#: ../src/fe-gtk/setup.c:485
+#: ../src/fe-gtk/setup.c:541
 msgid "Hide nick change messages"
-msgstr ""
+msgstr "隐藏昵称变更信息"
 
-#: ../src/fe-gtk/setup.c:492
+#: ../src/fe-gtk/setup.c:548
 msgid "*!*@*.host"
 msgstr "*!*@*.host"
 
-#: ../src/fe-gtk/setup.c:493
+#: ../src/fe-gtk/setup.c:549
 msgid "*!*@domain"
 msgstr "*!*@domain"
 
-#: ../src/fe-gtk/setup.c:494
+#: ../src/fe-gtk/setup.c:550
 msgid "*!*user@*.host"
 msgstr "*!*user@*.host"
 
-#: ../src/fe-gtk/setup.c:495
+#: ../src/fe-gtk/setup.c:551
 msgid "*!*user@domain"
 msgstr "*!*user@domain"
 
-#: ../src/fe-gtk/setup.c:501
+#: ../src/fe-gtk/setup.c:557
 msgid "Auto Copy Behavior"
 msgstr "自动复制行为"
 
-#: ../src/fe-gtk/setup.c:502
+#: ../src/fe-gtk/setup.c:558
 msgid "Automatically copy selected text"
 msgstr "自动复制已选中文本"
 
-#: ../src/fe-gtk/setup.c:503
+#: ../src/fe-gtk/setup.c:559
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, CONTROL-SHIFT-C will copy the selected text to the clipboard."
 msgstr "在释放鼠标左键时将选中文本复制到剪贴板。否则,使用 CONTROL-SHIFT-C 将选中文本复制到剪贴板。"
 
-#: ../src/fe-gtk/setup.c:506
+#: ../src/fe-gtk/setup.c:562
 msgid "Automatically include time stamps"
 msgstr "自动加上时间戳"
 
-#: ../src/fe-gtk/setup.c:507
+#: ../src/fe-gtk/setup.c:563
 msgid ""
 "Automatically include time stamps in copied lines of text. Otherwise, "
 "include time stamps if the SHIFT key is held down while selecting."
 msgstr "自动在复制的每行文本后加上时间戳,否则,在选择时按下 SHIFT 键后包含时间戳。"
 
-#: ../src/fe-gtk/setup.c:509
+#: ../src/fe-gtk/setup.c:565
 msgid "Automatically include color information"
 msgstr "自动加上颜色信息"
 
-#: ../src/fe-gtk/setup.c:510
+#: ../src/fe-gtk/setup.c:566
 msgid ""
 "Automatically include color information in copied lines of text.  Otherwise,"
 " include color information if the CONTROL key is held down while selecting."
 msgstr "自动在复制的每行文本中加上颜色信息,否则,在选择时按下 CONTROL 键后包含颜色信息。"
 
-#: ../src/fe-gtk/setup.c:515
+#: ../src/fe-gtk/setup.c:571
 msgid "Real name:"
 msgstr "真实姓名:"
 
-#: ../src/fe-gtk/setup.c:517
+#: ../src/fe-gtk/setup.c:573
 msgid "Alternative fonts:"
 msgstr "备用字体:"
 
-#: ../src/fe-gtk/setup.c:517
+#: ../src/fe-gtk/setup.c:573
 msgid "Separate multiple entries with commas without spaces before or after."
 msgstr "分隔多项时使用英文逗号,逗号两侧无空格。"
 
-#: ../src/fe-gtk/setup.c:519
+#: ../src/fe-gtk/setup.c:575
 msgid "Display lists in compact mode"
 msgstr "在紧凑模式中显示列表"
 
-#: ../src/fe-gtk/setup.c:519
+#: ../src/fe-gtk/setup.c:575
 msgid "Use less spacing between user list/channel tree rows."
 msgstr "减少用户列表/用户频道树的行与行之间的空隙。"
 
-#: ../src/fe-gtk/setup.c:520
+#: ../src/fe-gtk/setup.c:576
 msgid "Use server time if supported"
 msgstr "在支持的情况下使用服务器时间"
 
-#: ../src/fe-gtk/setup.c:520
+#: ../src/fe-gtk/setup.c:576
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
 msgstr "在支持服务器时间扩展的情况下,显示从服务器获取的时间戳信息。"
 
-#: ../src/fe-gtk/setup.c:521
+#: ../src/fe-gtk/setup.c:577
 msgid "Automatically reconnect to servers on disconnect"
 msgstr "断线重连"
 
-#: ../src/fe-gtk/setup.c:522
+#: ../src/fe-gtk/setup.c:578
 msgid "Auto reconnect delay:"
 msgstr "自动重连间隔:"
 
-#: ../src/fe-gtk/setup.c:523
+#: ../src/fe-gtk/setup.c:579
 msgid "Auto join delay:"
 msgstr "自动重连间隔:"
 
-#: ../src/fe-gtk/setup.c:524
+#: ../src/fe-gtk/setup.c:580
 msgid "Ban Type:"
 msgstr "屏蔽类型:"
 
-#: ../src/fe-gtk/setup.c:524
+#: ../src/fe-gtk/setup.c:580
 msgid ""
 "Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
 msgstr "尝试在屏蔽或者设置静默时使用该屏蔽掩码 (需要 irc_who_join)。"
 
-#: ../src/fe-gtk/setup.c:531 ../src/fe-gtk/setup.c:1817
+#: ../src/fe-gtk/setup.c:587 ../src/fe-gtk/setup.c:1875
 msgid "Logging"
 msgstr "聊天记录"
 
-#: ../src/fe-gtk/setup.c:532
+#: ../src/fe-gtk/setup.c:588
 msgid "Display scrollback from previous session"
 msgstr "显示上一会话时的信息回滚"
 
-#: ../src/fe-gtk/setup.c:533
+#: ../src/fe-gtk/setup.c:589
 msgid "Scrollback lines:"
 msgstr "往回滚动的行数:"
 
-#: ../src/fe-gtk/setup.c:534
+#: ../src/fe-gtk/setup.c:590
 msgid "Enable logging of conversations to disk"
 msgstr "允许对话记录写入磁盘"
 
-#: ../src/fe-gtk/setup.c:535
+#: ../src/fe-gtk/setup.c:591
 msgid "Log filename:"
 msgstr "聊天记录文件名称:"
 
-#: ../src/fe-gtk/setup.c:536
+#: ../src/fe-gtk/setup.c:592
 #, c-format
 msgid "%s=Server %c=Channel %n=Network."
 msgstr "%s=服务器 %c=频道 %n=网络。"
 
-#: ../src/fe-gtk/setup.c:539
+#: ../src/fe-gtk/setup.c:595
 msgid "Insert timestamps in logs"
 msgstr "在聊天记录中插入时间戳"
 
-#: ../src/fe-gtk/setup.c:540
+#: ../src/fe-gtk/setup.c:596
 msgid "Log timestamp format:"
 msgstr "聊天记录时间戳格式:"
 
-#: ../src/fe-gtk/setup.c:547
+#: ../src/fe-gtk/setup.c:603
 msgid "URLs"
 msgstr "URL"
 
-#: ../src/fe-gtk/setup.c:548
+#: ../src/fe-gtk/setup.c:604
 msgid "Enable logging of URLs to disk"
 msgstr "允许URL记录写入磁盘"
 
-#: ../src/fe-gtk/setup.c:549
+#: ../src/fe-gtk/setup.c:605
 msgid "Enable URL grabber"
 msgstr "开启 URL 抓取程序"
 
-#: ../src/fe-gtk/setup.c:550
+#: ../src/fe-gtk/setup.c:606
 msgid "Maximum number of URLs to grab:"
 msgstr "抓取最多的 URL 条目数:"
 
-#: ../src/fe-gtk/setup.c:557
+#: ../src/fe-gtk/setup.c:613
 msgid "(Disabled)"
 msgstr "(已禁用)"
 
-#: ../src/fe-gtk/setup.c:558
+#: ../src/fe-gtk/setup.c:614
 msgid "Wingate"
 msgstr "Wingate"
 
-#: ../src/fe-gtk/setup.c:559
+#: ../src/fe-gtk/setup.c:615
 msgid "Socks4"
 msgstr "Socks4"
 
-#: ../src/fe-gtk/setup.c:560
+#: ../src/fe-gtk/setup.c:616
 msgid "Socks5"
 msgstr "Socks5"
 
-#: ../src/fe-gtk/setup.c:561
+#: ../src/fe-gtk/setup.c:617
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/fe-gtk/setup.c:563
-msgid "MS Proxy (ISA)"
-msgstr "MS Proxy (ISA)"
-
-#: ../src/fe-gtk/setup.c:566
+#: ../src/fe-gtk/setup.c:619
 msgid "Auto"
 msgstr "自动"
 
-#: ../src/fe-gtk/setup.c:573
+#: ../src/fe-gtk/setup.c:626
 msgid "All Connections"
 msgstr "所有连接"
 
-#: ../src/fe-gtk/setup.c:574
+#: ../src/fe-gtk/setup.c:627
 msgid "IRC Server Only"
 msgstr "仅 IRC 服务器"
 
-#: ../src/fe-gtk/setup.c:575
+#: ../src/fe-gtk/setup.c:628
 msgid "DCC Get Only"
 msgstr "仅 DCC Get"
 
-#: ../src/fe-gtk/setup.c:581
+#: ../src/fe-gtk/setup.c:634
 msgid "Your Address"
 msgstr "您的地址"
 
-#: ../src/fe-gtk/setup.c:582
+#: ../src/fe-gtk/setup.c:635
 msgid "Bind to:"
 msgstr "绑定到:"
 
-#: ../src/fe-gtk/setup.c:583
+#: ../src/fe-gtk/setup.c:636
 msgid "Only useful for computers with multiple addresses."
 msgstr "只对有多个地址的计算机有用。"
 
-#: ../src/fe-gtk/setup.c:585
+#: ../src/fe-gtk/setup.c:638
 msgid "File Transfers"
 msgstr "文件传输"
 
-#: ../src/fe-gtk/setup.c:586
+#: ../src/fe-gtk/setup.c:639
 msgid "Get my address from the IRC server"
 msgstr "从 IRC 服务器获取我的地址"
 
-#: ../src/fe-gtk/setup.c:587
+#: ../src/fe-gtk/setup.c:640
 msgid ""
 "Asks the IRC server for your real address. Use this if you have a "
 "192.168.*.* address!"
 msgstr "向 IRC 服务器查询您的真实地址。如果您有 192.168.*.* 这样的地址时,请使用此命令。"
 
-#: ../src/fe-gtk/setup.c:588
+#: ../src/fe-gtk/setup.c:641
 msgid "DCC IP address:"
 msgstr "DCC IP 地址:"
 
-#: ../src/fe-gtk/setup.c:589
+#: ../src/fe-gtk/setup.c:642
 msgid "Claim you are at this address when offering files."
 msgstr "发送文件时声称您使用此地址。"
 
-#: ../src/fe-gtk/setup.c:590
+#: ../src/fe-gtk/setup.c:643
 msgid "First DCC send port:"
 msgstr "第一个 DCC 文件发送端口:"
 
-#: ../src/fe-gtk/setup.c:591
+#: ../src/fe-gtk/setup.c:644
 msgid "Last DCC send port:"
 msgstr "最后一个 DCC 文件传送端口:"
 
-#: ../src/fe-gtk/setup.c:592
+#: ../src/fe-gtk/setup.c:645
 msgid "!Leave ports at zero for full range."
 msgstr "! 端口保留为 0 表示允许所有范围"
 
-#: ../src/fe-gtk/setup.c:594
+#: ../src/fe-gtk/setup.c:647
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: ../src/fe-gtk/setup.c:595
+#: ../src/fe-gtk/setup.c:648
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../src/fe-gtk/setup.c:596
+#: ../src/fe-gtk/setup.c:649 ../src/fe-gtk/setup.c:665
 msgid "Port:"
 msgstr "端口号:"
 
-#: ../src/fe-gtk/setup.c:597
+#: ../src/fe-gtk/setup.c:650
 msgid "Type:"
 msgstr "类型:"
 
-#: ../src/fe-gtk/setup.c:598
+#: ../src/fe-gtk/setup.c:651
 msgid "Use proxy for:"
 msgstr "应用代理于:"
 
-#: ../src/fe-gtk/setup.c:600
+#: ../src/fe-gtk/setup.c:653
 msgid "Proxy Authentication"
 msgstr "代理服务器验证"
 
-#: ../src/fe-gtk/setup.c:602
-msgid "Use Authentication (MS Proxy, HTTP or Socks5 only)"
-msgstr "使用验证(仅支持 HTTP,Socks5 或 MS Proxy 代理服务器)"
-
-#: ../src/fe-gtk/setup.c:604
+#: ../src/fe-gtk/setup.c:654
 msgid "Use Authentication (HTTP or Socks5 only)"
 msgstr "使用验证(仅支持 HTTP 或 Socks5 代理服务器)"
 
-#: ../src/fe-gtk/setup.c:606
+#: ../src/fe-gtk/setup.c:655
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../src/fe-gtk/setup.c:1052
+#: ../src/fe-gtk/setup.c:663
+msgid "Identd Server"
+msgstr "indentd 服务器"
+
+#: ../src/fe-gtk/setup.c:664
+msgid "Enabled"
+msgstr "启用"
+
+#: ../src/fe-gtk/setup.c:664
+msgid "Server will respond with the networks username"
+msgstr "服务器会返回网络用户名"
+
+#: ../src/fe-gtk/setup.c:665
+msgid ""
+"You must have permissions to listen on this port. If not 113 (0 defaults to "
+"this) then you must configure port-forwarding."
+msgstr "你必须有监听此端口的权限。若不是 113 (0 默认是这个) 你必须配置端口转发。"
+
+#: ../src/fe-gtk/setup.c:1111
 msgid "Select an Image File"
 msgstr "选择一个图像文件"
 
-#: ../src/fe-gtk/setup.c:1088
+#: ../src/fe-gtk/setup.c:1147
 msgid "Select Download Folder"
 msgstr "选择下载目录"
 
-#: ../src/fe-gtk/setup.c:1098
+#: ../src/fe-gtk/setup.c:1157
 msgid "Select font"
 msgstr "选择字体"
 
-#: ../src/fe-gtk/setup.c:1199
+#: ../src/fe-gtk/setup.c:1258
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../src/fe-gtk/setup.c:1337
+#: ../src/fe-gtk/setup.c:1396
 msgid "Open Data Folder"
 msgstr "打开数据目录"
 
-#: ../src/fe-gtk/setup.c:1388
+#: ../src/fe-gtk/setup.c:1447
 msgid "Select color"
 msgstr "选择颜色"
 
-#: ../src/fe-gtk/setup.c:1476
+#: ../src/fe-gtk/setup.c:1535
 msgid "Text Colors"
 msgstr "文本颜色"
 
-#: ../src/fe-gtk/setup.c:1478
+#: ../src/fe-gtk/setup.c:1537
 msgid "mIRC colors:"
 msgstr "mIRC 颜色:"
 
-#: ../src/fe-gtk/setup.c:1486
+#: ../src/fe-gtk/setup.c:1545
 msgid "Local colors:"
 msgstr "本地颜色:"
 
-#: ../src/fe-gtk/setup.c:1494 ../src/fe-gtk/setup.c:1499
+#: ../src/fe-gtk/setup.c:1553 ../src/fe-gtk/setup.c:1558
 msgid "Foreground:"
 msgstr "前景:"
 
-#: ../src/fe-gtk/setup.c:1495 ../src/fe-gtk/setup.c:1500
+#: ../src/fe-gtk/setup.c:1554 ../src/fe-gtk/setup.c:1559
 msgid "Background:"
 msgstr "背景:"
 
-#: ../src/fe-gtk/setup.c:1497
+#: ../src/fe-gtk/setup.c:1556
 msgid "Selected Text"
 msgstr "选中文本"
 
-#: ../src/fe-gtk/setup.c:1502
+#: ../src/fe-gtk/setup.c:1561
 msgid "Interface Colors"
 msgstr "界面颜色"
 
-#: ../src/fe-gtk/setup.c:1504
+#: ../src/fe-gtk/setup.c:1563
 msgid "New data:"
 msgstr "新数据:"
 
-#: ../src/fe-gtk/setup.c:1505
+#: ../src/fe-gtk/setup.c:1564
 msgid "Marker line:"
 msgstr "标记线:"
 
-#: ../src/fe-gtk/setup.c:1506
+#: ../src/fe-gtk/setup.c:1565
 msgid "New message:"
 msgstr "新信息:"
 
-#: ../src/fe-gtk/setup.c:1507
+#: ../src/fe-gtk/setup.c:1566
 msgid "Away user:"
 msgstr "离开的用户:"
 
-#: ../src/fe-gtk/setup.c:1508
+#: ../src/fe-gtk/setup.c:1567
 msgid "Highlight:"
 msgstr "高亮显示:"
 
-#: ../src/fe-gtk/setup.c:1509
+#: ../src/fe-gtk/setup.c:1568
 msgid "Spell checker:"
 msgstr "拼写检查程序:"
 
-#: ../src/fe-gtk/setup.c:1511
+#: ../src/fe-gtk/setup.c:1570
 msgid "Color Stripping"
 msgstr "颜色取样"
 
-#: ../src/fe-gtk/setup.c:1608 ../src/fe-gtk/textgui.c:372
+#: ../src/fe-gtk/setup.c:1667 ../src/fe-gtk/textgui.c:368
 msgid "Event"
 msgstr "事件"
 
-#: ../src/fe-gtk/setup.c:1614
+#: ../src/fe-gtk/setup.c:1673
 msgid "Sound file"
 msgstr "声音文件"
 
-#: ../src/fe-gtk/setup.c:1658
+#: ../src/fe-gtk/setup.c:1717
 msgid "Select a sound file"
 msgstr "选择声音文件"
 
-#: ../src/fe-gtk/setup.c:1743
+#: ../src/fe-gtk/setup.c:1801
 msgid "Sound file:"
 msgstr "声音文件:"
 
-#: ../src/fe-gtk/setup.c:1758
+#: ../src/fe-gtk/setup.c:1816
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
-#: ../src/fe-gtk/setup.c:1769
+#: ../src/fe-gtk/setup.c:1827
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: ../src/fe-gtk/setup.c:1806
+#: ../src/fe-gtk/setup.c:1864
 msgid "Interface"
 msgstr "界面"
 
-#: ../src/fe-gtk/setup.c:1807
+#: ../src/fe-gtk/setup.c:1865
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/fe-gtk/setup.c:1808
+#: ../src/fe-gtk/setup.c:1866
 msgid "Input box"
 msgstr "输入框"
 
-#: ../src/fe-gtk/setup.c:1809
+#: ../src/fe-gtk/setup.c:1867
 msgid "User list"
 msgstr "用户列表"
 
-#: ../src/fe-gtk/setup.c:1810
+#: ../src/fe-gtk/setup.c:1868
 msgid "Channel switcher"
 msgstr "频道转换器"
 
-#: ../src/fe-gtk/setup.c:1811
+#: ../src/fe-gtk/setup.c:1869
 msgid "Colors"
 msgstr "颜色"
 
-#: ../src/fe-gtk/setup.c:1813
+#: ../src/fe-gtk/setup.c:1871
 msgid "Chatting"
 msgstr "聊天"
 
-#: ../src/fe-gtk/setup.c:1816
+#: ../src/fe-gtk/setup.c:1874
 msgid "Sounds"
 msgstr "声音"
 
-#: ../src/fe-gtk/setup.c:1818
+#: ../src/fe-gtk/setup.c:1876
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/fe-gtk/setup.c:1821
+#: ../src/fe-gtk/setup.c:1879
 msgid "Network setup"
 msgstr "网络设置"
 
-#: ../src/fe-gtk/setup.c:1822
+#: ../src/fe-gtk/setup.c:1880
 msgid "File transfers"
 msgstr "文件传输"
 
-#: ../src/fe-gtk/setup.c:1942
+#: ../src/fe-gtk/setup.c:1881
+msgid "Identd"
+msgstr "Identd"
+
+#: ../src/fe-gtk/setup.c:2010
 msgid "Categories"
 msgstr "类别"
 
-#: ../src/fe-gtk/setup.c:2135
+#: ../src/fe-gtk/setup.c:2212
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
 msgstr "您不能把树状图放置于顶部或底部!\n请在 <b>视图</b> 菜单中的 <b>标签页</b> 样式中进行调整。"
 
-#: ../src/fe-gtk/setup.c:2160
+#: ../src/fe-gtk/setup.c:2244
 msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
 msgstr "真实姓名选项不能留空。回落到 “realname”。"
 
-#: ../src/fe-gtk/setup.c:2167
+#: ../src/fe-gtk/setup.c:2251
 msgid "Some settings were changed that require a restart to take full effect."
 msgstr "有些设置需要重新启动程序才会生效。"
 
-#: ../src/fe-gtk/setup.c:2175
+#: ../src/fe-gtk/setup.c:2259
 msgid ""
 "*WARNING*\n"
 "Auto accepting DCC to your home directory\n"
@@ -6032,34 +6123,34 @@ msgid ""
 "Someone could send you a .bash_profile"
 msgstr "*警告*\n自动接收 DCC 到您的主目录中是危险之举,\n且有被盗用的可能性。例如:\n某人可能会给您发送一份 .bash_profile 文件"
 
-#: ../src/fe-gtk/setup.c:2198
+#: ../src/fe-gtk/setup.c:2282
 msgid ": Preferences"
 msgstr ":首选项"
 
-#: ../src/fe-gtk/sexy-spell-entry.c:545
+#: ../src/fe-gtk/sexy-spell-entry.c:554
 msgid "<i>(no suggestions)</i>"
 msgstr "<i>(无拼写建议)</i>"
 
-#: ../src/fe-gtk/sexy-spell-entry.c:559
+#: ../src/fe-gtk/sexy-spell-entry.c:568
 msgid "More..."
 msgstr "更多..."
 
 #. + Add to Dictionary
-#: ../src/fe-gtk/sexy-spell-entry.c:631
+#: ../src/fe-gtk/sexy-spell-entry.c:640
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "将 \"%s\" 添加到字典"
 
 #. - Ignore All
-#: ../src/fe-gtk/sexy-spell-entry.c:676
+#: ../src/fe-gtk/sexy-spell-entry.c:685
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../src/fe-gtk/sexy-spell-entry.c:711
+#: ../src/fe-gtk/sexy-spell-entry.c:720
 msgid "Spelling Suggestions"
 msgstr "拼写建议"
 
-#: ../src/fe-gtk/sexy-spell-entry.c:1272
+#: ../src/fe-gtk/sexy-spell-entry.c:1293
 #, c-format
 msgid "enchant error for language: %s"
 msgstr "enchant 在以下语言中出错:%s"
@@ -6068,34 +6159,34 @@ msgstr "enchant 在以下语言中出错:%s"
 msgid "There was an error parsing the string"
 msgstr "解析字符串时出错"
 
-#: ../src/fe-gtk/textgui.c:179
+#: ../src/fe-gtk/textgui.c:178
 #, c-format
 msgid "This signal is only passed %d args, $%d is invalid"
 msgstr "该信号只接受 %d 个参数,$%d 无效"
 
-#: ../src/fe-gtk/textgui.c:289 ../src/fe-gtk/textgui.c:311
+#: ../src/fe-gtk/textgui.c:285 ../src/fe-gtk/textgui.c:307
 msgid "Print Texts File"
 msgstr "打印文本文件"
 
-#: ../src/fe-gtk/textgui.c:421
+#: ../src/fe-gtk/textgui.c:417
 msgid "$ Number"
 msgstr "$ 数字"
 
-#: ../src/fe-gtk/textgui.c:453
+#: ../src/fe-gtk/textgui.c:449
 msgid "Edit Events"
 msgstr "编辑事件"
 
-#: ../src/fe-gtk/textgui.c:481
+#: ../src/fe-gtk/textgui.c:477
 msgid "Load From..."
 msgstr "从...载入"
 
-#: ../src/fe-gtk/textgui.c:483
+#: ../src/fe-gtk/textgui.c:479
 msgid "Test All"
 msgstr "测试全部"
 
-#: ../src/fe-gtk/textgui.c:485
+#: ../src/fe-gtk/textgui.c:481
 msgid "OK"
-msgstr ""
+msgstr "确认"
 
 #: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"
@@ -6121,3 +6212,46 @@ msgstr "列表保存到文件"
 #, c-format
 msgid "%d ops, %d total"
 msgstr "%d 位管理员,共 %d 人"
+
+#: ../src/fe-text/fe-text.c:466
+msgid "Open an irc://server:port/channel URL"
+msgstr "打开一个 irc://server:port/channel URL"
+
+#: ../plugins/sysinfo/sysinfo.c:128
+msgid "Sysinfo: Failed to get info. Either not supported or error."
+msgstr "系统信息:获取信息失败。可能是不支持也可能是错误。"
+
+#: ../plugins/sysinfo/sysinfo.c:133
+msgid "Sysinfo: No info by that name\n"
+msgstr "系统信息:没有以此名字的信息\n"
+
+#: ../plugins/sysinfo/sysinfo.c:164 ../plugins/sysinfo/sysinfo.c:168
+#, c-format
+msgid "Sysinfo: %s is set to: %d\n"
+msgstr "系统信息:%s 被设置为:%d\n"
+
+#: ../plugins/sysinfo/sysinfo.c:178
+msgid ""
+"Sysinfo: Valid settings are: announce and hide_* for each piece of "
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "系统信息:有效的信息是:通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没有值的话将会显示当前 (或默认) 设置。\n"
+
+#: ../plugins/sysinfo/sysinfo.c:193 ../plugins/sysinfo/sysinfo.c:200
+#, c-format
+msgid "Sysinfo: pciids is set to: %s\n"
+msgstr "系统信息:pciids 被设置为:%s\n"
+
+#: ../plugins/sysinfo/sysinfo.c:218
+msgid "Sysinfo: Invalid variable name\n"
+msgstr "系统信息:无效的变量名\n"
+
+#: ../plugins/sysinfo/sysinfo.c:267
+#, c-format
+msgid "%s plugin loaded\n"
+msgstr "插件 %s 已载入\n"
+
+#: ../plugins/sysinfo/sysinfo.c:275
+#, c-format
+msgid "%s plugin unloaded\n"
+msgstr "插件 %s 以卸载\n"