summary refs log tree commit diff stats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4595
1 files changed, 2310 insertions, 2285 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 749d7c1a..35535117 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
 # Aron Xu <happyaron.xu@gmail.com>, 2010
 # Dalin <ayi880@hotmail.com>, 2003
 # chenyueg <chenyueg@gmail.com>, 2010
+# michaeljayt <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
 # 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: 2013-09-08 01:16-0400\n"
-"PO-Revision-Date: 2013-11-20 09:21+0000\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"
 "MIME-Version: 1.0\n"
@@ -26,363 +29,422 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:797
+#: ../data/misc/hexchat.appdata.xml.in.h:1
+msgid ""
+"HexChat is an easy to use yet extensible IRC Client. It allows you to "
+"securely join multiple networks and talk to users privately or in channels "
+"using a customizable interface. You can even transfer files."
+msgstr "HexChat 是一款易于使用的可扩展 IRC 客户端。它允许以安全的方式进入多个网络,与用户进行私密聊天,或者在频道中使用自定义界面,甚至还可以传送文件。"
+
+#: ../data/misc/hexchat.appdata.xml.in.h:2
+msgid ""
+"HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
+"logging, custom themes, and Python/Perl scripts."
+msgstr "HexChat 支持以下特性: DCC、SASL、代理、拼写检查、消息提醒、聊天记录、自定义主题和 Python/Perl 脚本。"
+
+#: ../data/misc/hexchat.desktop.in.h:1
+msgid "HexChat"
+msgstr "HexChat"
+
+#: ../data/misc/hexchat.desktop.in.h:2
+msgid "IRC Client"
+msgstr "IRC 客户端"
+
+#: ../data/misc/hexchat.desktop.in.h:3
+msgid "Chat with other people online"
+msgstr "与其他人在线聊天"
+
+#: ../data/misc/hexchat.desktop.in.h:4
+msgid "IM;Chat;"
+msgstr "IM;聊天;"
+
+#: ../data/misc/hexchat.desktop.in.h:5
+msgid "Open Safe Mode"
+msgstr "打开安全模式"
+
+#: ../data/misc/htm.desktop.in.h:1
+msgid "HexChat Theme Manager"
+msgstr "HexChat 主题管理器"
+
+#. 0 means unlimited
+#. STRINGS
+#: ../src/common/cfgfiles.c:848
 msgid "I'm busy"
 msgstr "我很忙"
 
-#: src/common/cfgfiles.c:828
+#: ../src/common/cfgfiles.c:883
 msgid "Leaving"
-msgstr "离开"
+msgstr "已离开"
 
-#: src/common/dcc.c:72
+#: ../src/common/dcc.c:72
 msgid "Waiting"
-msgstr "等待"
+msgstr "等待中"
 
-#: src/common/dcc.c:73
+#. black
+#: ../src/common/dcc.c:73
 msgid "Active"
 msgstr "活跃"
 
-#: src/common/dcc.c:74
+#. cyan
+#: ../src/common/dcc.c:74
 msgid "Failed"
 msgstr "失败"
 
-#: src/common/dcc.c:75
+#. red
+#: ../src/common/dcc.c:75
 msgid "Done"
 msgstr "完成"
 
-#: src/common/dcc.c:76 src/fe-gtk/menu.c:943
+#. green
+#: ../src/common/dcc.c:76 ../src/fe-gtk/menu.c:968
 msgid "Connect"
 msgstr "连接"
 
-#: src/common/dcc.c:77
+#. black
+#: ../src/common/dcc.c:77
 msgid "Aborted"
-msgstr "中止"
+msgstr "已中止"
 
-#: src/common/dcc.c:1888 src/common/outbound.c:2518
+#: ../src/common/dcc.c:1890 ../src/common/outbound.c:2554
 #, c-format
 msgid "Cannot access %s\n"
 msgstr "无法获取 %s\n"
 
-#: src/common/dcc.c:1889 src/common/text.c:1339 src/common/text.c:1382
-#: src/common/text.c:1393 src/common/text.c:1400 src/common/text.c:1413
-#: src/common/text.c:1430 src/common/text.c:1535 src/common/util.c:368
+#. ! 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
 msgid "Error"
 msgstr "错误"
 
-#: src/common/dcc.c:2367
+#: ../src/common/dcc.c:2369
 #, c-format
 msgid "%s is offering \"%s\". Do you want to accept?"
-msgstr "%s 要给您发送“%s”,接受吗?"
+msgstr "%s 要给您发送 “%s”,要接受吗?"
 
-#: src/common/dcc.c:2584
+#: ../src/common/dcc.c:2586
 msgid "No active DCCs\n"
 msgstr "没有活跃的 DCC\n"
 
-#: src/common/hexchat.c:860
+#: ../src/common/hexchat.c:867
 msgid "_Open Dialog Window"
 msgstr "打开对话窗口(_O)"
 
-#: src/common/hexchat.c:861
+#: ../src/common/hexchat.c:868
 msgid "_Send a File"
 msgstr "发送文件(_S)"
 
-#: src/common/hexchat.c:862
+#: ../src/common/hexchat.c:869
 msgid "_User Info (WhoIs)"
 msgstr "用户信息(_U)(WHOIS)"
 
-#: src/common/hexchat.c:863
+#: ../src/common/hexchat.c:870
 msgid "_Add to Friends List"
 msgstr "添加到好友列表(_A)"
 
-#: src/common/hexchat.c:864
+#: ../src/common/hexchat.c:871
 msgid "_Ignore"
-msgstr ""
+msgstr "忽略(_I)"
 
-#: src/common/hexchat.c:865
+#: ../src/common/hexchat.c:872
 msgid "O_perator Actions"
 msgstr "管理员动作(_P)"
 
-#: src/common/hexchat.c:867
+#: ../src/common/hexchat.c:874
 msgid "Give Ops"
 msgstr "赋予管理员权限"
 
-#: src/common/hexchat.c:868
+#: ../src/common/hexchat.c:875
 msgid "Take Ops"
 msgstr "取消管理员权限"
 
-#: src/common/hexchat.c:869
+#: ../src/common/hexchat.c:876
 msgid "Give Voice"
 msgstr "赋予发言权"
 
-#: src/common/hexchat.c:870
+#: ../src/common/hexchat.c:877
 msgid "Take Voice"
 msgstr "取消发言权"
 
-#: src/common/hexchat.c:872
+#: ../src/common/hexchat.c:879
 msgid "Kick/Ban"
-msgstr "踢出/屏蔽"
+msgstr "踢人/屏蔽"
 
-#: src/common/hexchat.c:873 src/common/hexchat.c:910
+#: ../src/common/hexchat.c:880 ../src/common/hexchat.c:917
 msgid "Kick"
-msgstr "踢出"
+msgstr "踢人"
 
-#: src/common/hexchat.c:874 src/common/hexchat.c:875 src/common/hexchat.c:876
-#: src/common/hexchat.c:877 src/common/hexchat.c:878 src/common/hexchat.c:909
-#: src/fe-gtk/banlist.c:50
+#: ../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/fe-gtk/banlist.c:50
 msgid "Ban"
 msgstr "屏蔽"
 
-#: src/common/hexchat.c:879 src/common/hexchat.c:880 src/common/hexchat.c:881
-#: src/common/hexchat.c:882
+#: ../src/common/hexchat.c:886 ../src/common/hexchat.c:887
+#: ../src/common/hexchat.c:888 ../src/common/hexchat.c:889
 msgid "KickBan"
 msgstr "踢出并屏蔽"
 
-#: src/common/hexchat.c:892
+#: ../src/common/hexchat.c:899
 msgid "Leave Channel"
 msgstr "离开频道"
 
-#: src/common/hexchat.c:893
+#: ../src/common/hexchat.c:900
 msgid "Join Channel..."
 msgstr "进入频道..."
 
-#: src/common/hexchat.c:894 src/fe-gtk/menu.c:1377
+#: ../src/common/hexchat.c:901 ../src/fe-gtk/menu.c:1410
 msgid "Enter Channel to Join:"
 msgstr "输入要进入的频道:"
 
-#: src/common/hexchat.c:895
+#: ../src/common/hexchat.c:902
 msgid "Server Links"
 msgstr "服务器列表"
 
-#: src/common/hexchat.c:896
+#: ../src/common/hexchat.c:903
 msgid "Ping Server"
 msgstr "Ping 服务器"
 
-#: src/common/hexchat.c:897
+#: ../src/common/hexchat.c:904
 msgid "Hide Version"
 msgstr "隐藏版本信息"
 
-#: src/common/hexchat.c:907
+#: ../src/common/hexchat.c:914
 msgid "Op"
 msgstr "赋予管理员权限"
 
-#: src/common/hexchat.c:908
+#: ../src/common/hexchat.c:915
 msgid "DeOp"
 msgstr "取消管理员权限"
 
-#: src/common/hexchat.c:911
+#: ../src/common/hexchat.c:918
 msgid "bye"
 msgstr "道别"
 
-#: src/common/hexchat.c:912
+#: ../src/common/hexchat.c:919
 #, c-format
 msgid "Enter reason to kick %s:"
 msgstr "输入踢出 %s 的原因:"
 
-#: src/common/hexchat.c:913
+#: ../src/common/hexchat.c:920
 msgid "Sendfile"
 msgstr "发送文件"
 
-#: src/common/hexchat.c:914
+#: ../src/common/hexchat.c:921
 msgid "Dialog"
 msgstr "对话"
 
-#: src/common/hexchat.c:923
+#: ../src/common/hexchat.c:930
 msgid "WhoIs"
 msgstr "WhoIs"
 
-#: src/common/hexchat.c:924
+#: ../src/common/hexchat.c:931
 msgid "Send"
 msgstr "发送"
 
-#: src/common/hexchat.c:925
+#: ../src/common/hexchat.c:932
 msgid "Chat"
 msgstr "聊天"
 
-#: src/common/hexchat.c:926 src/fe-gtk/banlist.c:847 src/fe-gtk/dccgui.c:886
-#: src/fe-gtk/ignoregui.c:385 src/fe-gtk/urlgrab.c:212
+#: ../src/common/hexchat.c:933 ../src/fe-gtk/banlist.c:852
+#: ../src/fe-gtk/dccgui.c:884 ../src/fe-gtk/ignoregui.c:385
+#: ../src/fe-gtk/urlgrab.c:212
 msgid "Clear"
 msgstr "清除"
 
-#: src/common/hexchat.c:927
+#: ../src/common/hexchat.c:934
 msgid "Ping"
 msgstr "Ping"
 
-#: src/common/hexchat.c:1120
+#: ../src/common/hexchat.c:1130
+#, 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
 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:126 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: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
 msgid "YES  "
 msgstr "是  "
 
-#: src/common/ignore.c:128 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: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
 msgid "NO   "
 msgstr "否   "
 
-#: src/common/ignore.c:383
+#: ../src/common/ignore.c:385
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
 msgstr "您正受到来自 %s 的 CTCP 洪水攻击,忽略 %s\n"
 
-#: src/common/ignore.c:408
+#: ../src/common/ignore.c:410
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
+msgstr "您正受到来自 %s 的 MSG 洪水攻击,自动打开图形化对话框参数gui_autoopen_dialog 将设置为关闭。\n"
 
-#: src/common/notify.c:555
+#: ../src/common/notify.c:558
 #, c-format
 msgid "  %-20s online\n"
 msgstr "  %-20s 在线\n"
 
-#: src/common/notify.c:557
+#: ../src/common/notify.c:560
 #, c-format
 msgid "  %-20s offline\n"
 msgstr "  %-20s 离线\n"
 
-#: src/common/outbound.c:72
+#: ../src/common/outbound.c:72
 msgid "No channel joined. Try /join #<channel>\n"
 msgstr "没有进入任何频道。请尝试 /join #<channel>\n"
 
-#: src/common/outbound.c:78
+#: ../src/common/outbound.c:78
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr "未连接任何服务器。请尝试 /server <host> [<port>]\n"
+msgstr "未连接任何服务器。请尝试输入 /server <host> [<port>]\n"
 
-#: src/common/outbound.c:281
+#: ../src/common/outbound.c:280
 #, c-format
 msgid "Server %s already exists on network %s.\n"
-msgstr ""
+msgstr "服务器 %s 已存在于网络 %s 中。\n"
 
-#: src/common/outbound.c:287
+#: ../src/common/outbound.c:286
 #, c-format
 msgid "Added server %s to network %s.\n"
-msgstr ""
+msgstr "已将服务器 %s 添加到网络 %s 中。\n"
 
-#: src/common/outbound.c:372
+#: ../src/common/outbound.c:371
 #, c-format
 msgid "Already marked away: %s\n"
 msgstr "已标记为离开:%s\n"
 
-#: src/common/outbound.c:410
+#: ../src/common/outbound.c:409
 msgid "Already marked back.\n"
 msgstr "已取消离开标记。\n"
 
-#: src/common/outbound.c:1790
+#: ../src/common/outbound.c:1793
 msgid "I need /bin/sh to run!\n"
 msgstr "使用 /bin/sh 才能执行本程序!\n"
 
-#: src/common/outbound.c:2181
+#: ../src/common/outbound.c:2214
 msgid "Commands Available:"
 msgstr "可用命令:"
 
-#: src/common/outbound.c:2195
+#: ../src/common/outbound.c:2228
 msgid "User defined commands:"
 msgstr "用户自定义命令:"
 
-#: src/common/outbound.c:2211
+#: ../src/common/outbound.c:2244
 msgid "Plugin defined commands:"
 msgstr "可用插件命令:"
 
-#: src/common/outbound.c:2222
+#: ../src/common/outbound.c:2255
 msgid "Type /HELP <command> for more information, or /HELP -l"
-msgstr "请输入 /HELP <command> 或者 /HELP -l 以获取更多信息"
+msgstr "请输入 /HELP <命令名> 或者 /HELP -l 以获取更多信息"
 
-#: src/common/outbound.c:2306
+#: ../src/common/outbound.c:2339
 #, c-format
 msgid "Unknown arg '%s' ignored."
-msgstr "忽略未知参数“%s”。"
+msgstr "忽略未知参数 “%s”。"
 
-#: src/common/outbound.c:3007 src/common/outbound.c:3037
+#: ../src/common/outbound.c:3093 ../src/common/outbound.c:3123
 msgid "Quiet is not supported by this server."
-msgstr ""
+msgstr "此服务器不支持静默。"
 
-#: src/common/outbound.c:3488 src/common/outbound.c:3522
+#. error
+#: ../src/common/outbound.c:3585 ../src/common/outbound.c:3619
 msgid "No such plugin found.\n"
 msgstr "找不到该插件。\n"
 
-#: src/common/outbound.c:3493 src/fe-gtk/plugingui.c:204
+#: ../src/common/outbound.c:3590 ../src/fe-gtk/plugingui.c:204
 msgid "That plugin is refusing to unload.\n"
 msgstr "无法卸载该插件。\n"
 
-#: src/common/outbound.c:3804
+#: ../src/common/outbound.c:3901
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr "ADDBUTTON <name> <action>,在用户列表下添加一个按钮"
+msgstr "ADDBUTTON <名称> <动作>,在用户列表下添加一个按钮"
 
-#: src/common/outbound.c:3805
+#: ../src/common/outbound.c:3902
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
+msgstr "ADDSERVER <新网络> <新服务器/6667>,向网络列表添加新网络新服务器信息"
 
-#: src/common/outbound.c:3807
+#: ../src/common/outbound.c:3904
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr "ALLCHAN <cmd>,向您所在的所有频道发送命令"
+msgstr "ALLCHAN <命令>,向您所在的所有频道发送命令"
 
-#: src/common/outbound.c:3809
+#: ../src/common/outbound.c:3906
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
+msgstr "ALLCHANL <命令>,向您所在服务器的所有频道发送命令。"
 
-#: src/common/outbound.c:3811
+#: ../src/common/outbound.c:3908
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr "ALLSERV <cmd>,向您所在的所有服务器发送命令"
+msgstr "ALLSERV <命令>,向您所在的所有服务器发送命令"
 
-#: src/common/outbound.c:3812
+#: ../src/common/outbound.c:3909
 msgid "AWAY [<reason>], sets you away"
-msgstr "AWAY [<reason>],设置您为离开状态"
+msgstr "AWAY [<离开原因>],设置为离开状态"
 
-#: src/common/outbound.c:3813
+#: ../src/common/outbound.c:3910
 msgid "BACK, sets you back (not away)"
 msgstr "BACK,取消离开状态"
 
-#: src/common/outbound.c:3815
+#: ../src/common/outbound.c:3912
 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 <mask> [<bantype>],禁止所有符合掩码 <mask> 的用户进入当前的频道。如果他们已在该频道,这个命令不会将其踢出(需要具有频道管理员身份)"
+msgstr "BAN <掩码> [<拦截类型>],禁止所有符合 <掩码> 的用户进入当前的频道。如果他们已在该频道,这个命令不会将其踢出(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3816
+#: ../src/common/outbound.c:3913
 msgid "CHANOPT [-quiet] <variable> [<value>]"
-msgstr "CHANOPT [-quiet] <variable> [<value>]"
+msgstr "CHANOPT [-quiet] <变量名> [<值>]"
 
-#: src/common/outbound.c:3817
+#: ../src/common/outbound.c:3914
 msgid ""
 "CHARSET [<encoding>], get or set the encoding used for the current "
 "connection"
-msgstr ""
+msgstr "CHARSET [<编码字符集>],获取及设置当前连接所使用的编码字符集"
 
-#: src/common/outbound.c:3818
+#: ../src/common/outbound.c:3915
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
+msgstr "CLEAR [ALL|HISTORY|[-]<amount>],清空当前的窗口文本或命令历史。"
 
-#: src/common/outbound.c:3819
+#: ../src/common/outbound.c:3916
 msgid "CLOSE [-m], Closes the current window/tab or all queries"
-msgstr ""
+msgstr "CLOSE [-m],关闭当前窗口/标签页或者所有请求"
 
-#: src/common/outbound.c:3822
+#: ../src/common/outbound.c:3919
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr "COUNTRY [-s] <code|wildcard>,查看国家代码对应的国家名,比如 :cn = 中国"
+msgstr "COUNTRY [-s] <国家地区代码|通配符>,查看国家代码对应的国家名,比如 :cn = 中国"
 
-#: src/common/outbound.c:3824
+#: ../src/common/outbound.c:3921
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr "CTCP <nick> <message>,给昵称为 <nick> 者发送 CTCP 信息,常用是 VERSION 和 USERINFO"
+msgstr "CTCP <昵称> <要发送的信息>,给昵称为 <昵称> 者发送 CTCP 信息,常用是 VERSION 和 USERINFO"
 
-#: src/common/outbound.c:3826
+#: ../src/common/outbound.c:3923
 msgid ""
 "CYCLE [<channel>], parts the current or given channel and immediately "
 "rejoins"
-msgstr "CYCLE [<channel>],离开当前频道并立即重新进入"
+msgstr "CYCLE [<频道>],离开当前频道并立即重新进入"
 
-#: src/common/outbound.c:3828
+#: ../src/common/outbound.c:3925
 msgid ""
 "\n"
 "DCC GET <nick>                      - accept an offered file\n"
@@ -393,298 +455,301 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr "\nDCC GET <nick>                     - 接收昵称为 <nick> 者使用 DCC 发送给\n                                      您的文件\nDCC SEND [-maxcps=#] <nick> [file] - 使用 DCC 发送文件给 <nick>\nDCC PSEND [-maxcps=#] <nick> [file] - 使用被动模式 DCC 发送文件给某人\nDCC LIST                           - 显示 DCC 列表\nDCC CHAT <nick>                    - 与 <nick> 进行 DCC 直连聊天\nDCC PCHAT <nick>                    - 使用 DCC 被动模式与 <nick> 聊天\nDCC CLOSE <type> <nick> <file>         例如:\n         /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:3840
+#: ../src/common/outbound.c:3937
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr "DEHOP <nick>,取消当前频道内昵称为 <nick> 的副管理员身份(需要具有频道管理员身份)"
+msgstr "DEHOP <昵称>,取消当前频道内昵称为 <昵称> 的副管理员身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3842
+#: ../src/common/outbound.c:3939
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
-msgstr "DELBUTTON <name>,删除用户列表下的一个按钮"
+msgstr "DELBUTTON <名称>,删除用户列表下的那个按钮"
 
-#: src/common/outbound.c:3844
+#: ../src/common/outbound.c:3941
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEOP <nick>,取消昵称为 <nick> 者在当前频道的管理员身份(需要具有频道管理员身份)"
+msgstr "DEOP <昵称>,取消昵称为 <昵称> 者在当前频道的管理员身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3846
+#: ../src/common/outbound.c:3943
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEVOICE <nick>,取消昵称为 <nick> 者在当前频道的发言权(需要具有频道管理员身份)"
+msgstr "DEVOICE <昵称>,取消昵称为 <昵称> 者在当前频道的发言权(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3847
+#: ../src/common/outbound.c:3944
 msgid "DISCON, Disconnects from server"
-msgstr "DISCON,从服务器断开连接"
+msgstr "DISCON,断开服务器连接"
 
-#: src/common/outbound.c:3848
-msgid "DNS <nick|host|ip>, Finds a users IP number"
-msgstr "DNS <nick|host|ip>,查询某位用户的 IP 地址"
+#: ../src/common/outbound.c:3945
+msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
+msgstr "DNS <昵称|主机|IP>,解析用户昵称、 IP 地址或者主机名"
 
-#: src/common/outbound.c:3849
+#: ../src/common/outbound.c:3946
 msgid "ECHO <text>, Prints text locally"
-msgstr "ECHO <text>,在本地显示文本"
+msgstr "ECHO <文本>,在本地显示文本"
 
-#: src/common/outbound.c:3852
+#: ../src/common/outbound.c:3949
 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] <command>,执行命令。如果使用了 -o 选项则输出到当前频道,否则输出到当前文本框"
+msgstr "EXEC [-o] <命令>,执行命令。如果使用了 -o 选项则输出到当前频道,否则输出到当前文本框"
 
-#: src/common/outbound.c:3854
+#: ../src/common/outbound.c:3951
 msgid "EXECCONT, sends the process SIGCONT"
 msgstr "EXECCONT,向进程发送 SIGCONT 信号"
 
-#: src/common/outbound.c:3857
+#: ../src/common/outbound.c:3954
 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 杀死该进程"
+msgstr "EXECKILL [-9],杀死当前会话中的某个执行进程。如果使用 -9 选项,则用 SIGKILL 杀死该进程"
 
-#: src/common/outbound.c:3859
+#: ../src/common/outbound.c:3956
 msgid "EXECSTOP, sends the process SIGSTOP"
 msgstr "EXECSTOP,向进程发送 SIGSTOP 信号"
 
-#: src/common/outbound.c:3860
+#: ../src/common/outbound.c:3957
 msgid "EXECWRITE, sends data to the processes stdin"
 msgstr "EXECWRITE,把数据发送给进程的标准输入"
 
-#: src/common/outbound.c:3864
+#: ../src/common/outbound.c:3961
 msgid "EXPORTCONF, exports HexChat settings"
-msgstr ""
+msgstr "EXPORTCONF, 导出 HexChat 设置"
 
-#: src/common/outbound.c:3867
+#: ../src/common/outbound.c:3964
 msgid "FLUSHQ, flushes the current server's send queue"
 msgstr "FLUSHQ,清空当前服务器的发送队列"
 
-#: src/common/outbound.c:3869
+#: ../src/common/outbound.c:3966
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr "GATE <host> [<port>],经由某主机来代理,默认端口为 23"
+msgstr "GATE <主机> [<端口号>],经由某主机来代理,默认端口为 23"
 
-#: src/common/outbound.c:3873
+#: ../src/common/outbound.c:3971
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr ""
+msgstr "GHOST <昵称> [密码],消灭幽灵昵称"
 
-#: src/common/outbound.c:3878
+#: ../src/common/outbound.c:3976
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr "HOP <nick>,给昵称为 <nick> 者以副管理员的身份(需要具有频道管理员身份)"
+msgstr "HOP <昵称>,给昵称为 <昵称> 者以副管理员的身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3879
+#: ../src/common/outbound.c:3977
 msgid "ID <password>, identifies yourself to nickserv"
-msgstr "ID <password>,向昵称服务器进行身份验证"
+msgstr "ID <密码>,向昵称服务器进行身份验证"
 
-#: src/common/outbound.c:3881
+#: ../src/common/outbound.c:3979
 msgid ""
 "IGNORE <mask> <types..> <options..>\n"
 "    mask - host mask to ignore, eg: *!*@*.aol.com\n"
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr "IGNORE <mask> <types..> <options..>\n    mask - 要忽略的主机掩码,比如 *!*@*.aol.com\n    types - 要忽略数据的类型,应以下选项之一或全部:\n            PRIV,CHAN,NOTI,CTCP,INVI,ALL\n    options - 忽略选项:NOSAVE,QUIET"
+msgstr "IGNORE <掩码> <类型..> <选项..>\n    掩码 - 要忽略的主机掩码,比如 *!*@*.aol.com\n    类型 - 要忽略数据的类型,应以下选项之一或全部:\n            PRIV,CHAN,NOTI,CTCP,INVI,ALL\n    选项 - 忽略选项:NOSAVE,QUIET"
 
-#: src/common/outbound.c:3888
+#: ../src/common/outbound.c:3986
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr "INVITE <nick> [<channel>],邀请昵称为 <nick> 者进入频道,默认为当前的频道(需要具有频道管理员身份)"
+msgstr "INVITE <昵称> [<频道>],邀请昵称为 <昵称> 者进入频道,默认为当前的频道(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3889
+#: ../src/common/outbound.c:3987
 msgid "JOIN <channel>, joins the channel"
-msgstr "JOIN <channel>,进入频道"
+msgstr "JOIN <频道>,进入频道"
 
-#: src/common/outbound.c:3891
-msgid "KICK <nick>, kicks the nick from the current channel (needs chanop)"
-msgstr "KICK <nick>,把昵称为 <nick> 者踢出当前频道(需要具有频道管理员身份)"
+#: ../src/common/outbound.c:3989
+msgid ""
+"KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
+msgstr "KICK <昵称> [原因],将该昵称从当前频道中踢出 (需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3893
+#: ../src/common/outbound.c:3991
 msgid ""
-"KICKBAN <nick>, bans then kicks the nick from the current channel (needs "
-"chanop)"
-msgstr "KICKBAN <nick>,把昵称为 <nick> 者踢出当前频道,并禁止再次进入(需要具有频道管理员身份)"
+"KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
+"(needs chanop)"
+msgstr "KICKBAN <昵称> [原因],把 <昵称> 者踢出当前频道,并禁止再次进入(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3896
+#: ../src/common/outbound.c:3994
 msgid "LAGCHECK, forces a new lag check"
 msgstr "LAGCHECK,强制进行延迟检查"
 
-#: src/common/outbound.c:3898
+#: ../src/common/outbound.c:3996
 msgid ""
 "LASTLOG [-h] [-m] [-r] [--] <string>, searches for a string in the buffer\n"
 "    Use -h to highlight the found string(s)\n"
 "    Use -m to match case\n"
 "    Use -r when string is a Regular Expression\n"
 "    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
-msgstr ""
+msgstr "LASTLOG [-h] [-m] [-r] [--] <字符串>,在缓冲区中搜索该字符串\n    使用 -h 选项高亮显示搜索到的字符串(多个)\n    使用 -m 选项严格匹配大小写\n    使用 -r 选项将字符串作为正则表达式搜索\n    使用 -- (双破折号) 标记选项参数结束,例如要搜索的字符串是 '-r'"
 
-#: src/common/outbound.c:3904
+#: ../src/common/outbound.c:4002
 msgid "LOAD [-e] <file>, loads a plugin or script"
-msgstr "LOAD [-e] <file>,载入插件或脚本"
+msgstr "LOAD [-e] <文件>,载入插件或脚本"
 
-#: src/common/outbound.c:3907
+#: ../src/common/outbound.c:4005
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
 msgstr "MDEHOP,撤销当前频道中所有副管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3909
+#: ../src/common/outbound.c:4007
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
 msgstr "MDEOP,撤销当前频道中所有管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3911
+#: ../src/common/outbound.c:4009
 msgid ""
 "ME <action>, sends the action to the current channel (actions are written in"
 " the 3rd person, like /me jumps)"
-msgstr "ME <action>,向当前频道中发送一个动作(动作使用第三人称陈述,例如 /me 跳一下)"
+msgstr "ME <动作>,向当前频道中发送一个动作(动作使用英语的第 3 人称陈述,例如 /me 跳一下)"
 
-#: src/common/outbound.c:3915
+#: ../src/common/outbound.c:4013
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
 msgstr "MKICK,踢出当前频道中除您自己以外的所有用户(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3918
+#: ../src/common/outbound.c:4016
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
 msgstr "MOP,给当前频道中所有用户赋予管理员的身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3919
+#: ../src/common/outbound.c:4017
 msgid ""
 "MSG <nick> <message>, sends a private message, message \".\" to send to last"
 " nick or prefix with \"=\" for dcc chat"
-msgstr ""
+msgstr "MSG <昵称> <消息>,发送私信, 昵称为 \".\" 发送给上一个昵称的用户,或者以 \"=\" 开头发送 dcc 聊天"
 
-#: src/common/outbound.c:3922
-msgid "NAMES, Lists the nicks on the current channel"
-msgstr "NAMES,列出当前频道的所有用户"
+#: ../src/common/outbound.c:4020
+msgid "NAMES [channel], Lists the nicks on the channel"
+msgstr "NAMES [频道],列出该频道的所有昵称"
 
-#: src/common/outbound.c:3924
+#: ../src/common/outbound.c:4022
 msgid "NCTCP <nick> <message>, Sends a CTCP notice"
-msgstr "NCTCP <nick> <message>,给昵称为 <nick> 者发送一则 CTCP 通知"
+msgstr "NCTCP <昵称> <消息>,给昵称为 <nick> 者发送一则 CTCP 通知"
 
-#: src/common/outbound.c:3925
+#: ../src/common/outbound.c:4023
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
-msgstr "NEWSERVER [-noconnect] <hostname> [<port>]"
+msgstr "NEWSERVER [-noconnect] <主机名> [<端口号>]"
 
-#: src/common/outbound.c:3926
+#: ../src/common/outbound.c:4024
 msgid "NICK <nickname>, sets your nick"
-msgstr "NICK <nickname>,设置您的昵称"
+msgstr "NICK <昵称>,设置您的昵称"
 
-#: src/common/outbound.c:3929
+#: ../src/common/outbound.c:4027
 msgid "NOTICE <nick/channel> <message>, sends a notice"
-msgstr ""
+msgstr "NOTICE <昵称/频道> <消息>,发送一条通知"
 
-#: src/common/outbound.c:3931
+#: ../src/common/outbound.c:4029
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr "NOTIFY [-n network1[,network2,...]] [<nick>],列出您的通知列表,或在列表中添加某人"
+msgstr "NOTIFY [-n 网络1[,网络2,...]] [<昵称>],列出您的通知列表,或在列表中添加某人"
 
-#: src/common/outbound.c:3933
+#: ../src/common/outbound.c:4031
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr "OP <nick>,委任 <nick> 为频道管理员(需要具有频道管理员身份)"
+msgstr "OP <昵称>,委任 <昵称> 为频道管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3935
+#: ../src/common/outbound.c:4033
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr "PART [<channel>] [<reason>],离开频道,默认为当前的频道"
+msgstr "PART [<频道>] [<离开原因>],离开频道,默认为当前的频道"
 
-#: src/common/outbound.c:3937
+#: ../src/common/outbound.c:4035
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr "PING <nick | channel>,向某位用户或频道发送 CTCP PING 消息"
+msgstr "PING <昵称 | 频道>,向某位用户或频道发送 CTCP PING 消息"
 
-#: src/common/outbound.c:3939
-msgid "QUERY [-nofocus] <nick>, opens up a new privmsg window to someone"
-msgstr "QUERY [-nofocus] <nick>,与某人私聊"
+#: ../src/common/outbound.c:4037
+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:3941
+#: ../src/common/outbound.c:4039
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
+msgstr "QUIET <掩码> [<静默类型>],在服务器支持的情况下将当前服务器中满足掩码的每个人设为静默状态。"
 
-#: src/common/outbound.c:3943
+#: ../src/common/outbound.c:4041
 msgid "QUIT [<reason>], disconnects from the current server"
-msgstr "QUIT [<reason>],从与当前服务器断开连接"
+msgstr "QUIT [<退出原因>],从与当前服务器断开连接"
 
-#: src/common/outbound.c:3945
+#: ../src/common/outbound.c:4043
 msgid "QUOTE <text>, sends the text in raw form to the server"
-msgstr "QUOTE <text>,向服务器发送原始格式的文本"
+msgstr "QUOTE <文本>,向服务器发送原始格式的文本"
 
-#: src/common/outbound.c:3948
+#: ../src/common/outbound.c:4046
 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] [<host>] [<port>] [<password>],可用 /RECONNECT 重新连接当前的服务器或用 /RECONNECT ALL 重新连接所有服务器"
+msgstr "RECONNECT [-ssl] [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前的服务器或用 /RECONNECT ALL 重新连接所有服务器"
 
-#: src/common/outbound.c:3951
+#: ../src/common/outbound.c:4049
 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 [<host>] [<port>] [<password>],可用 /RECONNECT 重新连接当前服务器或用 /RECONNECT ALL 重新连接所有服务器"
+msgstr "RECONNECT [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前服务器或用 /RECONNECT ALL 重新连接所有服务器"
 
-#: src/common/outbound.c:3953
+#: ../src/common/outbound.c:4051
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
+msgstr "RECV <text>,向 HexChat 发送原始数据,就好像从 IRC 服务器上接收到的一样"
 
-#: src/common/outbound.c:3954
+#: ../src/common/outbound.c:4052
 msgid "RELOAD <name>, reloads a plugin or script"
-msgstr ""
+msgstr "RELOAD <名称>,重新载入插件/脚本"
 
-#: src/common/outbound.c:3956
+#: ../src/common/outbound.c:4054
 msgid "SAY <text>, sends the text to the object in the current window"
-msgstr "SAY <text>,向当前窗口中的对象发送文本"
+msgstr "SAY <文本>,向当前窗口中的对象发送文本"
 
-#: src/common/outbound.c:3957
+#: ../src/common/outbound.c:4055
 msgid "SEND <nick> [<file>]"
-msgstr "SEND <nick> [<file>]"
+msgstr "SEND <昵称> [<文件>]"
 
-#: src/common/outbound.c:3960
+#: ../src/common/outbound.c:4058
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr "SERVCHAN [-ssl] <host> <port> <channel>,连接服务器并进入某频道"
+msgstr "SERVCHAN [-ssl] <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: src/common/outbound.c:3963
+#: ../src/common/outbound.c:4061
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr "SERVCHAN <host> <port> <channel>,连接服务器并进入某频道"
+msgstr "SERVCHAN <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: src/common/outbound.c:3967
+#: ../src/common/outbound.c:4065
 msgid ""
 "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the "
 "default port is 6667 for normal connections, and 6697 for ssl connections"
-msgstr ""
+msgstr "SERVER [-ssl] <主机> [<端口号>] [<密码>],连接到服务器。普通连接的默认端口是6667,SSL连接的默认端口是6697。"
 
-#: src/common/outbound.c:3970
+#: ../src/common/outbound.c:4068
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr "SERVER <host> [<port>] [<password>],连接服务器。默认端口为 6667"
+msgstr "SERVER <主机> [<端口号>] [<密码>],连接服务器。默认端口为 6667"
 
-#: src/common/outbound.c:3972
+#: ../src/common/outbound.c:4070
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
-msgstr ""
+msgstr "SET [-e] [-off|-on] [-quiet] <变量名> [<值>]"
 
-#: src/common/outbound.c:3973
+#: ../src/common/outbound.c:4071
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
+msgstr "SETCURSOR [-|+]<位置>,重新定位输入框中光标的位置。"
 
-#: src/common/outbound.c:3974
+#: ../src/common/outbound.c:4072
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
+msgstr "SETTAB <新名称>,改变选项卡的名字,tab_trunc 变量的限制仍然有效"
 
-#: src/common/outbound.c:3975
+#: ../src/common/outbound.c:4073
 msgid "SETTEXT <new text>, replace the text in the input box"
-msgstr ""
+msgstr "SETTEXT <新文本>,替换输入框中的文本"
 
-#: src/common/outbound.c:3978
+#: ../src/common/outbound.c:4076
 msgid ""
 "TOPIC [<topic>], sets the topic if one is given, else shows the current "
 "topic"
-msgstr "TOPIC [<topic>],设置频道主题,如果未指定内容则显示当前主题"
+msgstr "TOPIC [<频道主题>],设置频道主题,如果未指定内容则显示当前主题"
 
-#: src/common/outbound.c:3980
+#: ../src/common/outbound.c:4078
 msgid ""
 "\n"
 "TRAY -f <timeout> <file1> [<file2>] Blink tray between two icons.\n"
@@ -694,2488 +759,2525 @@ 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:3987
+#: ../src/common/outbound.c:4085
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr "UNBAN <mask> [<mask>...],解禁指定的掩码。"
+msgstr "UNBAN <掩码> [<掩码>...],解禁指定的掩码。"
 
-#: src/common/outbound.c:3988
+#: ../src/common/outbound.c:4086
 msgid "UNIGNORE <mask> [QUIET]"
-msgstr "UNIGNORE <mask> [QUIET]"
+msgstr "UNIGNORE <掩码> [QUIET]"
 
-#: src/common/outbound.c:3989
+#: ../src/common/outbound.c:4087
 msgid "UNLOAD <name>, unloads a plugin or script"
-msgstr "UNLOAD <name>,卸载插件或脚本"
+msgstr "UNLOAD <名称>,卸载插件或脚本"
 
-#: src/common/outbound.c:3991
+#: ../src/common/outbound.c:4089
 msgid ""
 "UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
 " server."
-msgstr ""
+msgstr "UNQUIET <掩码> [<掩码>...],在服务器支持测情况下解除指定掩码的静默状态。"
 
-#: src/common/outbound.c:3992
+#: ../src/common/outbound.c:4090
 msgid "URL <url>, opens a URL in your browser"
 msgstr "URL <url>,在浏览器中打开 URL"
 
-#: src/common/outbound.c:3994
+#: ../src/common/outbound.c:4092
 msgid ""
 "USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
 "userlist"
-msgstr "USELECT [-a] [-s] <nick1> <nick2>...,在频道用户列表中以高亮度标示昵称"
+msgstr "USELECT [-a] [-s] <昵称1> <昵称2>...,在频道用户列表中以高亮度标示昵称"
 
-#: src/common/outbound.c:3997
+#: ../src/common/outbound.c:4095
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr "VOICE <nick>,给予昵称为 <nick> 者发言权(需要具有频道管理员身份)"
+msgstr "VOICE <昵称>,给予昵称为 <昵称> 者发言权(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3999
+#: ../src/common/outbound.c:4097
 msgid "WALLCHAN <message>, writes the message to all channels"
-msgstr "WALLCHAN <message>,发送信息到所有的频道"
+msgstr "WALLCHAN <消息>,发送信息到所有的频道"
 
-#: src/common/outbound.c:4001
+#: ../src/common/outbound.c:4099
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr "WALLCHOP <message>,给当前频道中所有管理员发送消息"
+msgstr "WALLCHOP <消息>,给当前频道中所有管理员发送消息"
+
+#: ../src/common/outbound.c:4132
+#, c-format
+msgid "User Command for: %s\n"
+msgstr "用户命令:%s\n"
 
-#: src/common/outbound.c:4034
+#: ../src/common/outbound.c:4159
 #, c-format
 msgid "Usage: %s\n"
 msgstr "用法:%s\n"
 
-#: src/common/outbound.c:4039
+#: ../src/common/outbound.c:4164
 msgid ""
 "\n"
 "No help available on that command.\n"
 msgstr "\n没有关于该命令的帮助信息。\n"
 
-#: src/common/outbound.c:4045
+#: ../src/common/outbound.c:4170
 msgid "No such command.\n"
-msgstr "无此命令。\n"
+msgstr "此命令不存在。\n"
 
-#: src/common/outbound.c:4378
+#: ../src/common/outbound.c:4506
 msgid "Bad arguments for user command.\n"
-msgstr "用户命令的参数不对。\n"
+msgstr "用户命令的参数有误。\n"
 
-#: src/common/outbound.c:4592
+#: ../src/common/outbound.c:4720
 msgid "Too many recursive usercommands, aborting."
-msgstr "太多递归的用户命令,中止。"
+msgstr "用户命令产生太多递归,中止执行。"
 
-#: src/common/outbound.c:4697
+#: ../src/common/outbound.c:4825
 msgid "Unknown Command. Try /help\n"
-msgstr "未知命令。请尝试 /help\n"
+msgstr "未知命令。请尝试键入 /help\n"
 
-#: src/common/plugin.c:407 src/common/plugin.c:443
+#: ../src/common/plugin.c:412 ../src/common/plugin.c:448
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
+msgstr "无 hexchat_plugin_init 符号,这确实是 HexChat 的插件吗?"
 
-#: src/common/server.c:644
+#: ../src/common/server.c:644
 msgid "Are you sure this is a SSL capable server and port?\n"
-msgstr "您确信此服务器和端口支持 SSL?\n"
+msgstr "您确信该服务器的此端口支持 SSL?\n"
 
-#: src/common/server.c:1012
+#: ../src/common/server.c:1012
 #, 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:1017
 msgid "Proxy traversal failed.\n"
 msgstr "代理传送失败。\n"
 
-#: src/common/servlist.c:845
+#: ../src/common/servlist.c:762
 #, c-format
 msgid "Cycling to next server in %s...\n"
 msgstr "跳转至 %s 的下一个服务器...\n"
 
-#: src/common/servlist.c:1487
+#: ../src/common/servlist.c:1404
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr "警告:未知的字符设置“%s”。对网络 %s 将不应用字符转换。"
+msgstr "警告: 字符集 “%s” 未知。将不对网络 %s 应用字符转换。"
 
-#: src/common/textevents.h:6
+#: ../src/common/textevents.h:6
 msgid "%C18*%O$t%C18$1%O added to notify list."
-msgstr ""
+msgstr "%C18*%O$t%C18$1%O 已增加到通知列表。"
 
-#: src/common/textevents.h:9
+#: ../src/common/textevents.h:9
 msgid "%C22*%O$t%C22$1%O: %C18$2%O on %C24$4%O by %C26$3%O"
-msgstr ""
+msgstr "%C22*%O$t%C22$1%O: %C18$2%O 在 %C24$4%O 由 %C26$3%O"
 
-#: src/common/textevents.h:12
+#: ../src/common/textevents.h:12
 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)."
-msgstr ""
+msgstr "%C22*%O$t 不能加入 %C22$1 %O(%C20您已被拦截%O)。"
 
-#: src/common/textevents.h:18
+#: ../src/common/textevents.h:18
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
-msgstr ""
+msgstr "%C29*%O$t 已知能力: %C29$2%O"
 
-#: src/common/textevents.h:21
+#: ../src/common/textevents.h:21
 msgid "%C23*%O$tCapabilities supported: %C29$2%O"
-msgstr ""
+msgstr "%C23*%O$t 支持能力: %C29$2%O"
 
-#: src/common/textevents.h:24
+#: ../src/common/textevents.h:24
 msgid "%C23*%O$tCapabilities requested: %C29$1%O"
-msgstr ""
+msgstr "%C23*%O$t 请求能力:%C29$1%O"
 
-#: src/common/textevents.h:27
+#: ../src/common/textevents.h:27
 msgid "%C24*%O$t%C28$1%O is now known as %C18$2%O"
-msgstr ""
+msgstr "%C24*%O$t%C28$1%O 改名为 %C18$2%O"
 
-#: src/common/textevents.h:36
+#: ../src/common/textevents.h:36
 msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 屏蔽了 %C18$2%O"
 
-#: src/common/textevents.h:39
+#: ../src/common/textevents.h:39
 msgid "%C22*%O$tChannel %C22$1%O created on %C24$2%O"
-msgstr ""
+msgstr "%C22*%O$t 频道 %C22$1%O 建立于 %C24$2%O"
 
-#: src/common/textevents.h:42
+#: ../src/common/textevents.h:42
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了 %C18$2%O 的频道副管理员权限"
 
-#: src/common/textevents.h:45
+#: ../src/common/textevents.h:45
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了 %C18$2%O 的频道管理员权限"
 
-#: src/common/textevents.h:48
+#: ../src/common/textevents.h:48
 msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了 %C18$2%O 的发言权"
 
-#: src/common/textevents.h:51
+#: ../src/common/textevents.h:51
 msgid "%C22*%O$t%C26$1%C sets exempt on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%C 给 %C18$2%O 设置了免封权"
 
-#: src/common/textevents.h:54
+#: ../src/common/textevents.h:54
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 委任 %C18$2%O 为频道副管理员"
 
-#: src/common/textevents.h:57
+#: ../src/common/textevents.h:57
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%C 设置了对 %C18$2%O 的免邀请"
 
-#: src/common/textevents.h:60
+#: ../src/common/textevents.h:60
 msgid "%UChannel          Users   Topic"
 msgstr "%U频道          用户     主题"
 
-#: src/common/textevents.h:66
+#: ../src/common/textevents.h:66
 msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 在上 %C22$4%O 设置了 %C24$2$3%O 模式"
 
-#: src/common/textevents.h:69
+#: ../src/common/textevents.h:69
 msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
-msgstr ""
+msgstr "%C22*%O$t 频道 %C22$1%O 模式: %C24$2"
 
-#: src/common/textevents.h:78
+#: ../src/common/textevents.h:78
 msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 委任 %C18$2%O 为频道管理员"
 
-#: src/common/textevents.h:81
+#: ../src/common/textevents.h:81
 msgid "%C22*%O$t%C26$1%O sets quiet on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 设置了对 %C18$2%O 的静默"
 
-#: src/common/textevents.h:84
+#: ../src/common/textevents.h:84
 msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了 %C18$2%O 的免封权"
 
-#: src/common/textevents.h:87
+#: ../src/common/textevents.h:87
 msgid "%C22*%O$t%C26$1%O removes invite exempt on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 解除了对 %C18$2%O 的免邀请"
 
-#: src/common/textevents.h:90
+#: ../src/common/textevents.h:90
 msgid "%C22*%O$t%C26$1%O removes channel keyword"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了频道密码"
 
-#: src/common/textevents.h:93
+#: ../src/common/textevents.h:93
 msgid "%C22*%O$t%C26$1%O removes user limit"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了用户限制"
 
-#: src/common/textevents.h:96
+#: ../src/common/textevents.h:96
 msgid "%C22*%O$t%C26$1%O sets channel keyword to %C24$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 设置频道密码为 %C24$2%O"
 
-#: src/common/textevents.h:99
+#: ../src/common/textevents.h:99
 msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 设置频道限制为 %C24$2%O"
 
-#: src/common/textevents.h:102
+#: ../src/common/textevents.h:102
 msgid "%C22*%O$t%C26$1%O removes ban on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 解除了对 %C18$2%O 的屏蔽"
 
-#: src/common/textevents.h:105
+#: ../src/common/textevents.h:105
 msgid "%C22*%O$t%C26$1%O removes quiet on %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 取消了设置在 %C18$2%O 上的静默"
 
-#: src/common/textevents.h:108
+#: ../src/common/textevents.h:108
 msgid "%C22*%O$tChannel %C22$1%O url: %C24$2"
-msgstr ""
+msgstr "%C22*%O$t 频道 %C22$1%O url: %C24$2"
 
-#: src/common/textevents.h:111
+#: ../src/common/textevents.h:111
 msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%O 给了 %C18$2%O 发言权"
 
-#: src/common/textevents.h:114
+#: ../src/common/textevents.h:114
 msgid "%C23*%O$tConnected. Now logging in."
-msgstr ""
+msgstr "%C23*%O$tC 已连接。正在登录..."
 
-#: src/common/textevents.h:117
+#: ../src/common/textevents.h:117
 msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
-msgstr ""
+msgstr "%C23*%O$t 正在连接到 %C29$1%C (%C23$2:$3%O)"
 
-#: src/common/textevents.h:120
+#: ../src/common/textevents.h:120
 msgid "%C20*%O$tConnection failed (%C20$1%O)"
-msgstr ""
+msgstr "%C20*%O$t 连接失败 (%C20$1%O)"
 
-#: src/common/textevents.h:123
+#: ../src/common/textevents.h:123
 msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
-msgstr ""
+msgstr "%C24*%O$t 收到了来自 %C18$2%O 的 CTCP %C24$1%C"
 
-#: src/common/textevents.h:126
+#: ../src/common/textevents.h:126
 msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
-msgstr ""
+msgstr "%C24*%C$t 收到了来自 %C18$2%C (到 %C22$3%C)%O 的 CTCP %C24$1%C"
 
-#: src/common/textevents.h:132
+#: ../src/common/textevents.h:132
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
-msgstr ""
+msgstr "%C24*%O$t 收到来自 %C18$2%O 的 CTCP 声音 %C24$1%C"
 
-#: src/common/textevents.h:135
+#: ../src/common/textevents.h:135
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
-msgstr ""
+msgstr "%C24*%O$t 收到来自 %C18$2%O (到 %C22$3%O) 的 CTCP 声音 %C24$1%C"
 
-#: src/common/textevents.h:138
+#: ../src/common/textevents.h:138
 msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
-msgstr ""
+msgstr "%C23*%O$t 中止了与 %C18$1%O 的 DCC 直连聊天。"
 
-#: src/common/textevents.h:141
+#: ../src/common/textevents.h:141
 msgid ""
 "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 已与 %C18$1%C %C30[%C24$2%C30]%O 建立了 DCC 直连聊天连接"
 
-#: src/common/textevents.h:144
+#: ../src/common/textevents.h:144
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
-msgstr ""
+msgstr "%C20*%O$t 失去了与 %C18$1%O 的 DCC 直连聊天连接 (%C20$4%O)"
 
-#: src/common/textevents.h:147
+#: ../src/common/textevents.h:147
 msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
-msgstr ""
+msgstr "%C24*%O$t 收到来自 %C18$1%O 的 DCC 直连聊天请求"
 
-#: src/common/textevents.h:150
+#: ../src/common/textevents.h:150
 msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
-msgstr ""
+msgstr "%C24*%O$t 向 %C18$1%O 发送 DCC 直连聊天请求"
 
-#: src/common/textevents.h:153
+#: ../src/common/textevents.h:153
 msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
-msgstr ""
+msgstr "%C24*%O$t 已发送 DCC 直连聊天请求给 %C18$1%O"
 
-#: src/common/textevents.h:156
+#: ../src/common/textevents.h:156
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
+msgstr "%C20*%O$t 尝试到 %C18$2%O 的 DCC $1 连接失败 (%C20$3%O)"
 
-#: src/common/textevents.h:159
+#: ../src/common/textevents.h:159
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
-msgstr ""
+msgstr "%C23*%O$t 从 %C18$2%O 接收到 '%C23$1%C' "
 
-#: src/common/textevents.h:162
+#: ../src/common/textevents.h:162
 #, c-format
 msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
-msgstr ""
+msgstr "%C16,17 类型   到/来自       状态    大小    位置     文件         "
 
-#: src/common/textevents.h:165
+#: ../src/common/textevents.h:165
 msgid ""
 "%C20*%O$tReceived a malformed DCC request from "
 "%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
-msgstr ""
+msgstr "%C20*%O$t 收到来自 %C18$1%O 的有错的 DCC 请求。%010%C23*%O$t 数据包内容:%C23$2%O"
 
-#: src/common/textevents.h:168
+#: ../src/common/textevents.h:168
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
-msgstr ""
+msgstr "%C24*%O$t 正在发送 '%C24$1%O' 到 %C18$2%O"
 
-#: src/common/textevents.h:171
+#: ../src/common/textevents.h:171
 msgid "%C23*%O$tNo such DCC offer."
-msgstr ""
+msgstr "%C23*%O$t 无此 DCC 请求。"
 
-#: src/common/textevents.h:174
+#: ../src/common/textevents.h:174
 msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
-msgstr ""
+msgstr "%C23*%O$t 到 %C18$1%O 的 DCC RECV 连接 '%C23$2%O'  已中断。"
 
-#: src/common/textevents.h:177
+#: ../src/common/textevents.h:177
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 来自 %C18$3%O DCC RECV 连接 '%C23$1%O'  完成 %C30[%C24$4%O cps%C30]%O"
 
-#: src/common/textevents.h:180
+#: ../src/common/textevents.h:180
 msgid ""
 "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 建立与 %C18$1 的 DCC RECV 连接 %C30[%O%C24$2%C30]%O"
 
-#: src/common/textevents.h:183
+#: ../src/common/textevents.h:183
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
-msgstr ""
+msgstr "%C20*%O$t 来自于 %C18$3%O 的 DCC RECV 连接 '%C23$1%O' 失败 (%C20$4%O)"
 
-#: src/common/textevents.h:186
+#: ../src/common/textevents.h:186
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
+msgstr "%C20*%O$t DCC RECV:无法打开 %C23$1%C 进行写入(%C20$2%O)。 "
 
-#: src/common/textevents.h:189
+#: ../src/common/textevents.h:189
 msgid ""
 "%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
 "instead."
-msgstr ""
+msgstr "%C23*%O$t 文件 '%C24$1%C' 已存在,将把文件另存为 '%C23$2%O'。"
 
-#: src/common/textevents.h:192
+#: ../src/common/textevents.h:192
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
-msgstr ""
+msgstr "%C24*%O$t%C18$1%C 已请求续传来自 %C24$3%O 的文件 '%C23$2%C' 。"
 
-#: src/common/textevents.h:195
+#: ../src/common/textevents.h:195
 msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
-msgstr ""
+msgstr "%C23*%O$t 到 %C18$1%O 的 DCC SEND 连接 '%C23$2%C' 已中断。"
 
-#: src/common/textevents.h:198
+#: ../src/common/textevents.h:198
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 到 %C18$2%C 的 DCC SEND 连接 '%C23$1%C'  完成 %C30[%C24$3%C cps%C30]%O"
 
-#: src/common/textevents.h:201
+#: ../src/common/textevents.h:201
 msgid ""
 "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 已建立到 %C18$1 %C30[%O%C24$2%C30]%O 的 DCC SEND 连接"
 
-#: src/common/textevents.h:204
+#: ../src/common/textevents.h:204
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
-msgstr ""
+msgstr "%C20*%O 到 %C18$2%C 的 $tDCC SEND 连接 '%C23$1%C' 失败 (%C20$3%O)"
 
-#: src/common/textevents.h:207
+#: ../src/common/textevents.h:207
 msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
-msgstr ""
+msgstr "%C24*%O$t%C18$1%C 已发送 '%C23$2%C' (%C24$3%O 字节)"
 
-#: src/common/textevents.h:210
+#: ../src/common/textevents.h:210
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
-msgstr ""
+msgstr "%C20*%O$t 到 %C18$3%O 的 DCC $1 '%C23$2%C'  挂起,已中断。"
 
-#: src/common/textevents.h:213
+#: ../src/common/textevents.h:213
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
+msgstr "%C20*%O$t 到 %C18$3%O 的 DCC $1 '%C23$2%C'  超时,已中断。"
 
-#: src/common/textevents.h:216
+#: ../src/common/textevents.h:216
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
-msgstr ""
+msgstr "%C24*%O$t%C18$1%O 已从通知列表中删除。"
 
-#: src/common/textevents.h:219
+#: ../src/common/textevents.h:219
 msgid "%C20*%O$tDisconnected (%C20$1%O)"
-msgstr ""
+msgstr "%C20*%O$t 已断开连接 (%C20$1%O)"
 
-#: src/common/textevents.h:222
+#: ../src/common/textevents.h:222
 msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t 找到您的 IP: %C30[%C24$1%C30]%O"
 
-#: src/common/textevents.h:228
+#: ../src/common/textevents.h:228
 msgid "%O%C18$1%O added to ignore list."
-msgstr ""
+msgstr "%O%C18$1%O 已添加到忽略列表。"
 
-#: src/common/textevents.h:231
+#: ../src/common/textevents.h:231
 msgid "%OIgnore on %C18$1%O changed."
-msgstr ""
+msgstr "%O 对 %C18$1%O 的忽略已变更。"
 
-#: src/common/textevents.h:234
+#: ../src/common/textevents.h:234
 #, c-format
 msgid "%C16,17                                                              "
-msgstr ""
+msgstr "%C16,17                                                              "
 
-#: src/common/textevents.h:237
+#: ../src/common/textevents.h:237
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr ""
+msgstr "%C16,17 主机掩码                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 
-#: src/common/textevents.h:240
+#: ../src/common/textevents.h:240
 msgid "%O%C18$1%O removed from ignore list."
-msgstr ""
+msgstr "%O%C18$1%O 已从忽略列表中删除。"
 
-#: src/common/textevents.h:243
+#: ../src/common/textevents.h:243
 msgid "%OIgnore list is empty."
-msgstr ""
+msgstr "%O 您的忽略列表是空的。"
 
-#: src/common/textevents.h:246
+#: ../src/common/textevents.h:246
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
+msgstr "%C20*%O$t 无法进入 %C22$1%C(%C20该频道只能邀请进入%O)。"
 
-#: src/common/textevents.h:249
+#: ../src/common/textevents.h:249
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
-msgstr ""
+msgstr "%C24*%O$t 你已被 %C18$2%O 邀请到 %C22$1%O  (%C29$3%O)"
 
-#: src/common/textevents.h:252
+#: ../src/common/textevents.h:252
 #, c-format
 msgid "%C23*$t$1 ($3%C23) has joined"
-msgstr ""
+msgstr "%C23*$t$1 ($3%C23) 已进入"
 
-#: src/common/textevents.h:255
+#: ../src/common/textevents.h:255
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
+msgstr "%C20*%O$t 不能加入 %C22$1%C (%C20需要密码%O)"
 
-#: src/common/textevents.h:258
+#: ../src/common/textevents.h:258
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%C 已将 %C18$2%C 从 %C22$3%C 踢出 (%C24$4%O)"
 
-#: src/common/textevents.h:261
+#: ../src/common/textevents.h:261
 msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
-msgstr ""
+msgstr "%C19*%O$t%C19 您被 %C26$1%C 从服务器上踢出(%C20$2%O)"
 
-#: src/common/textevents.h:270
+#: ../src/common/textevents.h:270
 msgid "%C29*%O$t%C29MOTD Skipped%O"
-msgstr ""
+msgstr "%C29*%O$t%C29MOTD 被跳过。%O"
 
-#: src/common/textevents.h:273
+#: ../src/common/textevents.h:273
 msgid "%C23*%O$t%C28$1%C is already in use. Retrying with %C18$2%O..."
-msgstr ""
+msgstr "%C23*%O$t%C28$1%C 已被占用。正在使用 %C18$2%O 重试..."
 
-#: src/common/textevents.h:276
+#: ../src/common/textevents.h:276
 msgid "%C23*%O$t%C28$1%C is erroneous. Retrying with %C18$2%O..."
-msgstr ""
+msgstr "%C23*%O$t%C28$1%C 出错。正在使用 %C18$2%O 重试..."
 
-#: src/common/textevents.h:279
+#: ../src/common/textevents.h:279
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
+msgstr "%C20*%O$t 该昵称不正确或者已被占用。请用 /NICK 尝试使用另一个昵称。"
 
-#: src/common/textevents.h:282
+#: ../src/common/textevents.h:282
 msgid "%C20*%O$tNo such DCC."
-msgstr ""
+msgstr "%C20*%O$t没有此 DCC。"
 
-#: src/common/textevents.h:285
+#: ../src/common/textevents.h:285
 msgid "%C23*%O$tNo process is currently running"
-msgstr ""
+msgstr "%C23*%O$t 当前没有任何进程在执行"
 
-#: src/common/textevents.h:294
+#: ../src/common/textevents.h:294
 msgid "%C23*%O$tNotify: %C18$1%C is away (%C24$2%O)"
-msgstr ""
+msgstr "%C23*%O$t 通知: %C18$1%C 已离开 (%C24$2%O)"
 
-#: src/common/textevents.h:297
+#: ../src/common/textevents.h:297
 msgid "%C23*%O$tNotify: %C18$1%C is back"
-msgstr ""
+msgstr "%C23*%O$t 通知: %C18$1%C 已上线"
 
-#: src/common/textevents.h:300
+#: ../src/common/textevents.h:300
 msgid "$tNotify list is empty."
-msgstr "$t 通知列表是空的。"
+msgstr "$t 通知列表为空。"
 
-#: src/common/textevents.h:303
+#: ../src/common/textevents.h:303
 #, c-format
 msgid "%C16,17  Notify List                           "
-msgstr ""
+msgstr "%C16,17 通知列表                             "
 
-#: src/common/textevents.h:306
+#: ../src/common/textevents.h:306
 msgid "%C23*%O$t%C23$1%O users in notify list."
-msgstr ""
+msgstr "通知列表中有 %C23*%O$t%C23$1%O 位用户。"
 
-#: src/common/textevents.h:309
+#: ../src/common/textevents.h:309
 msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
-msgstr ""
+msgstr "%C23*%O$t 通知:%C18$1%C 下线了(%C29$3%O)。"
 
-#: src/common/textevents.h:312
+#: ../src/common/textevents.h:312
 msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
-msgstr ""
+msgstr "%C23*%O$t 通知: %C18$1%C 上线了 (%C29$3%O)"
 
-#: src/common/textevents.h:318
+#: ../src/common/textevents.h:318
 #, c-format
 msgid "%C24*$t$1 ($2%C24) has left"
-msgstr ""
+msgstr "%C24*$t$1 ($2%C24) 已离开"
 
-#: src/common/textevents.h:321
+#: ../src/common/textevents.h:321
 #, c-format
 msgid "%C24*$t$1 ($2%C24) has left ($4)"
-msgstr ""
+msgstr "%C24*$t$1 ($2%C24) 已离开 ($4)"
 
-#: src/common/textevents.h:324
+#: ../src/common/textevents.h:324
 msgid "%C24*%O$tPing reply from %C18$1%C: %C24$2%O second(s)"
-msgstr ""
+msgstr "%C24*%O$t 从 %C18$1%C 处得到 Ping 回应时间:%C24$2%O 秒"
 
-#: src/common/textevents.h:327
+#: ../src/common/textevents.h:327
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr ""
+msgstr "%C20*%O$t 在 %C24$1%O 秒内没有收到 Ping 回应,正在断开连接。"
 
-#: src/common/textevents.h:342
+#: ../src/common/textevents.h:342
 msgid "%C24*%O$tA process is already running"
-msgstr ""
+msgstr "%C24*%O$tA 已有一进程正在运行"
 
-#: src/common/textevents.h:345
+#: ../src/common/textevents.h:345
 #, c-format
 msgid "%C24*$t$1 has quit ($2)"
-msgstr ""
+msgstr "%C24*$t$1 已退出($2)"
 
-#: src/common/textevents.h:348
+#: ../src/common/textevents.h:348
 msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
-msgstr ""
+msgstr "%C24*%O$t%C26$1%C 设置模式 %C30[%C24$2%C30]%O"
 
-#: src/common/textevents.h:351
+#: ../src/common/textevents.h:351
 msgid "%O-%C29$1/Wallops%O-$t$2"
-msgstr ""
+msgstr "%O-%C29$1/Wallops%O-$t$2"
 
-#: src/common/textevents.h:354
+#: ../src/common/textevents.h:354
 msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
-msgstr ""
+msgstr "%C24*%O$t 查询 %C18$1%O 的 IP 地址..."
 
-#: src/common/textevents.h:357
+#: ../src/common/textevents.h:357
 msgid "%C23*%O$tAuthenticating via SASL as %C18$1%O (%C24$2%O)"
-msgstr ""
+msgstr "%C23*%O$t 通过 SASL 以 %C18$1%O 认证 (%C24$2%O)"
 
-#: src/common/textevents.h:363
+#: ../src/common/textevents.h:363
 msgid "%C29*%O$tConnected."
-msgstr ""
+msgstr "%C29*%O$t 已连接。"
 
-#: src/common/textevents.h:369
+#: ../src/common/textevents.h:369
 msgid "%C29*%O$tLooking up %C29$1%O"
-msgstr ""
+msgstr "%C29*%O$t 正在查询 %C29$1%O"
 
-#: src/common/textevents.h:381
+#: ../src/common/textevents.h:381
 msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
-msgstr ""
+msgstr "%C23*%O$t 前次连接尝试停止(%C24$1%O)"
 
-#: src/common/textevents.h:384
+#: ../src/common/textevents.h:384
 msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
-msgstr ""
+msgstr "%C22*%O$t %C22$1%C的主题是:$2%O"
 
-#: src/common/textevents.h:387
+#: ../src/common/textevents.h:387
 msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
-msgstr ""
+msgstr "%C22*%O$t%C26$1%C 已将主题更改为:$2%O"
 
-#: src/common/textevents.h:390
+#: ../src/common/textevents.h:390
 msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
-msgstr ""
+msgstr "%C22*%O$t %C26$2%C 已将主题设置为 %C22$1%C (%C24$3%O)"
 
-#: src/common/textevents.h:393
+#: ../src/common/textevents.h:393
 msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
-msgstr ""
+msgstr "%C20*%O$t 未知主机。也许您把它拼写错了?"
 
-#: src/common/textevents.h:396
+#: ../src/common/textevents.h:396
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
+msgstr "%C20*%O$t 无法进入 %C22$1%C (%C20达到了用户限制%O)"
 
-#: src/common/textevents.h:399
+#: ../src/common/textevents.h:399
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
-msgstr ""
+msgstr "%C22*%O$t 用户在 %C22$1%C: %C24$2%O"
 
-#: src/common/textevents.h:405
+#: ../src/common/textevents.h:405
 msgid "%C23*%O$t%C28[%C18$1%C28]%C is away %C30(%C23$2%O%C30)%O"
-msgstr ""
+msgstr "%C23*%O$t%C28[%C18$1%C28]%C 已离开 %C30(%C23$2%O%C30)%O"
 
-#: src/common/textevents.h:411
+#: ../src/common/textevents.h:411
 msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
-msgstr ""
+msgstr "%C23*%O$t%C28[%C18$1%C28] %O WHOIS 列表结束。"
 
-#: src/common/textevents.h:417
+#: ../src/common/textevents.h:417
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
-msgstr ""
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O"
 
-#: src/common/textevents.h:420
+#: ../src/common/textevents.h:420
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
-msgstr ""
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O,登录时间:%C23$3%O"
 
-#: src/common/textevents.h:426
+#: ../src/common/textevents.h:426
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 真实主机: %C23$2%O,真实 IP: %C30[%C23$3%C30]%O"
 
-#: src/common/textevents.h:435
+#: ../src/common/textevents.h:435
 msgid "%C19*%O$tNow talking on %C22$2%O"
-msgstr ""
+msgstr "%C19*%O$t 正在 %C22$2%O 频道里聊天"
 
-#: src/common/textevents.h:438
+#: ../src/common/textevents.h:438
 msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
-msgstr ""
+msgstr "%C19*%O$t 被 %C26$3%O 从 %C22$2%C 中踢出(%C20$4%O)"
 
-#: src/common/textevents.h:441
+#: ../src/common/textevents.h:441
 msgid "%C19*%O$tYou have left channel %C22$3%O"
-msgstr ""
+msgstr "%C19*%O$t 您已离开频道 %C22$3%O"
 
-#: src/common/textevents.h:444
+#: ../src/common/textevents.h:444
 msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
-msgstr ""
+msgstr "%C19*%O$t 已离开频道 %C22$3%C (%C24$4%O)"
 
-#: src/common/textevents.h:450
+#: ../src/common/textevents.h:450
 msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
-msgstr ""
+msgstr "%C20*%O$t 已邀请 %C18$1%O 到 %C22$2%O 频道 (%C24$3%O)"
 
-#: src/common/textevents.h:456
+#: ../src/common/textevents.h:456
 msgid "%C20*%O$tYou are now known as %C18$2%O"
-msgstr ""
+msgstr "%C20*%O$t 您已改名为 %C18$2%O"
 
-#: src/common/text.c:342
+#. get rid of the \n
+#: ../src/common/text.c:369
 msgid "Loaded log from"
 msgstr "从以下位置载入聊天记录:"
 
-#: src/common/text.c:359
+#: ../src/common/text.c:386
 #, c-format
 msgid "**** ENDING LOGGING AT %s\n"
-msgstr "**** 结束聊天记录于 %s\n"
+msgstr "**** 聊天记录于 %s 结束记录\n"
 
-#: src/common/text.c:581
+#: ../src/common/text.c:611
 #, c-format
 msgid "**** BEGIN LOGGING AT %s\n"
-msgstr "**** 开始聊天记录记录于 %s\n"
+msgstr "**** 聊天记录于 %s 开始记录\n"
 
-#: src/common/text.c:600
+#: ../src/common/text.c:630
 #, c-format
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
+msgstr "* 无法以可写入方式打开日志(log)文件。\n请检查 %s 的权限"
 
-#: src/common/text.c:996
+#: ../src/common/text.c:1020
 msgid "Left message"
-msgstr "左边的信息"
+msgstr "左侧信息"
 
-#: src/common/text.c:997
+#: ../src/common/text.c:1021
 msgid "Right message"
-msgstr "右边的信息"
+msgstr "右侧信息"
 
-#: src/common/text.c:1002 src/common/text.c:1380 src/common/text.c:1418
-#: src/common/text.c:1423 src/common/text.c:1464
+#: ../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
 msgid "IP address"
 msgstr "IP 地址"
 
-#: src/common/text.c:1003 src/common/text.c:1241 src/common/text.c:1300
-#: src/common/text.c:1307
+#: ../src/common/text.c:1027 ../src/common/text.c:1266
+#: ../src/common/text.c:1325 ../src/common/text.c:1332
 msgid "Username"
 msgstr "用户名"
 
-#: src/common/text.c:1008
+#: ../src/common/text.c:1032
 msgid "The nick of the joining person"
-msgstr "进入的用户"
+msgstr "进入用户的昵称"
 
-#: src/common/text.c:1009
+#: ../src/common/text.c:1033
 msgid "The channel being joined"
 msgstr "进入的频道"
 
-#: src/common/text.c:1010 src/common/text.c:1072 src/common/text.c:1123
+#: ../src/common/text.c:1034 ../src/common/text.c:1097
+#: ../src/common/text.c:1148
 msgid "The host of the person"
 msgstr "此人的主机名"
 
-#: src/common/text.c:1014 src/common/text.c:1021 src/common/text.c:1028
-#: src/common/text.c:1240 src/common/text.c:1247 src/common/text.c:1252
-#: src/common/text.c:1257 src/common/text.c:1262 src/common/text.c:1268
-#: src/common/text.c:1273 src/common/text.c:1277 src/common/text.c:1283
-#: src/common/text.c:1289 src/common/text.c:1353 src/common/text.c:1369
-#: src/common/text.c:1374 src/common/text.c:1379 src/common/text.c:1388
-#: src/common/text.c:1399 src/common/text.c:1406 src/common/text.c:1412
-#: src/common/text.c:1417 src/common/text.c:1422 src/common/text.c:1429
-#: src/common/text.c:1435 src/common/text.c:1441 src/common/text.c:1446
-#: src/common/text.c:1451 src/common/text.c:1455 src/common/text.c:1461
-#: src/common/text.c:1469 src/common/text.c:1473 src/common/text.c:1508
-#: src/common/text.c:1513
+#: ../src/common/text.c:1035
+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
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/common/text.c:1015
+#: ../src/common/text.c:1040
 msgid "The action"
 msgstr "动作"
 
-#: src/common/text.c:1016 src/common/text.c:1023
+#: ../src/common/text.c:1041 ../src/common/text.c:1048
 msgid "Mode char"
-msgstr "模式"
+msgstr "模式字符"
 
-#: src/common/text.c:1017 src/common/text.c:1024 src/common/text.c:1030
+#: ../src/common/text.c:1042 ../src/common/text.c:1049
+#: ../src/common/text.c:1055
 msgid "Identified text"
 msgstr "验证文本"
 
-#: src/common/text.c:1022
+#: ../src/common/text.c:1047
 msgid "The text"
 msgstr "文本"
 
-#: src/common/text.c:1029 src/common/text.c:1100 src/common/text.c:1106
+#: ../src/common/text.c:1054 ../src/common/text.c:1125
+#: ../src/common/text.c:1131
 msgid "The message"
 msgstr "信息"
 
-#: src/common/text.c:1034 src/common/text.c:1039 src/common/text.c:1305
-#: src/common/text.c:1313 src/common/text.c:1319 src/common/text.c:1325
-#: src/common/text.c:1354 src/common/text.c:1482 src/common/text.c:1524
+#: ../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
 msgid "Server Name"
 msgstr "服务器名"
 
-#: src/common/text.c:1035
+#: ../src/common/text.c:1060
 msgid "Acknowledged Capabilities"
-msgstr ""
+msgstr "已知能力"
 
-#: src/common/text.c:1040
+#: ../src/common/text.c:1065
 msgid "Server Capabilities"
-msgstr ""
+msgstr "服务器能力"
 
-#: src/common/text.c:1044
+#: ../src/common/text.c:1069
 msgid "Requested Capabilities"
-msgstr ""
+msgstr "请求能力"
 
-#: src/common/text.c:1048 src/common/text.c:1110
+#: ../src/common/text.c:1073 ../src/common/text.c:1135
 msgid "Old nickname"
 msgstr "原昵称"
 
-#: src/common/text.c:1049 src/common/text.c:1111
+#: ../src/common/text.c:1074 ../src/common/text.c:1136
 msgid "New nickname"
 msgstr "新昵称"
 
-#: src/common/text.c:1053
+#: ../src/common/text.c:1078
 msgid "Nick of person who changed the topic"
 msgstr "更改主题的用户"
 
-#: src/common/text.c:1054 src/common/text.c:1060 src/fe-gtk/chanlist.c:776
-#: src/fe-gtk/chanlist.c:879 src/fe-gtk/setup.c:357
+#: ../src/common/text.c:1079 ../src/common/text.c:1085
+#: ../src/fe-gtk/chanlist.c:779 ../src/fe-gtk/chanlist.c:881
+#: ../src/fe-gtk/setup.c:335
 msgid "Topic"
 msgstr "主题"
 
-#: src/common/text.c:1055 src/common/text.c:1059 src/common/text.c:1528
-#: src/fe-gtk/chanlist.c:774 src/fe-gtk/ignoregui.c:159
-#: src/fe-gtk/servlistgui.c:1733
+#: ../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
 msgid "Channel"
 msgstr "频道"
 
-#: src/common/text.c:1064 src/common/text.c:1117
+#: ../src/common/text.c:1089 ../src/common/text.c:1142
 msgid "The nickname of the kicker"
 msgstr "能踢人的用户"
 
-#: src/common/text.c:1065 src/common/text.c:1115
+#: ../src/common/text.c:1090 ../src/common/text.c:1140
 msgid "The person being kicked"
 msgstr "被踢者"
 
-#: src/common/text.c:1066 src/common/text.c:1073 src/common/text.c:1077
-#: src/common/text.c:1082 src/common/text.c:1116 src/common/text.c:1124
-#: src/common/text.c:1131
+#: ../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
 msgid "The channel"
 msgstr "频道"
 
-#: src/common/text.c:1067 src/common/text.c:1118 src/common/text.c:1125
+#: ../src/common/text.c:1092 ../src/common/text.c:1143
+#: ../src/common/text.c:1150
 msgid "The reason"
 msgstr "原因"
 
-#: src/common/text.c:1071 src/common/text.c:1122
+#: ../src/common/text.c:1096 ../src/common/text.c:1147
 msgid "The nick of the person leaving"
 msgstr "离开的用户"
 
-#: src/common/text.c:1078 src/common/text.c:1084
+#: ../src/common/text.c:1103 ../src/common/text.c:1109
 msgid "The time"
 msgstr "时间"
 
-#: src/common/text.c:1083
+#: ../src/common/text.c:1108
 msgid "The creator"
 msgstr "建立者"
 
-#: src/common/text.c:1088 src/fe-gtk/dccgui.c:824 src/fe-gtk/dccgui.c:1059
+#: ../src/common/text.c:1113 ../src/fe-gtk/dccgui.c:822
+#: ../src/fe-gtk/dccgui.c:1057
 msgid "Nick"
 msgstr "昵称"
 
-#: src/common/text.c:1089 src/common/text.c:1375
+#: ../src/common/text.c:1114 ../src/common/text.c:1400
 msgid "Reason"
 msgstr "原因"
 
-#: src/common/text.c:1090 src/common/text.c:1242 src/common/text.c:1343
+#: ../src/common/text.c:1115 ../src/common/text.c:1267
+#: ../src/common/text.c:1368
 msgid "Host"
 msgstr "主机"
 
-#: src/common/text.c:1094 src/common/text.c:1099 src/common/text.c:1104
+#: ../src/common/text.c:1119 ../src/common/text.c:1124
+#: ../src/common/text.c:1129
 msgid "Who it's from"
-msgstr "来自者"
+msgstr "来自于"
 
-#: src/common/text.c:1095
+#: ../src/common/text.c:1120
 msgid "The time in x.x format (see below)"
-msgstr "时间格式为 x.x(见下)"
+msgstr "时间格式为 x.x (见下)"
 
-#: src/common/text.c:1105 src/common/text.c:1142
+#: ../src/common/text.c:1130 ../src/common/text.c:1167
 msgid "The Channel it's going to"
 msgstr "要进入的频道"
 
-#: src/common/text.c:1129
+#: ../src/common/text.c:1154
 msgid "The sound"
 msgstr "声音"
 
-#: src/common/text.c:1130 src/common/text.c:1136 src/common/text.c:1141
+#: ../src/common/text.c:1155 ../src/common/text.c:1161
+#: ../src/common/text.c:1166
 msgid "The nick of the person"
 msgstr "此人的昵称"
 
-#: src/common/text.c:1135 src/common/text.c:1140
+#: ../src/common/text.c:1160 ../src/common/text.c:1165
 msgid "The CTCP event"
 msgstr "CTCP 事件"
 
-#: src/common/text.c:1146
+#: ../src/common/text.c:1171
 msgid "The nick of the person who set the key"
 msgstr "设置密码的用户"
 
-#: src/common/text.c:1147
+#: ../src/common/text.c:1172
 msgid "The key"
 msgstr "密码"
 
-#: src/common/text.c:1151
+#: ../src/common/text.c:1176
 msgid "The nick of the person who set the limit"
 msgstr "设置限制的用户"
 
-#: src/common/text.c:1152
+#: ../src/common/text.c:1177
 msgid "The limit"
 msgstr "限制"
 
-#: src/common/text.c:1156
+#: ../src/common/text.c:1181
 msgid "The nick of the person who did the op'ing"
 msgstr "使用了 op 命令的用户"
 
-#: src/common/text.c:1157
+#: ../src/common/text.c:1182
 msgid "The nick of the person who has been op'ed"
 msgstr "被授予管理员身份的用户"
 
-#: src/common/text.c:1161
+#: ../src/common/text.c:1186
 msgid "The nick of the person who has been halfop'ed"
 msgstr "被授予副管理员身份的用户"
 
-#: src/common/text.c:1162
+#: ../src/common/text.c:1187
 msgid "The nick of the person who did the halfop'ing"
 msgstr "使用 halfop 命令的用户"
 
-#: src/common/text.c:1166
+#: ../src/common/text.c:1191
 msgid "The nick of the person who did the voice'ing"
 msgstr "使用 voice 命令的用户"
 
-#: src/common/text.c:1167
+#: ../src/common/text.c:1192
 msgid "The nick of the person who has been voice'ed"
 msgstr "被赋予发言权的用户"
 
-#: src/common/text.c:1171
+#: ../src/common/text.c:1196
 msgid "The nick of the person who did the banning"
 msgstr "使用 ban 命令的用户"
 
-#: src/common/text.c:1172 src/common/text.c:1204
+#: ../src/common/text.c:1197 ../src/common/text.c:1229
 msgid "The ban mask"
-msgstr "屏蔽掩码"
+msgstr "ban 掩码"
 
-#: src/common/text.c:1176
+#: ../src/common/text.c:1201
 msgid "The nick of the person who did the quieting"
-msgstr ""
+msgstr "使用了静默选项的用户昵称"
 
-#: src/common/text.c:1177 src/common/text.c:1209
+#: ../src/common/text.c:1202 ../src/common/text.c:1234
 msgid "The quiet mask"
-msgstr ""
+msgstr "quiet 掩码"
 
-#: src/common/text.c:1181
+#: ../src/common/text.c:1206
 msgid "The nick who removed the key"
 msgstr "取消密码的用户"
 
-#: src/common/text.c:1185
+#: ../src/common/text.c:1210
 msgid "The nick who removed the limit"
 msgstr "取消用户限制的用户"
 
-#: src/common/text.c:1189
+#: ../src/common/text.c:1214
 msgid "The nick of the person of did the deop'ing"
 msgstr "使用 deop 命令的用户"
 
-#: src/common/text.c:1190
+#: ../src/common/text.c:1215
 msgid "The nick of the person who has been deop'ed"
 msgstr "被取消管理员身份的用户"
 
-#: src/common/text.c:1193
+#: ../src/common/text.c:1218
 msgid "The nick of the person of did the dehalfop'ing"
 msgstr "使用 dehalfop 命令的用户"
 
-#: src/common/text.c:1194
+#: ../src/common/text.c:1219
 msgid "The nick of the person who has been dehalfop'ed"
 msgstr "被取消副管理员身份的用户"
 
-#: src/common/text.c:1198
+#: ../src/common/text.c:1223
 msgid "The nick of the person of did the devoice'ing"
 msgstr "使用 devoice 命令的用户"
 
-#: src/common/text.c:1199
+#: ../src/common/text.c:1224
 msgid "The nick of the person who has been devoice'ed"
 msgstr "被取消发言权的用户"
 
-#: src/common/text.c:1203
+#: ../src/common/text.c:1228
 msgid "The nick of the person of did the unban'ing"
 msgstr "使用 unban 命令的用户"
 
-#: src/common/text.c:1208
+#: ../src/common/text.c:1233
 msgid "The nick of the person of did the unquiet'ing"
-msgstr ""
+msgstr "使用了 unquiet 选项的用户昵称"
 
-#: src/common/text.c:1213
+#: ../src/common/text.c:1238
 msgid "The nick of the person who did the exempt"
 msgstr "使用 exempt 命令的用户"
 
-#: src/common/text.c:1214 src/common/text.c:1219
+#: ../src/common/text.c:1239 ../src/common/text.c:1244
 msgid "The exempt mask"
 msgstr "exempt 掩码"
 
-#: src/common/text.c:1218
+#: ../src/common/text.c:1243
 msgid "The nick of the person removed the exempt"
 msgstr "取消 exempt 的用户"
 
-#: src/common/text.c:1223
+#: ../src/common/text.c:1248
 msgid "The nick of the person who did the invite"
 msgstr "使用 invite 命令的用户"
 
-#: src/common/text.c:1224 src/common/text.c:1229
+#: ../src/common/text.c:1249 ../src/common/text.c:1254
 msgid "The invite mask"
 msgstr "invite 掩码"
 
-#: src/common/text.c:1228
+#: ../src/common/text.c:1253
 msgid "The nick of the person removed the invite"
 msgstr "取消 invite 的用户"
 
-#: src/common/text.c:1233
+#: ../src/common/text.c:1258
 msgid "The nick of the person setting the mode"
 msgstr "设置模式的用户"
 
-#: src/common/text.c:1234
+#: ../src/common/text.c:1259
 msgid "The mode's sign (+/-)"
 msgstr "模式符号(+/-)"
 
-#: src/common/text.c:1235
+#: ../src/common/text.c:1260
 msgid "The mode letter"
-msgstr "模式字母"
+msgstr "模式字符"
 
-#: src/common/text.c:1236
+#: ../src/common/text.c:1261
 msgid "The channel it's being set on"
 msgstr "被设置的频道"
 
-#: src/common/text.c:1243
+#: ../src/common/text.c:1268
 msgid "Full name"
 msgstr "全名"
 
-#: src/common/text.c:1248
+#: ../src/common/text.c:1273
 msgid "Channel Membership/\"is an IRC operator\""
 msgstr "频道成员/“是 IRC 管理员”"
 
-#: src/common/text.c:1253
+#: ../src/common/text.c:1278
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/common/text.c:1258 src/common/text.c:1263
+#: ../src/common/text.c:1283 ../src/common/text.c:1288
 msgid "Idle time"
 msgstr "发呆时间"
 
-#: src/common/text.c:1264
+#: ../src/common/text.c:1289
 msgid "Signon time"
 msgstr "登录时间"
 
-#: src/common/text.c:1269
+#: ../src/common/text.c:1294
 msgid "Away reason"
 msgstr "离开原因"
 
-#: src/common/text.c:1278 src/common/text.c:1284 src/common/text.c:1292
-#: src/common/text.c:1308 src/common/text.c:1500
+#: ../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
 msgid "Message"
 msgstr "信息"
 
-#: src/common/text.c:1285
+#: ../src/common/text.c:1310
 msgid "Account"
 msgstr "帐户"
 
-#: src/common/text.c:1290
+#: ../src/common/text.c:1315
 msgid "Real user@host"
 msgstr "真实 user@host"
 
-#: src/common/text.c:1291
+#: ../src/common/text.c:1316
 msgid "Real IP"
 msgstr "真实 IP"
 
-#: src/common/text.c:1296 src/common/text.c:1323 src/common/text.c:1329
-#: src/common/text.c:1359 src/common/text.c:1364 src/common/text.c:1523
+#: ../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
 msgid "Channel Name"
 msgstr "频道名"
 
-#: src/common/text.c:1301
+#: ../src/common/text.c:1326
 msgid "Mechanism"
-msgstr ""
+msgstr "机制"
 
-#: src/common/text.c:1306 src/common/text.c:1314
+#: ../src/common/text.c:1331 ../src/common/text.c:1339
 msgid "Raw Numeric or Identifier"
-msgstr ""
+msgstr "原始数字/标识符"
 
-#: src/common/text.c:1312 src/common/text.c:1318 src/common/text.c:1486
-#: src/fe-gtk/menu.c:1500 src/fe-gtk/menu.c:1744 src/fe-gtk/setup.c:237
-#: src/fe-gtk/textgui.c:380
+#: ../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
 msgid "Text"
 msgstr "文本"
 
-#: src/common/text.c:1324
+#: ../src/common/text.c:1349
 msgid "Nick of person who invited you"
 msgstr "邀请您的用户"
 
-#: src/common/text.c:1330 src/fe-gtk/chanlist.c:775
+#: ../src/common/text.c:1355 ../src/fe-gtk/chanlist.c:778
 msgid "Users"
 msgstr "用户"
 
-#: src/common/text.c:1334
+#: ../src/common/text.c:1359
 msgid "Nickname in use"
 msgstr "昵称已被使用"
 
-#: src/common/text.c:1335
+#: ../src/common/text.c:1360
 msgid "Nick being tried"
-msgstr "已试过的昵称"
+msgstr "已尝试过的昵称"
 
-#: src/common/text.c:1344 src/common/text.c:1490
+#: ../src/common/text.c:1369 ../src/common/text.c:1515
 msgid "IP"
 msgstr "IP"
 
-#: src/common/text.c:1345 src/common/text.c:1381
+#: ../src/common/text.c:1370 ../src/common/text.c:1406
 msgid "Port"
 msgstr "端口"
 
-#: src/common/text.c:1355 src/fe-gtk/notifygui.c:125 src/fe-gtk/setup.c:1856
+#: ../src/common/text.c:1380 ../src/fe-gtk/notifygui.c:125
+#: ../src/fe-gtk/setup.c:1820
 msgid "Network"
 msgstr "网络"
 
-#: src/common/text.c:1360 src/common/text.c:1370
+#: ../src/common/text.c:1385 ../src/common/text.c:1395
 msgid "Modes string"
-msgstr "模式"
+msgstr "模式字符串"
 
-#: src/common/text.c:1365 src/fe-gtk/urlgrab.c:96
+#: ../src/common/text.c:1390 ../src/fe-gtk/urlgrab.c:96
 msgid "URL"
 msgstr "URL"
 
-#: src/common/text.c:1386 src/common/text.c:1411
+#: ../src/common/text.c:1411 ../src/common/text.c:1436
 msgid "DCC Type"
 msgstr "DCC 类型"
 
-#: src/common/text.c:1387 src/common/text.c:1392 src/common/text.c:1397
-#: src/common/text.c:1404 src/common/text.c:1424 src/common/text.c:1428
-#: src/common/text.c:1434 src/common/text.c:1440 src/common/text.c:1447
-#: src/common/text.c:1456 src/common/text.c:1462
+#: ../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
 msgid "Filename"
 msgstr "文件名"
 
-#: src/common/text.c:1398 src/common/text.c:1405
+#: ../src/common/text.c:1423 ../src/common/text.c:1430
 msgid "Destination filename"
 msgstr "目标文件名"
 
-#: src/common/text.c:1407 src/common/text.c:1436
+#: ../src/common/text.c:1432 ../src/common/text.c:1461
 msgid "CPS"
 msgstr "CPS"
 
-#: src/common/text.c:1442
+#: ../src/common/text.c:1467
 msgid "Pathname"
 msgstr "路径名"
 
-#: src/common/text.c:1457 src/fe-gtk/dccgui.c:820
+#: ../src/common/text.c:1482 ../src/fe-gtk/dccgui.c:818
 msgid "Position"
 msgstr "位置"
 
-#: src/common/text.c:1463 src/fe-gtk/dccgui.c:819
+#: ../src/common/text.c:1488 ../src/fe-gtk/dccgui.c:817
 msgid "Size"
 msgstr "大小"
 
-#: src/common/text.c:1468
+#: ../src/common/text.c:1493
 msgid "DCC String"
 msgstr "DCC 字符串"
 
-#: src/common/text.c:1474
+#: ../src/common/text.c:1499
 msgid "Away Reason"
-msgstr ""
+msgstr "离开原因"
 
-#: src/common/text.c:1478
+#: ../src/common/text.c:1503
 msgid "Number of notify items"
 msgstr "通知条目数"
 
-#: src/common/text.c:1494
+#: ../src/common/text.c:1519
 msgid "Old Filename"
 msgstr "原文件名"
 
-#: src/common/text.c:1495
+#: ../src/common/text.c:1520
 msgid "New Filename"
 msgstr "新文件名"
 
-#: src/common/text.c:1499
+#: ../src/common/text.c:1524
 msgid "Receiver"
 msgstr "接收者"
 
-#: src/common/text.c:1504
+#: ../src/common/text.c:1529
 msgid "Hostmask"
 msgstr "主机掩码"
 
-#: src/common/text.c:1509
+#: ../src/common/text.c:1534
 msgid "Hostname"
 msgstr "主机名"
 
-#: src/common/text.c:1514
+#: ../src/common/text.c:1539
 msgid "The Packet"
 msgstr "包"
 
-#: src/common/text.c:1518
+#: ../src/common/text.c:1543
 msgid "Seconds"
 msgstr "秒"
 
-#: src/common/text.c:1522
+#: ../src/common/text.c:1547
 msgid "Nick of person who have been invited"
 msgstr "被邀请的用户"
 
-#: src/common/text.c:1529
+#: ../src/common/text.c:1554
 msgid "Banmask"
 msgstr "屏蔽掩码"
 
-#: src/common/text.c:1530
+#: ../src/common/text.c:1555
 msgid "Who set the ban"
 msgstr "设置屏蔽的用户"
 
-#: src/common/text.c:1531
+#: ../src/common/text.c:1556
 msgid "Ban time"
 msgstr "屏蔽时间"
 
-#: src/common/text.c:1571
+#: ../src/common/text.c:1596
 #, c-format
 msgid ""
 "Error parsing event %s.\n"
 "Loading default."
-msgstr "解析事件 %s 出错。\n载入默认值。"
+msgstr "解析事件 %s 出错。\n正在载入默认值。"
 
-#: src/common/text.c:2305
+#: ../src/common/text.c:2334
 #, c-format
 msgid ""
 "Cannot read sound file:\n"
 "%s"
 msgstr "无法读取声音文件:\n%s"
 
-#: src/common/util.c:312
+#: ../src/common/util.c:313
 msgid "Remote host closed socket"
-msgstr "远端主机已关闭套接字"
+msgstr "远程主机已关闭套接字"
 
-#: src/common/util.c:317
+#: ../src/common/util.c:318
 msgid "Connection refused"
 msgstr "连接被拒绝"
 
-#: src/common/util.c:320
+#: ../src/common/util.c:321
 msgid "No route to host"
 msgstr "没有到主机的路由"
 
-#: src/common/util.c:322
+#: ../src/common/util.c:323
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: src/common/util.c:324
+#: ../src/common/util.c:325
 msgid "Cannot assign that address"
 msgstr "无法分配该地址"
 
-#: src/common/util.c:326
+#: ../src/common/util.c:327
 msgid "Connection reset by peer"
 msgstr "连接被重置"
 
-#: src/common/util.c:970
+#: ../src/common/util.c:985
 msgid "Ascension Island"
 msgstr "阿森松岛"
 
-#: src/common/util.c:971
+#: ../src/common/util.c:986
 msgid "Andorra"
 msgstr "安道尔"
 
-#: src/common/util.c:972
+#: ../src/common/util.c:987
 msgid "United Arab Emirates"
-msgstr "阿拉伯联合大公国"
+msgstr "阿拉伯联合酋长国"
 
-#: src/common/util.c:973
+#: ../src/common/util.c:988
 msgid "Aviation-Related Fields"
-msgstr ""
+msgstr "航空相关领域"
 
-#: src/common/util.c:974
+#: ../src/common/util.c:989
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: src/common/util.c:975
+#: ../src/common/util.c:990
 msgid "Antigua and Barbuda"
-msgstr "安地卡及巴布达"
+msgstr "安提瓜和巴布达"
 
-#: src/common/util.c:976
+#: ../src/common/util.c:991
 msgid "Anguilla"
 msgstr "安圭拉岛"
 
-#: src/common/util.c:977
+#: ../src/common/util.c:992
 msgid "Albania"
 msgstr "阿尔巴尼亚"
 
-#: src/common/util.c:978
+#: ../src/common/util.c:993
 msgid "Armenia"
 msgstr "亚美尼亚"
 
-#: src/common/util.c:979
+#: ../src/common/util.c:994
 msgid "Netherlands Antilles"
-msgstr "荷属安地列斯"
+msgstr "荷属安的列斯群岛"
 
-#: src/common/util.c:980
+#: ../src/common/util.c:995
 msgid "Angola"
 msgstr "安哥拉"
 
-#: src/common/util.c:981
+#: ../src/common/util.c:996
 msgid "Antarctica"
 msgstr "南极洲"
 
-#: src/common/util.c:982
+#: ../src/common/util.c:997
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: src/common/util.c:983
+#: ../src/common/util.c:998
 msgid "Reverse DNS"
 msgstr "反向 DNS"
 
-#: src/common/util.c:984
+#: ../src/common/util.c:999
 msgid "American Samoa"
 msgstr "美属萨摩亚"
 
-#: src/common/util.c:985
+#: ../src/common/util.c:1000
 msgid "Asia-Pacific Region"
-msgstr ""
+msgstr "亚太区"
 
-#: src/common/util.c:986
+#: ../src/common/util.c:1001
 msgid "Austria"
 msgstr "奥地利"
 
-#: src/common/util.c:987
+#: ../src/common/util.c:1002
 msgid "Nato Fiel"
 msgstr "北大西洋公约组织"
 
-#: src/common/util.c:988
+#: ../src/common/util.c:1003
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: src/common/util.c:989
+#: ../src/common/util.c:1004
 msgid "Aruba"
-msgstr "阿卢巴岛"
+msgstr "阿鲁巴"
 
-#: src/common/util.c:990
+#: ../src/common/util.c:1005
 msgid "Aland Islands"
 msgstr "奥兰群岛"
 
-#: src/common/util.c:991
+#: ../src/common/util.c:1006
 msgid "Azerbaijan"
-msgstr "亚塞拜然"
+msgstr "阿塞拜疆"
 
-#: src/common/util.c:992
+#: ../src/common/util.c:1007
 msgid "Bosnia and Herzegovina"
-msgstr "波士尼亚及赫塞哥维那"
+msgstr "波斯尼亚和黑塞哥维那"
 
-#: src/common/util.c:993
+#: ../src/common/util.c:1008
 msgid "Barbados"
-msgstr "巴贝多"
+msgstr "巴巴多斯"
 
-#: src/common/util.c:994
+#: ../src/common/util.c:1009
 msgid "Bangladesh"
-msgstr "孟加拉"
+msgstr "孟加拉国"
 
-#: src/common/util.c:995
+#: ../src/common/util.c:1010
 msgid "Belgium"
 msgstr "比利时"
 
-#: src/common/util.c:996
+#: ../src/common/util.c:1011
 msgid "Burkina Faso"
-msgstr "布吉纳法索"
+msgstr "布基纳法索"
 
-#: src/common/util.c:997
+#: ../src/common/util.c:1012
 msgid "Bulgaria"
 msgstr "保加利亚"
 
-#: src/common/util.c:998
+#: ../src/common/util.c:1013
 msgid "Bahrain"
 msgstr "巴林"
 
-#: src/common/util.c:999
+#: ../src/common/util.c:1014
 msgid "Burundi"
-msgstr "浦隆地"
+msgstr "布隆迪"
 
-#: src/common/util.c:1000
+#: ../src/common/util.c:1015
 msgid "Businesses"
 msgstr "商业"
 
-#: src/common/util.c:1001
+#: ../src/common/util.c:1016
 msgid "Benin"
-msgstr "贝南"
+msgstr "贝宁"
 
-#: src/common/util.c:1002
+#: ../src/common/util.c:1017
 msgid "Bermuda"
-msgstr "百慕达群岛"
+msgstr "百慕大群岛"
 
-#: src/common/util.c:1003
+#: ../src/common/util.c:1018
 msgid "Brunei Darussalam"
-msgstr "汶莱"
+msgstr "文莱"
 
-#: src/common/util.c:1004
+#: ../src/common/util.c:1019
 msgid "Bolivia"
 msgstr "玻利维亚"
 
-#: src/common/util.c:1005
+#: ../src/common/util.c:1020
 msgid "Brazil"
 msgstr "巴西"
 
-#: src/common/util.c:1006
+#: ../src/common/util.c:1021
 msgid "Bahamas"
 msgstr "巴哈马群岛"
 
-#: src/common/util.c:1007
+#: ../src/common/util.c:1022
 msgid "Bhutan"
 msgstr "不丹"
 
-#: src/common/util.c:1008
+#: ../src/common/util.c:1023
 msgid "Bouvet Island"
-msgstr "波维特岛"
+msgstr "布韦岛"
 
-#: src/common/util.c:1009
+#: ../src/common/util.c:1024
 msgid "Botswana"
-msgstr "波札那"
+msgstr "博茨瓦纳"
 
-#: src/common/util.c:1010
+#: ../src/common/util.c:1025
 msgid "Belarus"
-msgstr "白俄"
+msgstr "白俄罗斯"
 
-#: src/common/util.c:1011
+#: ../src/common/util.c:1026
 msgid "Belize"
-msgstr "贝里斯"
+msgstr "伯利兹"
 
-#: src/common/util.c:1012
+#: ../src/common/util.c:1027
 msgid "Canada"
 msgstr "加拿大"
 
-#: src/common/util.c:1013 src/fe-gtk/setup.c:101
+#: ../src/common/util.c:1028 ../src/fe-gtk/setup.c:96
 msgid "Catalan"
-msgstr ""
+msgstr "加泰罗尼亚"
 
-#: src/common/util.c:1014
+#: ../src/common/util.c:1029
 msgid "Cocos Islands"
-msgstr "可可斯群岛"
+msgstr "科科斯群岛"
 
-#: src/common/util.c:1015
+#: ../src/common/util.c:1030
 msgid "Democratic Republic of Congo"
 msgstr "刚果民主共和国"
 
-#: src/common/util.c:1016
+#: ../src/common/util.c:1031
 msgid "Central African Republic"
 msgstr "中非共和国"
 
-#: src/common/util.c:1017
+#: ../src/common/util.c:1032
 msgid "Congo"
 msgstr "刚果"
 
-#: src/common/util.c:1018
+#: ../src/common/util.c:1033
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: src/common/util.c:1019
+#: ../src/common/util.c:1034
 msgid "Cote d'Ivoire"
-msgstr "象牙海岸"
+msgstr "科特迪瓦共和国"
 
-#: src/common/util.c:1020
+#: ../src/common/util.c:1035
 msgid "Cook Islands"
-msgstr "科克群岛"
+msgstr "库克群岛"
 
-#: src/common/util.c:1021
+#: ../src/common/util.c:1036
 msgid "Chile"
 msgstr "智利"
 
-#: src/common/util.c:1022
+#: ../src/common/util.c:1037
 msgid "Cameroon"
 msgstr "喀麦隆"
 
-#: src/common/util.c:1023
+#: ../src/common/util.c:1038
 msgid "China"
 msgstr "中国"
 
-#: src/common/util.c:1024
+#: ../src/common/util.c:1039
 msgid "Colombia"
 msgstr "哥伦比亚"
 
-#: src/common/util.c:1025
+#: ../src/common/util.c:1040
 msgid "Internic Commercial"
 msgstr "Internic 商业组织"
 
-#: src/common/util.c:1026
+#: ../src/common/util.c:1041
 msgid "Cooperatives"
-msgstr ""
+msgstr "联合体"
 
-#: src/common/util.c:1027
+#: ../src/common/util.c:1042
 msgid "Costa Rica"
-msgstr "哥斯大黎加"
+msgstr "哥斯达黎加"
 
-#: src/common/util.c:1028
+#: ../src/common/util.c:1043
 msgid "Serbia and Montenegro"
-msgstr "塞尔维亚及蒙特尼哥罗"
+msgstr "塞尔维亚和黑山"
 
-#: src/common/util.c:1029
+#: ../src/common/util.c:1044
 msgid "Cuba"
 msgstr "古巴"
 
-#: src/common/util.c:1030
+#: ../src/common/util.c:1045
 msgid "Cape Verde"
-msgstr "维德角岛"
+msgstr "佛得角"
 
-#: src/common/util.c:1031
+#: ../src/common/util.c:1046
 msgid "Christmas Island"
 msgstr "圣诞岛"
 
-#: src/common/util.c:1032
+#: ../src/common/util.c:1047
 msgid "Cyprus"
-msgstr "赛普勒斯"
+msgstr "塞浦路斯"
 
-#: src/common/util.c:1033
+#: ../src/common/util.c:1048
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: src/common/util.c:1034
+#: ../src/common/util.c:1049
 msgid "East Germany"
-msgstr ""
+msgstr "东德"
 
-#: src/common/util.c:1035
+#: ../src/common/util.c:1050
 msgid "Germany"
 msgstr "德国"
 
-#: src/common/util.c:1036
+#: ../src/common/util.c:1051
 msgid "Djibouti"
-msgstr "吉布地"
+msgstr "吉布提"
 
-#: src/common/util.c:1037
+#: ../src/common/util.c:1052
 msgid "Denmark"
 msgstr "丹麦"
 
-#: src/common/util.c:1038
+#: ../src/common/util.c:1053
 msgid "Dominica"
-msgstr "多明尼克"
+msgstr "多米尼克"
 
-#: src/common/util.c:1039
+#: ../src/common/util.c:1054
 msgid "Dominican Republic"
-msgstr "多明尼加共和国"
+msgstr "多米尼加共和国"
 
-#: src/common/util.c:1040
+#: ../src/common/util.c:1055
 msgid "Algeria"
 msgstr "阿尔及利亚"
 
-#: src/common/util.c:1041
+#: ../src/common/util.c:1056
 msgid "Ecuador"
-msgstr "厄瓜多"
+msgstr "厄瓜多尔"
 
-#: src/common/util.c:1042
+#: ../src/common/util.c:1057
 msgid "Educational Institution"
 msgstr "教育机构"
 
-#: src/common/util.c:1043
+#: ../src/common/util.c:1058
 msgid "Estonia"
 msgstr "爱沙尼亚"
 
-#: src/common/util.c:1044
+#: ../src/common/util.c:1059
 msgid "Egypt"
 msgstr "埃及"
 
-#: src/common/util.c:1045
+#: ../src/common/util.c:1060
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
-#: src/common/util.c:1046
+#: ../src/common/util.c:1061
 msgid "Eritrea"
-msgstr "埃立特里亚"
+msgstr "厄立特里亚"
 
-#: src/common/util.c:1047
+#: ../src/common/util.c:1062
 msgid "Spain"
 msgstr "西班牙"
 
-#: src/common/util.c:1048
+#: ../src/common/util.c:1063
 msgid "Ethiopia"
-msgstr "衣索比亚"
+msgstr "埃塞俄比亚"
 
-#: src/common/util.c:1049
+#: ../src/common/util.c:1064
 msgid "European Union"
 msgstr "欧盟"
 
-#: src/common/util.c:1050
+#: ../src/common/util.c:1065
 msgid "Finland"
 msgstr "芬兰"
 
-#: src/common/util.c:1051
+#: ../src/common/util.c:1066
 msgid "Fiji"
 msgstr "斐济"
 
-#: src/common/util.c:1052
+#: ../src/common/util.c:1067
 msgid "Falkland Islands"
-msgstr "福克兰群岛"
+msgstr "福克兰群岛/马尔维纳斯群岛"
 
-#: src/common/util.c:1053
+#: ../src/common/util.c:1068
 msgid "Micronesia"
 msgstr "密克罗尼西亚"
 
-#: src/common/util.c:1054
+#: ../src/common/util.c:1069
 msgid "Faroe Islands"
 msgstr "法罗群岛"
 
-#: src/common/util.c:1055
+#: ../src/common/util.c:1070
 msgid "France"
 msgstr "法国"
 
-#: src/common/util.c:1056
+#: ../src/common/util.c:1071
 msgid "Gabon"
-msgstr "加彭"
+msgstr "加蓬"
 
-#: src/common/util.c:1057
+#: ../src/common/util.c:1072
 msgid "Great Britain"
 msgstr "大不列颠"
 
-#: src/common/util.c:1058
+#: ../src/common/util.c:1073
 msgid "Grenada"
-msgstr "格瑞纳达"
+msgstr "格林纳达"
 
-#: src/common/util.c:1059
+#: ../src/common/util.c:1074
 msgid "Georgia"
-msgstr "乔治亚"
+msgstr "格鲁吉亚"
 
-#: src/common/util.c:1060
+#: ../src/common/util.c:1075
 msgid "French Guiana"
 msgstr "法属圭亚那"
 
-#: src/common/util.c:1061
+#: ../src/common/util.c:1076
 msgid "British Channel Isles"
-msgstr "不列颠海峡群岛"
+msgstr "不列颠群岛"
 
-#: src/common/util.c:1062
+#: ../src/common/util.c:1077
 msgid "Ghana"
-msgstr "迦纳"
+msgstr "加纳"
 
-#: src/common/util.c:1063
+#: ../src/common/util.c:1078
 msgid "Gibraltar"
 msgstr "直布罗陀"
 
-#: src/common/util.c:1064
+#: ../src/common/util.c:1079
 msgid "Greenland"
 msgstr "格陵兰"
 
-#: src/common/util.c:1065
+#: ../src/common/util.c:1080
 msgid "Gambia"
-msgstr "甘比亚"
+msgstr "冈比亚"
 
-#: src/common/util.c:1066
+#: ../src/common/util.c:1081
 msgid "Guinea"
 msgstr "几内亚"
 
-#: src/common/util.c:1067
+#: ../src/common/util.c:1082
 msgid "Government"
 msgstr "政府部门"
 
-#: src/common/util.c:1068
+#: ../src/common/util.c:1083
 msgid "Guadeloupe"
-msgstr "瓜德鲁普岛"
+msgstr "法属瓜德罗普岛"
 
-#: src/common/util.c:1069
+#: ../src/common/util.c:1084
 msgid "Equatorial Guinea"
 msgstr "赤道几内亚"
 
-#: src/common/util.c:1070
+#: ../src/common/util.c:1085
 msgid "Greece"
 msgstr "希腊"
 
-#: src/common/util.c:1071
+#: ../src/common/util.c:1086
 msgid "S. Georgia and S. Sandwich Isles"
 msgstr "南乔治亚及南桑威奇群岛"
 
-#: src/common/util.c:1072
+#: ../src/common/util.c:1087
 msgid "Guatemala"
-msgstr "瓜地马拉"
+msgstr "危地马拉"
 
-#: src/common/util.c:1073
+#: ../src/common/util.c:1088
 msgid "Guam"
 msgstr "关岛"
 
-#: src/common/util.c:1074
+#: ../src/common/util.c:1089
 msgid "Guinea-Bissau"
-msgstr "几内亚比索"
+msgstr "几内亚比绍"
 
-#: src/common/util.c:1075
+#: ../src/common/util.c:1090
 msgid "Guyana"
-msgstr "盖亚那"
+msgstr "圭亚那"
 
-#: src/common/util.c:1076
+#: ../src/common/util.c:1091
 msgid "Hong Kong"
 msgstr "中国香港特别行政区"
 
-#: src/common/util.c:1077
+#: ../src/common/util.c:1092
 msgid "Heard and McDonald Islands"
-msgstr "赫德及麦当劳群岛"
+msgstr "赫德岛和麦克唐纳群岛"
 
-#: src/common/util.c:1078
+#: ../src/common/util.c:1093
 msgid "Honduras"
-msgstr "宏都拉斯"
+msgstr "洪都拉斯"
 
-#: src/common/util.c:1079
+#: ../src/common/util.c:1094
 msgid "Croatia"
-msgstr "克罗埃西亚"
+msgstr "克罗地亚"
 
-#: src/common/util.c:1080
+#: ../src/common/util.c:1095
 msgid "Haiti"
 msgstr "海地"
 
-#: src/common/util.c:1081
+#: ../src/common/util.c:1096
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: src/common/util.c:1082
+#: ../src/common/util.c:1097
 msgid "Indonesia"
-msgstr "印尼"
+msgstr "印度尼西亚"
 
-#: src/common/util.c:1083
+#: ../src/common/util.c:1098
 msgid "Ireland"
 msgstr "爱尔兰"
 
-#: src/common/util.c:1084
+#: ../src/common/util.c:1099
 msgid "Israel"
 msgstr "以色列"
 
-#: src/common/util.c:1085
+#: ../src/common/util.c:1100
 msgid "Isle of Man"
-msgstr "曼岛"
+msgstr "马恩岛"
 
-#: src/common/util.c:1086
+#: ../src/common/util.c:1101
 msgid "India"
 msgstr "印度"
 
-#: src/common/util.c:1087
+#: ../src/common/util.c:1102
 msgid "Informational"
 msgstr "信息机构"
 
-#: src/common/util.c:1088
+#: ../src/common/util.c:1103
 msgid "International"
 msgstr "国际组织"
 
-#: src/common/util.c:1089
+#: ../src/common/util.c:1104
 msgid "British Indian Ocean Territory"
 msgstr "英属印度洋地区"
 
-#: src/common/util.c:1090
+#: ../src/common/util.c:1105
 msgid "Iraq"
 msgstr "伊拉克"
 
-#: src/common/util.c:1091
+#: ../src/common/util.c:1106
 msgid "Iran"
 msgstr "伊朗"
 
-#: src/common/util.c:1092
+#: ../src/common/util.c:1107
 msgid "Iceland"
 msgstr "冰岛"
 
-#: src/common/util.c:1093
+#: ../src/common/util.c:1108
 msgid "Italy"
 msgstr "意大利"
 
-#: src/common/util.c:1094
+#: ../src/common/util.c:1109
 msgid "Jersey"
 msgstr "泽西岛"
 
-#: src/common/util.c:1095
+#: ../src/common/util.c:1110
 msgid "Jamaica"
 msgstr "牙买加"
 
-#: src/common/util.c:1096
+#: ../src/common/util.c:1111
 msgid "Jordan"
 msgstr "约旦"
 
-#: src/common/util.c:1097
+#: ../src/common/util.c:1112
 msgid "Company Jobs"
-msgstr ""
+msgstr "公司职位"
 
-#: src/common/util.c:1098
+#: ../src/common/util.c:1113
 msgid "Japan"
 msgstr "日本"
 
-#: src/common/util.c:1099
+#: ../src/common/util.c:1114
 msgid "Kenya"
-msgstr "肯亚"
+msgstr "肯尼亚"
 
-#: src/common/util.c:1100
+#: ../src/common/util.c:1115
 msgid "Kyrgyzstan"
-msgstr "吉尔吉斯"
+msgstr "吉尔吉斯斯坦"
 
-#: src/common/util.c:1101
+#: ../src/common/util.c:1116
 msgid "Cambodia"
 msgstr "柬埔寨"
 
-#: src/common/util.c:1102
+#: ../src/common/util.c:1117
 msgid "Kiribati"
-msgstr "吉里巴斯"
+msgstr "基里巴斯"
 
-#: src/common/util.c:1103
+#: ../src/common/util.c:1118
 msgid "Comoros"
-msgstr "葛摩"
+msgstr "科摩罗"
 
-#: src/common/util.c:1104
+#: ../src/common/util.c:1119
 msgid "St. Kitts and Nevis"
-msgstr "圣克里斯多福"
+msgstr "圣基茨和尼维斯"
 
-#: src/common/util.c:1105
+#: ../src/common/util.c:1120
 msgid "North Korea"
 msgstr "朝鲜"
 
-#: src/common/util.c:1106
+#: ../src/common/util.c:1121
 msgid "South Korea"
 msgstr "韩国"
 
-#: src/common/util.c:1107
+#: ../src/common/util.c:1122
 msgid "Kuwait"
 msgstr "科威特"
 
-#: src/common/util.c:1108
+#: ../src/common/util.c:1123
 msgid "Cayman Islands"
 msgstr "开曼群岛"
 
-#: src/common/util.c:1109
+#: ../src/common/util.c:1124
 msgid "Kazakhstan"
-msgstr "哈萨克"
+msgstr "哈萨克斯坦"
 
-#: src/common/util.c:1110
+#: ../src/common/util.c:1125
 msgid "Laos"
 msgstr "老挝"
 
-#: src/common/util.c:1111
+#: ../src/common/util.c:1126
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
-#: src/common/util.c:1112
+#: ../src/common/util.c:1127
 msgid "Saint Lucia"
-msgstr "圣露西亚"
+msgstr "圣卢西亚"
 
-#: src/common/util.c:1113
+#: ../src/common/util.c:1128
 msgid "Liechtenstein"
-msgstr "列支敦斯登"
+msgstr "列支敦士登"
 
-#: src/common/util.c:1114
+#: ../src/common/util.c:1129
 msgid "Sri Lanka"
 msgstr "斯里兰卡"
 
-#: src/common/util.c:1115
+#: ../src/common/util.c:1130
 msgid "Liberia"
-msgstr "赖比瑞亚"
+msgstr "利比里亚"
 
-#: src/common/util.c:1116
+#: ../src/common/util.c:1131
 msgid "Lesotho"
-msgstr "赖索托"
+msgstr "莱索托"
 
-#: src/common/util.c:1117
+#: ../src/common/util.c:1132
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: src/common/util.c:1118
+#: ../src/common/util.c:1133
 msgid "Luxembourg"
 msgstr "卢森堡"
 
-#: src/common/util.c:1119
+#: ../src/common/util.c:1134
 msgid "Latvia"
 msgstr "拉脱维亚"
 
-#: src/common/util.c:1120
+#: ../src/common/util.c:1135
 msgid "Libya"
 msgstr "利比亚"
 
-#: src/common/util.c:1121
+#: ../src/common/util.c:1136
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: src/common/util.c:1122
+#: ../src/common/util.c:1137
 msgid "Monaco"
 msgstr "摩纳哥"
 
-#: src/common/util.c:1123
+#: ../src/common/util.c:1138
 msgid "Moldova"
 msgstr "摩尔多瓦"
 
-#: src/common/util.c:1124
+#: ../src/common/util.c:1139
 msgid "Montenegro"
-msgstr ""
+msgstr "黑山共和国"
 
-#: src/common/util.c:1125
+#: ../src/common/util.c:1140
 msgid "United States Medical"
 msgstr "美国医疗组织"
 
-#: src/common/util.c:1126
+#: ../src/common/util.c:1141
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: src/common/util.c:1127
+#: ../src/common/util.c:1142
 msgid "Marshall Islands"
 msgstr "马绍尔群岛"
 
-#: src/common/util.c:1128
+#: ../src/common/util.c:1143
 msgid "Military"
 msgstr "军事机构"
 
-#: src/common/util.c:1129
+#: ../src/common/util.c:1144
 msgid "Macedonia"
 msgstr "马其顿"
 
-#: src/common/util.c:1130
+#: ../src/common/util.c:1145
 msgid "Mali"
-msgstr "马利"
+msgstr "马里"
 
-#: src/common/util.c:1131
+#: ../src/common/util.c:1146
 msgid "Myanmar"
 msgstr "缅甸"
 
-#: src/common/util.c:1132
+#: ../src/common/util.c:1147
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: src/common/util.c:1133
+#: ../src/common/util.c:1148
 msgid "Macau"
 msgstr "中国澳门特别行政区"
 
-#: src/common/util.c:1134
+#: ../src/common/util.c:1149
 msgid "Mobile Devices"
-msgstr ""
+msgstr "移动设备"
 
-#: src/common/util.c:1135
+#: ../src/common/util.c:1150
 msgid "Northern Mariana Islands"
-msgstr "北马里亚纳群岛"
+msgstr "北马里亚那群岛"
 
-#: src/common/util.c:1136
+#: ../src/common/util.c:1151
 msgid "Martinique"
-msgstr "法属马丁尼克"
+msgstr "马提尼克岛"
 
-#: src/common/util.c:1137
+#: ../src/common/util.c:1152
 msgid "Mauritania"
-msgstr "茅利塔尼亚"
+msgstr "毛里塔尼亚"
 
-#: src/common/util.c:1138
+#: ../src/common/util.c:1153
 msgid "Montserrat"
-msgstr "蒙瑟拉特岛"
+msgstr "蒙特塞拉特"
 
-#: src/common/util.c:1139
+#: ../src/common/util.c:1154
 msgid "Malta"
 msgstr "马尔他"
 
-#: src/common/util.c:1140
+#: ../src/common/util.c:1155
 msgid "Mauritius"
-msgstr "模里西斯"
+msgstr "毛里求斯"
 
-#: src/common/util.c:1141
+#: ../src/common/util.c:1156
 msgid "Museums"
-msgstr ""
+msgstr "博物馆"
 
-#: src/common/util.c:1142
+#: ../src/common/util.c:1157
 msgid "Maldives"
-msgstr "马尔地夫"
+msgstr "马尔代夫"
 
-#: src/common/util.c:1143
+#: ../src/common/util.c:1158
 msgid "Malawi"
-msgstr "马拉威"
+msgstr "马拉维"
 
-#: src/common/util.c:1144
+#: ../src/common/util.c:1159
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: src/common/util.c:1145
+#: ../src/common/util.c:1160
 msgid "Malaysia"
 msgstr "马来西亚"
 
-#: src/common/util.c:1146
+#: ../src/common/util.c:1161
 msgid "Mozambique"
-msgstr "莫三比克"
+msgstr "莫桑比克"
 
-#: src/common/util.c:1147
+#: ../src/common/util.c:1162
 msgid "Namibia"
 msgstr "纳米比亚"
 
-#: src/common/util.c:1148
+#: ../src/common/util.c:1163
 msgid "Individual's Names"
-msgstr ""
+msgstr "个体名称"
 
-#: src/common/util.c:1149
+#: ../src/common/util.c:1164
 msgid "New Caledonia"
 msgstr "新喀里多尼亚岛"
 
-#: src/common/util.c:1150
+#: ../src/common/util.c:1165
 msgid "Niger"
-msgstr "尼日"
+msgstr "尼日尔"
 
-#: src/common/util.c:1151
+#: ../src/common/util.c:1166
 msgid "Internic Network"
 msgstr "Internic 网络"
 
-#: src/common/util.c:1152
+#: ../src/common/util.c:1167
 msgid "Norfolk Island"
 msgstr "诺福克岛"
 
-#: src/common/util.c:1153
+#: ../src/common/util.c:1168
 msgid "Nigeria"
-msgstr "奈及利亚"
+msgstr "尼日利亚"
 
-#: src/common/util.c:1154
+#: ../src/common/util.c:1169
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: src/common/util.c:1155
+#: ../src/common/util.c:1170
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: src/common/util.c:1156
+#: ../src/common/util.c:1171
 msgid "Norway"
 msgstr "挪威"
 
-#: src/common/util.c:1157
+#: ../src/common/util.c:1172
 msgid "Nepal"
 msgstr "尼泊尔"
 
-#: src/common/util.c:1158
+#: ../src/common/util.c:1173
 msgid "Nauru"
-msgstr "诺鲁"
+msgstr "瑙鲁"
 
-#: src/common/util.c:1159
+#: ../src/common/util.c:1174
 msgid "Niue"
-msgstr "纽威岛"
+msgstr "纽埃岛"
 
-#: src/common/util.c:1160
+#: ../src/common/util.c:1175
 msgid "New Zealand"
-msgstr "纽西兰"
+msgstr "新西兰"
 
-#: src/common/util.c:1161
+#: ../src/common/util.c:1176
 msgid "Oman"
 msgstr "阿曼"
 
-#: src/common/util.c:1162
+#: ../src/common/util.c:1177
 msgid "Internic Non-Profit Organization"
 msgstr "Internic 非营利性组织"
 
-#: src/common/util.c:1163
+#: ../src/common/util.c:1178
 msgid "Panama"
 msgstr "巴拿马"
 
-#: src/common/util.c:1164
+#: ../src/common/util.c:1179
 msgid "Peru"
 msgstr "秘鲁"
 
-#: src/common/util.c:1165
+#: ../src/common/util.c:1180
 msgid "French Polynesia"
-msgstr "法属波里尼西亚"
+msgstr "法属波利尼西亚"
 
-#: src/common/util.c:1166
+#: ../src/common/util.c:1181
 msgid "Papua New Guinea"
-msgstr "巴布亚纽几内亚"
+msgstr "巴布亚新几内亚"
 
-#: src/common/util.c:1167
+#: ../src/common/util.c:1182
 msgid "Philippines"
 msgstr "菲律宾"
 
-#: src/common/util.c:1168
+#: ../src/common/util.c:1183
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: src/common/util.c:1169
+#: ../src/common/util.c:1184
 msgid "Poland"
 msgstr "波兰"
 
-#: src/common/util.c:1170
+#: ../src/common/util.c:1185
 msgid "St. Pierre and Miquelon"
-msgstr "圣匹及密启伦群岛"
+msgstr "圣皮埃尔和密克隆"
 
-#: src/common/util.c:1171
+#: ../src/common/util.c:1186
 msgid "Pitcairn"
-msgstr "皮特康岛"
+msgstr "皮特凯恩群岛"
 
-#: src/common/util.c:1172
+#: ../src/common/util.c:1187
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
-#: src/common/util.c:1173
+#: ../src/common/util.c:1188
 msgid "Professions"
-msgstr ""
+msgstr "专业人士"
 
-#: src/common/util.c:1174
+#: ../src/common/util.c:1189
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地区"
 
-#: src/common/util.c:1175
+#: ../src/common/util.c:1190
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: src/common/util.c:1176
+#: ../src/common/util.c:1191
 msgid "Palau"
-msgstr "帛琉群岛"
+msgstr "帕劳"
 
-#: src/common/util.c:1177
+#: ../src/common/util.c:1192
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-#: src/common/util.c:1178
+#: ../src/common/util.c:1193
 msgid "Qatar"
-msgstr "卡达"
+msgstr "卡塔尔"
 
-#: src/common/util.c:1179
+#: ../src/common/util.c:1194
 msgid "Reunion"
-msgstr "留尼旺"
+msgstr "留尼汪岛"
 
-#: src/common/util.c:1180
+#: ../src/common/util.c:1195
 msgid "Romania"
 msgstr "罗马尼亚"
 
-#: src/common/util.c:1181
+#: ../src/common/util.c:1196
 msgid "Old School ARPAnet"
-msgstr "教育 ARPAnet"
+msgstr "教育用 ARPAnet"
 
-#: src/common/util.c:1182
+#: ../src/common/util.c:1197
 msgid "Serbia"
-msgstr ""
+msgstr "塞尔维亚共和国"
 
-#: src/common/util.c:1183
+#: ../src/common/util.c:1198
 msgid "Russian Federation"
 msgstr "俄罗斯联邦"
 
-#: src/common/util.c:1184
+#: ../src/common/util.c:1199
 msgid "Rwanda"
-msgstr "卢安达"
+msgstr "卢旺达"
 
-#: src/common/util.c:1185
+#: ../src/common/util.c:1200
 msgid "Saudi Arabia"
-msgstr "沙乌地阿拉伯"
+msgstr "沙特阿拉伯"
 
-#: src/common/util.c:1186
+#: ../src/common/util.c:1201
 msgid "Solomon Islands"
 msgstr "所罗门群岛"
 
-#: src/common/util.c:1187
+#: ../src/common/util.c:1202
 msgid "Seychelles"
-msgstr "塞席尔群岛"
+msgstr "塞舌尔群岛"
 
-#: src/common/util.c:1188
+#: ../src/common/util.c:1203
 msgid "Sudan"
 msgstr "苏丹"
 
-#: src/common/util.c:1189
+#: ../src/common/util.c:1204
 msgid "Sweden"
 msgstr "瑞典"
 
-#: src/common/util.c:1190
+#: ../src/common/util.c:1205
 msgid "Singapore"
 msgstr "新加坡"
 
-#: src/common/util.c:1191
+#: ../src/common/util.c:1206
 msgid "St. Helena"
 msgstr "圣赫勒拿岛"
 
-#: src/common/util.c:1192
+#: ../src/common/util.c:1207
 msgid "Slovenia"
-msgstr "斯洛凡尼亚"
+msgstr "斯洛文尼亚"
 
-#: src/common/util.c:1193
+#: ../src/common/util.c:1208
 msgid "Svalbard and Jan Mayen Islands"
-msgstr "冷岸及央麦恩群岛"
+msgstr "斯瓦尔巴群岛和扬马延岛"
 
-#: src/common/util.c:1194
+#: ../src/common/util.c:1209
 msgid "Slovak Republic"
 msgstr "斯洛伐克共和国"
 
-#: src/common/util.c:1195
+#: ../src/common/util.c:1210
 msgid "Sierra Leone"
-msgstr "狮子山"
+msgstr "塞拉利昂"
 
-#: src/common/util.c:1196
+#: ../src/common/util.c:1211
 msgid "San Marino"
-msgstr "圣马利诺"
+msgstr "圣马力诺"
 
-#: src/common/util.c:1197
+#: ../src/common/util.c:1212
 msgid "Senegal"
 msgstr "塞内加尔"
 
-#: src/common/util.c:1198
+#: ../src/common/util.c:1213
 msgid "Somalia"
-msgstr "索马利亚"
+msgstr "索马里"
 
-#: src/common/util.c:1199
+#: ../src/common/util.c:1214
 msgid "Suriname"
-msgstr "苏利南"
+msgstr "苏里南"
 
-#: src/common/util.c:1200
+#: ../src/common/util.c:1215
 msgid "South Sudan"
-msgstr ""
+msgstr "南苏丹"
 
-#: src/common/util.c:1201
+#: ../src/common/util.c:1216
 msgid "Sao Tome and Principe"
 msgstr "圣多美和普林西比"
 
-#: src/common/util.c:1202
+#: ../src/common/util.c:1217
 msgid "Former USSR"
 msgstr "前苏联"
 
-#: src/common/util.c:1203
+#: ../src/common/util.c:1218
 msgid "El Salvador"
 msgstr "萨尔瓦多"
 
-#: src/common/util.c:1204
+#: ../src/common/util.c:1219
 msgid "Syria"
 msgstr "叙利亚"
 
-#: src/common/util.c:1205
+#: ../src/common/util.c:1220
 msgid "Swaziland"
-msgstr "史瓦济兰"
+msgstr "斯威士兰"
 
-#: src/common/util.c:1206
+#: ../src/common/util.c:1221
 msgid "Turks and Caicos Islands"
-msgstr "土克斯及开科斯群岛"
+msgstr "特克斯和凯科斯群岛"
 
-#: src/common/util.c:1207
+#: ../src/common/util.c:1222
 msgid "Chad"
-msgstr "查德"
+msgstr "乍得"
 
-#: src/common/util.c:1208
+#: ../src/common/util.c:1223
 msgid "Internet Communication Services"
-msgstr ""
+msgstr "互联网通信服务"
 
-#: src/common/util.c:1209
+#: ../src/common/util.c:1224
 msgid "French Southern Territories"
-msgstr "法属南部地区"
+msgstr "法属南半球领地"
 
-#: src/common/util.c:1210
+#: ../src/common/util.c:1225
 msgid "Togo"
 msgstr "多哥"
 
-#: src/common/util.c:1211
+#: ../src/common/util.c:1226
 msgid "Thailand"
 msgstr "泰国"
 
-#: src/common/util.c:1212
+#: ../src/common/util.c:1227
 msgid "Tajikistan"
-msgstr "塔吉克"
+msgstr "塔吉克斯坦"
 
-#: src/common/util.c:1213
+#: ../src/common/util.c:1228
 msgid "Tokelau"
 msgstr "托克劳群岛"
 
-#: src/common/util.c:1214 src/common/util.c:1218
+#: ../src/common/util.c:1229 ../src/common/util.c:1233
 msgid "East Timor"
 msgstr "东帝汶"
 
-#: src/common/util.c:1215
+#: ../src/common/util.c:1230
 msgid "Turkmenistan"
-msgstr "土库曼"
+msgstr "土库曼斯坦"
 
-#: src/common/util.c:1216
+#: ../src/common/util.c:1231
 msgid "Tunisia"
-msgstr "突尼西亚"
+msgstr "突尼斯"
 
-#: src/common/util.c:1217
+#: ../src/common/util.c:1232
 msgid "Tonga"
-msgstr "东加"
+msgstr "汤加"
 
-#: src/common/util.c:1219
+#: ../src/common/util.c:1234
 msgid "Turkey"
 msgstr "土耳其"
 
-#: src/common/util.c:1220
+#: ../src/common/util.c:1235
 msgid "Travel and Tourism"
-msgstr ""
+msgstr "旅游和旅游业"
 
-#: src/common/util.c:1221
+#: ../src/common/util.c:1236
 msgid "Trinidad and Tobago"
-msgstr "千里达托贝哥"
+msgstr "特立尼达和多巴哥"
 
-#: src/common/util.c:1222
+#: ../src/common/util.c:1237
 msgid "Tuvalu"
-msgstr "吐瓦鲁"
+msgstr "图瓦卢"
 
-#: src/common/util.c:1223
+#: ../src/common/util.c:1238
 msgid "Taiwan"
-msgstr "中国台北"
+msgstr "中国台湾"
 
-#: src/common/util.c:1224
+#: ../src/common/util.c:1239
 msgid "Tanzania"
-msgstr "坦尚尼亚"
+msgstr "坦桑尼亚"
 
-#: src/common/util.c:1225
+#: ../src/common/util.c:1240
 msgid "Ukraine"
 msgstr "乌克兰"
 
-#: src/common/util.c:1226
+#: ../src/common/util.c:1241
 msgid "Uganda"
 msgstr "乌干达"
 
-#: src/common/util.c:1227
+#: ../src/common/util.c:1242
 msgid "United Kingdom"
 msgstr "英国"
 
-#: src/common/util.c:1228
+#: ../src/common/util.c:1243
 msgid "United States of America"
 msgstr "美国"
 
-#: src/common/util.c:1229
+#: ../src/common/util.c:1244
 msgid "Uruguay"
 msgstr "乌拉圭"
 
-#: src/common/util.c:1230
+#: ../src/common/util.c:1245
 msgid "Uzbekistan"
-msgstr "乌兹别克"
+msgstr "乌兹别克斯坦"
 
-#: src/common/util.c:1231
+#: ../src/common/util.c:1246
 msgid "Vatican City State"
 msgstr "梵蒂冈"
 
-#: src/common/util.c:1232
+#: ../src/common/util.c:1247
 msgid "St. Vincent and the Grenadines"
-msgstr "圣文森及格瑞那丁"
+msgstr "圣文森特和格林纳丁斯"
 
-#: src/common/util.c:1233
+#: ../src/common/util.c:1248
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
-#: src/common/util.c:1234
+#: ../src/common/util.c:1249
 msgid "British Virgin Islands"
-msgstr "英属维京群岛"
+msgstr "英属维尔京群岛"
 
-#: src/common/util.c:1235
+#: ../src/common/util.c:1250
 msgid "US Virgin Islands"
-msgstr "美属维京群岛"
+msgstr "美属维尔京群岛"
 
-#: src/common/util.c:1236
+#: ../src/common/util.c:1251
 msgid "Vietnam"
 msgstr "越南"
 
-#: src/common/util.c:1237
+#: ../src/common/util.c:1252
 msgid "Vanuatu"
-msgstr "万那杜"
+msgstr "瓦努阿图"
 
-#: src/common/util.c:1238
+#: ../src/common/util.c:1253
 msgid "Wallis and Futuna Islands"
-msgstr "瓦里斯及富都拿群岛"
+msgstr "瓦利斯和富图纳群岛"
 
-#: src/common/util.c:1239
+#: ../src/common/util.c:1254
 msgid "Samoa"
-msgstr "萨摩亚"
+msgstr "萨摩亚群岛"
 
-#: src/common/util.c:1240
+#: ../src/common/util.c:1255
 msgid "Adult Entertainment"
-msgstr ""
+msgstr "成人娱乐"
 
-#: src/common/util.c:1241
+#: ../src/common/util.c:1256
 msgid "Yemen"
-msgstr "叶门"
+msgstr "也门"
 
-#: src/common/util.c:1242
+#: ../src/common/util.c:1257
 msgid "Mayotte"
-msgstr "马尔他群岛"
+msgstr "马约特岛"
 
-#: src/common/util.c:1243
+#: ../src/common/util.c:1258
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: src/common/util.c:1244
+#: ../src/common/util.c:1259
 msgid "South Africa"
 msgstr "南非"
 
-#: src/common/util.c:1245
+#: ../src/common/util.c:1260
 msgid "Zambia"
-msgstr "尚比亚"
+msgstr "赞比亚"
 
-#: src/common/util.c:1246
+#: ../src/common/util.c:1261
 msgid "Zimbabwe"
-msgstr "辛巴威"
+msgstr "津巴布韦"
 
-#: src/common/util.c:1256 src/common/util.c:1266 src/fe-gtk/menu.c:610
-msgid "Unknown"
-msgstr "未知"
-
-#: src/common/dbus/dbus-client.c:74
+#: ../src/common/dbus/dbus-client.c:74
 msgid "Couldn't connect to session bus"
-msgstr "无法连接到会话总线"
+msgstr "无法连接到会话 bus"
 
-#: src/common/dbus/dbus-client.c:88
+#: ../src/common/dbus/dbus-client.c:88
 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:114 ../src/common/dbus/dbus-client.c:128
 msgid "Failed to complete Command"
 msgstr "完成命令失败"
 
-#: src/common/dbus/dbus-plugin.c:30
+#: ../src/common/dbus/dbus-plugin.c:30
 msgid "remote access"
 msgstr "远程访问"
 
-#: src/common/dbus/dbus-plugin.c:31
+#: ../src/common/dbus/dbus-plugin.c:31
 msgid "plugin for remote access using DBUS"
 msgstr "用 DBUS 远程访问的插件"
 
-#: src/common/dbus/dbus-plugin.c:897
+#: ../src/common/dbus/dbus-plugin.c:897
 #, c-format
 msgid "Couldn't connect to session bus: %s\n"
-msgstr "无法连接到会话总线:%s\n"
+msgstr "无法连接到会话 bus:%s\n"
 
-#: src/common/dbus/dbus-plugin.c:914
+#: ../src/common/dbus/dbus-plugin.c:914
 #, c-format
 msgid "Failed to acquire %s: %s\n"
 msgstr "获取 %s 失败:%s\n"
 
-#: src/fe-gtk/ascii.c:126
+#: ../src/fe-gtk/ascii.c:126
 msgid "Character Chart"
-msgstr "特殊字符"
+msgstr "字符集表"
 
-#: src/fe-gtk/banlist.c:49
+#: ../src/fe-gtk/banlist.c:49
 msgid "Bans"
 msgstr "屏蔽"
 
-#: src/fe-gtk/banlist.c:58
+#: ../src/fe-gtk/banlist.c:58
 msgid "Exempts"
-msgstr ""
+msgstr "免封"
 
-#: src/fe-gtk/banlist.c:59
+#: ../src/fe-gtk/banlist.c:59
 msgid "Exempt"
-msgstr ""
+msgstr "免封"
 
-#: src/fe-gtk/banlist.c:67
+#: ../src/fe-gtk/banlist.c:67
 msgid "Invites"
-msgstr ""
+msgstr "邀请"
 
-#: src/fe-gtk/banlist.c:68 src/fe-gtk/ignoregui.c:164
+#: ../src/fe-gtk/banlist.c:68 ../src/fe-gtk/ignoregui.c:164
 msgid "Invite"
 msgstr "邀请"
 
-#: src/fe-gtk/banlist.c:76
+#: ../src/fe-gtk/banlist.c:76
 msgid "Quiets"
-msgstr ""
+msgstr "静默"
 
-#: src/fe-gtk/banlist.c:77
+#: ../src/fe-gtk/banlist.c:77
 msgid "Quiet"
-msgstr ""
+msgstr "静默"
 
-#: src/fe-gtk/banlist.c:346 src/fe-gtk/banlist.c:380
+#. poor way to get which is selected but it works
+#: ../src/fe-gtk/banlist.c:351 ../src/fe-gtk/banlist.c:385
 msgid "Copy mask"
-msgstr ""
+msgstr "复制掩码"
 
-#: src/fe-gtk/banlist.c:349
+#: ../src/fe-gtk/banlist.c:354
 #, c-format
 msgid "%s on %s by %s"
-msgstr ""
+msgstr "%s 在 %s 由 %s"
 
-#: src/fe-gtk/banlist.c:381
+#: ../src/fe-gtk/banlist.c:386
 msgid "Copy entry"
-msgstr ""
+msgstr "复制项"
 
-#: src/fe-gtk/banlist.c:454 src/fe-gtk/chanlist.c:294
-#: src/fe-gtk/plugin-tray.c:267
+#: ../src/fe-gtk/banlist.c:459 ../src/fe-gtk/chanlist.c:292
+#: ../src/fe-gtk/plugin-tray.c:267
 msgid "Not connected."
 msgstr "未连接。"
 
-#: src/fe-gtk/banlist.c:533 src/fe-gtk/banlist.c:616
+#: ../src/fe-gtk/banlist.c:538 ../src/fe-gtk/banlist.c:621
 msgid "You must select some bans."
-msgstr "您必须选择一些被屏蔽。"
+msgstr "您必须选择一项来屏蔽。"
 
-#: src/fe-gtk/banlist.c:563
+#: ../src/fe-gtk/banlist.c:568
 #, c-format
 msgid "Are you sure you want to remove all listed items in %s?"
-msgstr ""
+msgstr "您确定要删除 %s 中的全部屏蔽吗?"
 
-#: src/fe-gtk/banlist.c:721
+#: ../src/fe-gtk/banlist.c:726
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
-#: src/fe-gtk/banlist.c:722 src/fe-gtk/ignoregui.c:158
+#: ../src/fe-gtk/banlist.c:727 ../src/fe-gtk/ignoregui.c:158
 msgid "Mask"
 msgstr "掩码"
 
-#: src/fe-gtk/banlist.c:723
+#: ../src/fe-gtk/banlist.c:728
 msgid "From"
 msgstr "来自"
 
-#: src/fe-gtk/banlist.c:724
+#: ../src/fe-gtk/banlist.c:729
 msgid "Date"
 msgstr "日期"
 
-#: src/fe-gtk/banlist.c:780
+#: ../src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
 msgstr "您只能在一个频道的标签页下打开屏蔽列表窗口。"
 
-#: src/fe-gtk/banlist.c:789
+#: ../src/fe-gtk/banlist.c:794
 msgid "Banlist initialization failed."
-msgstr ""
+msgstr "屏蔽列表初始化失败。"
 
-#: src/fe-gtk/banlist.c:808
+#: ../src/fe-gtk/banlist.c:813
 #, c-format
 msgid ": Ban List (%s)"
 msgstr ":屏蔽列表(%s)"
 
-#: src/fe-gtk/banlist.c:843 src/fe-gtk/notifygui.c:425
+#: ../src/fe-gtk/banlist.c:848 ../src/fe-gtk/notifygui.c:425
 msgid "Remove"
 msgstr "删除"
 
-#: src/fe-gtk/banlist.c:845
+#: ../src/fe-gtk/banlist.c:850
 msgid "Crop"
-msgstr "剪切"
+msgstr "裁剪"
 
-#: src/fe-gtk/banlist.c:849
+#: ../src/fe-gtk/banlist.c:854
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/fe-gtk/chanlist.c:100
+#: ../src/fe-gtk/chanlist.c:98
 #, c-format
 msgid "Displaying %d/%d users on %d/%d channels."
 msgstr "显示在 %3$d/%4$d 个频道中的 %1$d/%2$d 用户。"
 
-#: src/fe-gtk/chanlist.c:515 src/fe-gtk/menu.c:1313 src/fe-gtk/urlgrab.c:148
+#: ../src/fe-gtk/chanlist.c:515 ../src/fe-gtk/menu.c:1346
+#: ../src/fe-gtk/urlgrab.c:148
 msgid "Select an output filename"
 msgstr "选择输出文件名"
 
-#: src/fe-gtk/chanlist.c:624 src/fe-gtk/chanlist.c:809
+#: ../src/fe-gtk/chanlist.c:624 ../src/fe-gtk/chanlist.c:812
 msgid "_Join Channel"
 msgstr "进入频道(_J)"
 
-#: src/fe-gtk/chanlist.c:626
+#: ../src/fe-gtk/chanlist.c:626
 msgid "_Copy Channel Name"
 msgstr "复制频道名称(_C)"
 
-#: src/fe-gtk/chanlist.c:628
+#: ../src/fe-gtk/chanlist.c:628
 msgid "Copy _Topic Text"
 msgstr "复制频道主题(_T)"
 
-#: src/fe-gtk/chanlist.c:717
+#: ../src/fe-gtk/chanlist.c:720
 #, c-format
 msgid ": Channel List (%s)"
 msgstr ":频道列表(%s)"
 
-#: src/fe-gtk/chanlist.c:791
+#: ../src/fe-gtk/chanlist.c:794
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: src/fe-gtk/chanlist.c:797
+#: ../src/fe-gtk/chanlist.c:800
 msgid "_Download List"
 msgstr "下载列表(_D)"
 
-#: src/fe-gtk/chanlist.c:803
+#: ../src/fe-gtk/chanlist.c:806
 msgid "Save _List..."
 msgstr "保存列表(_L)..."
 
-#: src/fe-gtk/chanlist.c:816
+#. =============================================================
+#: ../src/fe-gtk/chanlist.c:819
 msgid "Show only:"
 msgstr "只显示:"
 
-#: src/fe-gtk/chanlist.c:828
+#: ../src/fe-gtk/chanlist.c:831
 msgid "channels with"
-msgstr "有"
+msgstr "频道中有"
 
-#: src/fe-gtk/chanlist.c:841
+#: ../src/fe-gtk/chanlist.c:844
 msgid "to"
 msgstr "到"
 
-#: src/fe-gtk/chanlist.c:853
+#: ../src/fe-gtk/chanlist.c:856
 msgid "users."
-msgstr "位用户的频道。"
+msgstr "位用户。"
 
-#: src/fe-gtk/chanlist.c:859
+#. =============================================================
+#: ../src/fe-gtk/chanlist.c:862
 msgid "Look in:"
 msgstr "按照:"
 
-#: src/fe-gtk/chanlist.c:871
+#: ../src/fe-gtk/chanlist.c:874
 msgid "Channel name"
 msgstr "频道名称"
 
-#: src/fe-gtk/chanlist.c:892
+#. =============================================================
+#: ../src/fe-gtk/chanlist.c:894
 msgid "Search type:"
 msgstr "搜索类型:"
 
-#: src/fe-gtk/chanlist.c:899
+#: ../src/fe-gtk/chanlist.c:901
 msgid "Simple Search"
 msgstr "简单搜索"
 
-#: src/fe-gtk/chanlist.c:900
+#: ../src/fe-gtk/chanlist.c:902
 msgid "Pattern Match (Wildcards)"
-msgstr "模式匹配(通配符)"
+msgstr "模式匹配 (通配符)"
 
-#: src/fe-gtk/chanlist.c:902
+#: ../src/fe-gtk/chanlist.c:903
 msgid "Regular Expression"
 msgstr "正则表达式"
 
-#: src/fe-gtk/chanlist.c:913
+#. =============================================================
+#: ../src/fe-gtk/chanlist.c:913 ../src/fe-gtk/maingui.c:2918
 msgid "Find:"
 msgstr "查找:"
 
-#: src/fe-gtk/dccgui.c:152
+#: ../src/fe-gtk/dccgui.c:150
 #, c-format
 msgid "Send file to %s"
 msgstr "给 %s 发送文件"
 
-#: src/fe-gtk/dccgui.c:528
+#. unknown error
+#: ../src/fe-gtk/dccgui.c:526
 msgid "That file is not resumable."
 msgstr "该文件不可续传。"
 
-#: src/fe-gtk/dccgui.c:532
+#: ../src/fe-gtk/dccgui.c:530
 #, c-format
 msgid ""
 "Cannot access file: %s\n"
@@ -3183,182 +3285,152 @@ msgid ""
 "Resuming not possible."
 msgstr "不能访问文件:%s\n%s。\n无法续传。"
 
-#: src/fe-gtk/dccgui.c:539
+#: ../src/fe-gtk/dccgui.c:537
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr "下载目录中的文件比提供的文件大,无法续传。"
+msgstr "下载目录中的文件比所提供的文件大,无法续传。"
 
-#: src/fe-gtk/dccgui.c:543
+#: ../src/fe-gtk/dccgui.c:541
 msgid "Cannot resume the same file from two people."
-msgstr "不能从两人处续传同一文件"
+msgstr "不能续传来自两个人的同一文件"
 
-#: src/fe-gtk/dccgui.c:800
+#: ../src/fe-gtk/dccgui.c:798
 msgid ": Uploads and Downloads"
 msgstr ":文件传输列表"
 
-#: src/fe-gtk/dccgui.c:817 src/fe-gtk/dccgui.c:1058 src/fe-gtk/notifygui.c:124
+#: ../src/fe-gtk/dccgui.c:815 ../src/fe-gtk/dccgui.c:1056
+#: ../src/fe-gtk/notifygui.c:124
 msgid "Status"
 msgstr "状态"
 
-#: src/fe-gtk/dccgui.c:818 src/fe-gtk/plugingui.c:65
+#: ../src/fe-gtk/dccgui.c:816 ../src/fe-gtk/plugingui.c:65
 msgid "File"
 msgstr "文件"
 
-#: src/fe-gtk/dccgui.c:823
+#: ../src/fe-gtk/dccgui.c:821
 msgid "ETA"
 msgstr "剩余时间"
 
-#: src/fe-gtk/dccgui.c:848 src/fe-gtk/menu.c:1745 src/fe-gtk/setup.c:238
+#: ../src/fe-gtk/dccgui.c:846 ../src/fe-gtk/menu.c:1782
+#: ../src/fe-gtk/setup.c:215
 msgid "Both"
 msgstr "两者"
 
-#: src/fe-gtk/dccgui.c:854
+#: ../src/fe-gtk/dccgui.c:852
 msgid "Uploads"
 msgstr "上传"
 
-#: src/fe-gtk/dccgui.c:860
+#: ../src/fe-gtk/dccgui.c:858
 msgid "Downloads"
 msgstr "下载"
 
-#: src/fe-gtk/dccgui.c:865
+#: ../src/fe-gtk/dccgui.c:863
 msgid "Details"
 msgstr "详细信息"
 
-#: src/fe-gtk/dccgui.c:876
+#: ../src/fe-gtk/dccgui.c:874
 msgid "File:"
 msgstr "文件:"
 
-#: src/fe-gtk/dccgui.c:877
+#: ../src/fe-gtk/dccgui.c:875
 msgid "Address:"
 msgstr "地址:"
 
-#: src/fe-gtk/dccgui.c:883 src/fe-gtk/dccgui.c:1082
+#: ../src/fe-gtk/dccgui.c:881 ../src/fe-gtk/dccgui.c:1080
 msgid "Abort"
 msgstr "中止"
 
-#: src/fe-gtk/dccgui.c:884 src/fe-gtk/dccgui.c:1083
+#: ../src/fe-gtk/dccgui.c:882 ../src/fe-gtk/dccgui.c:1081
 msgid "Accept"
 msgstr "接受"
 
-#: src/fe-gtk/dccgui.c:885
+#: ../src/fe-gtk/dccgui.c:883
 msgid "Resume"
 msgstr "续传"
 
-#: src/fe-gtk/dccgui.c:887
+#: ../src/fe-gtk/dccgui.c:885
 msgid "Open Folder..."
 msgstr "打开目录..."
 
-#: src/fe-gtk/dccgui.c:1047
+#: ../src/fe-gtk/dccgui.c:1045
 msgid ": DCC Chat List"
 msgstr ":DCC 直连聊天列表"
 
-#: src/fe-gtk/dccgui.c:1060
+#: ../src/fe-gtk/dccgui.c:1058
 msgid "Recv"
 msgstr "已接收"
 
-#: src/fe-gtk/dccgui.c:1061
+#: ../src/fe-gtk/dccgui.c:1059
 msgid "Sent"
 msgstr "已发送"
 
-#: src/fe-gtk/dccgui.c:1062
+#: ../src/fe-gtk/dccgui.c:1060
 msgid "Start Time"
 msgstr "开始时间"
 
-#: src/fe-gtk/editlist.c:139
-msgid "*NEW*"
-msgstr "*添加*"
-
-#: src/fe-gtk/editlist.c:140
-msgid "EDIT ME"
-msgstr "编辑"
-
-#: src/fe-gtk/editlist.c:310 src/fe-gtk/notifygui.c:123
-#: src/fe-gtk/plugingui.c:63
-msgid "Name"
-msgstr "名称"
-
-#: src/fe-gtk/editlist.c:311
-msgid "Command"
-msgstr "命令"
-
-#: src/fe-gtk/editlist.c:339
-msgid "Move Up"
-msgstr "上移"
+#: ../src/fe-gtk/editlist.c:358 ../src/fe-gtk/fkeys.c:826
+msgid "Add"
+msgstr "添加"
 
-#: src/fe-gtk/editlist.c:343
-msgid "Move Dn"
-msgstr "下移"
+#: ../src/fe-gtk/editlist.c:360 ../src/fe-gtk/fkeys.c:828
+#: ../src/fe-gtk/ignoregui.c:383
+msgid "Delete"
+msgstr "删除"
 
-#: src/fe-gtk/editlist.c:351
+#: ../src/fe-gtk/editlist.c:362 ../src/fe-gtk/fkeys.c:830
 msgid "Cancel"
 msgstr "取消"
 
-#: src/fe-gtk/editlist.c:355
+#: ../src/fe-gtk/editlist.c:364 ../src/fe-gtk/fkeys.c:832
 msgid "Save"
 msgstr "保存"
 
-#: src/fe-gtk/editlist.c:363 src/fe-gtk/fkeys.c:754
-msgid "Add New"
-msgstr "添加"
-
-#: src/fe-gtk/editlist.c:367 src/fe-gtk/fkeys.c:759 src/fe-gtk/ignoregui.c:383
-msgid "Delete"
-msgstr "删除"
-
-#: src/fe-gtk/editlist.c:375
-msgid "Sort"
-msgstr "排序"
-
-#: src/fe-gtk/editlist.c:379
-msgid "Help"
-msgstr "帮助"
-
-#: src/fe-gtk/fe-gtk.c:122
+#: ../src/fe-gtk/fe-gtk.c:80
 msgid "Don't auto connect to servers"
 msgstr "不要自动连接到服务器"
 
-#: src/fe-gtk/fe-gtk.c:123
+#: ../src/fe-gtk/fe-gtk.c:81
 msgid "Use a different config directory"
-msgstr "使用不同的设置目录"
+msgstr "使用不同的配置目录"
 
-#: src/fe-gtk/fe-gtk.c:124
+#: ../src/fe-gtk/fe-gtk.c:82
 msgid "Don't auto load any plugins"
 msgstr "不自动载入任何插件"
 
-#: src/fe-gtk/fe-gtk.c:125
+#: ../src/fe-gtk/fe-gtk.c:83
 msgid "Show plugin/script auto-load directory"
-msgstr ""
+msgstr "显示自动载入插件/脚本的目录"
 
-#: src/fe-gtk/fe-gtk.c:126
+#: ../src/fe-gtk/fe-gtk.c:84
 msgid "Show user config directory"
-msgstr "显示用户设置目录"
+msgstr "显示用户配置目录"
 
-#: src/fe-gtk/fe-gtk.c:127 src/fe-gtk/fe-gtk.c:134
+#: ../src/fe-gtk/fe-gtk.c:85 ../src/fe-gtk/fe-gtk.c:92
 msgid "Open an irc://server:port/channel?key URL"
-msgstr ""
+msgstr "打开一个 irc://server:port/channel?key URL"
 
-#: src/fe-gtk/fe-gtk.c:129 src/fe-gtk/setup.c:290
+#: ../src/fe-gtk/fe-gtk.c:86 ../src/fe-gtk/setup.c:267
 msgid "Execute command:"
 msgstr "执行命令:"
 
-#: src/fe-gtk/fe-gtk.c:130
+#: ../src/fe-gtk/fe-gtk.c:88
 msgid "Open URL or execute command in an existing HexChat"
-msgstr ""
+msgstr "在已有的 HexChat 中打开 URL 或执行命令"
 
-#: src/fe-gtk/fe-gtk.c:132
+#: ../src/fe-gtk/fe-gtk.c:90
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr "启动后最小化。级别 0=正常 1=仅图标 2=托盘"
+msgstr "启动后最小化。最小化级别 0=正常 1=仅图标 2=托盘"
 
-#: src/fe-gtk/fe-gtk.c:132
+#: ../src/fe-gtk/fe-gtk.c:90
 msgid "level"
 msgstr "级别"
 
-#: src/fe-gtk/fe-gtk.c:133
+#: ../src/fe-gtk/fe-gtk.c:91
 msgid "Show version information"
 msgstr "显示版本信息"
 
-#: src/fe-gtk/fe-gtk.c:315
+#: ../src/fe-gtk/fe-gtk.c:268
 #, c-format
 msgid ""
 "Failed to open font:\n"
@@ -3366,21 +3438,21 @@ msgid ""
 "%s"
 msgstr "打开字体失败:\n\n%s"
 
-#: src/fe-gtk/fe-gtk.c:720
+#: ../src/fe-gtk/fe-gtk.c:683
 msgid "Search buffer is empty.\n"
 msgstr "搜索缓冲区当前为空。\n"
 
-#: src/fe-gtk/fe-gtk.c:833
+#: ../src/fe-gtk/fe-gtk.c:796
 #, c-format
 msgid "%d bytes"
 msgstr "%d 字节"
 
-#: src/fe-gtk/fe-gtk.c:834
+#: ../src/fe-gtk/fe-gtk.c:797
 #, c-format
 msgid "Network send queue: %d bytes"
 msgstr "网络发送队列:%d 字节"
 
-#: src/fe-gtk/fkeys.c:145
+#: ../src/fe-gtk/fkeys.c:141
 msgid ""
 "The Run Command action runs the data in Data 1 as if it had been typed "
 "into the entry box where you pressed the key sequence. Thus it can contain "
@@ -3388,9 +3460,9 @@ msgid ""
 "When run all \\n characters in Data 1 are used to deliminate separate "
 "commands so it is possible to run more than one command. If you want a \\ "
 "in the actual text run then enter \\\\"
-msgstr ""
+msgstr "“Run Command” 会执行 Data 1 中的数据,就如同您是在输入按键序列后出现的输入框中键入这些数据一样。这样,它就会包含文本 (这些文本会被发送给频道或某人)、命令或用户命令。执行时,Data 1 中所有“\\n”字符 被用来分隔命令,因此您可以执行不止一个命令。如果您想在执行的文本中包含字符“\\”,您应该输入“\\\\”"
 
-#: src/fe-gtk/fkeys.c:147
+#: ../src/fe-gtk/fkeys.c:143
 msgid ""
 "The Change Page command switches between pages in the notebook. Set Data 1"
 " to the page you want to switch to. If Data 2 is set to anything then the "
@@ -3398,549 +3470,548 @@ 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 ""
+msgstr "“Change Page”命令在您的笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签页。如果 Data 2 被设置成任意值,切换标签页的数将相对于当前位置。Data 1 设置为自动将自动切换到切换到最近最重要的活动中(优先处理最近请求,其次显示频道,再次显示有对话的频道,最后显示其他 data 的频道)"
 
-#: src/fe-gtk/fkeys.c:149
+#: ../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:151
+#: ../src/fe-gtk/fkeys.c:147
 msgid ""
 "The Scroll Page command scrolls the text widget up or down one page or one"
 " line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
-msgstr ""
+msgstr "“Scroll Page” 命令在文本窗口组件中上下滚动一页或一行。设置 Data 1 为 Top、Bottom、Up、DOWN、+1 或 -1。"
 
-#: src/fe-gtk/fkeys.c:153
+#: ../src/fe-gtk/fkeys.c:149
 msgid ""
 "The Set Buffer command sets the entry where the key sequence was entered "
 "to the contents of Data 1"
-msgstr "“Set Buffer”命令把接受按键序列后的输入格设置成数据 1 中的内容"
+msgstr "“Set Buffer” 命令把接收到按键序列后的输入区域设置为数据 1 中的内容"
 
-#: src/fe-gtk/fkeys.c:155
+#: ../src/fe-gtk/fkeys.c:151
 msgid ""
 "The Last Command command sets the entry to contain the last command "
 "entered - the same as pressing up in a shell"
-msgstr "“Last Command”命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
+msgstr "“Last Command” 命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
 
-#: src/fe-gtk/fkeys.c:157
+#: ../src/fe-gtk/fkeys.c:153
 msgid ""
 "The Next Command command sets the entry to contain the next command "
 "entered - the same as pressing down in a shell"
-msgstr "“Next Command”命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
+msgstr "“Next Command” 命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
 
-#: src/fe-gtk/fkeys.c:159
+#: ../src/fe-gtk/fkeys.c:155
 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:161
+#: ../src/fe-gtk/fkeys.c:157
 msgid ""
 "This command scrolls up and down through the list of nicks. If Data 1 is set"
 " to anything it will scroll up, else it scrolls down"
-msgstr "该命令在昵称列表中上下移动。如果数据 1 被设置成任意值,它会上移,否则下移"
+msgstr "该命令在昵称列表中上下移动。如果数据 1 中设置了任何值,光标会上移,否则下移"
 
-#: src/fe-gtk/fkeys.c:163
+#: ../src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr "该命令对照替换列表来检查输入的最后一词,若找到符合者就代替它"
+msgstr "该命令对照替换列表来检查输入的最后一个词,若找到符合的条目就替换它"
 
-#: src/fe-gtk/fkeys.c:165
+#: ../src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
 msgstr "该命令把最上面的标签页向左移一格"
 
-#: src/fe-gtk/fkeys.c:167
+#: ../src/fe-gtk/fkeys.c:163
 msgid "This command moves the front tab right by one"
 msgstr "该命令把最上面的标签页向右移一格"
 
-#: src/fe-gtk/fkeys.c:169
+#: ../src/fe-gtk/fkeys.c:165
 msgid "This command moves the current tab family to the left"
 msgstr "该命令把当前标签页向左移一格"
 
-#: src/fe-gtk/fkeys.c:171
+#: ../src/fe-gtk/fkeys.c:167
 msgid "This command moves the current tab family to the right"
 msgstr "该命令把当前标签页向右移一格"
 
-#: src/fe-gtk/fkeys.c:173
+#: ../src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
 msgstr "把输入存入历史,但不发送到服务器"
 
-#: src/fe-gtk/fkeys.c:184
+#: ../src/fe-gtk/fkeys.c:216
 msgid "There was an error loading key bindings configuration"
-msgstr "载入键盘映射配置时出错"
+msgstr "加载键绑定配置时出错"
 
-#: src/fe-gtk/fkeys.c:439 src/fe-gtk/fkeys.c:440 src/fe-gtk/fkeys.c:441
-#: src/fe-gtk/fkeys.c:442 src/fe-gtk/fkeys.c:732 src/fe-gtk/fkeys.c:738
-#: src/fe-gtk/fkeys.c:743 src/fe-gtk/maingui.c:1598 src/fe-gtk/maingui.c:1717
-#: src/fe-gtk/maingui.c:3247
-msgid "<none>"
-msgstr "<无>"
-
-#: src/fe-gtk/fkeys.c:696
-msgid "Mod"
-msgstr "修饰键"
+#: ../src/fe-gtk/fkeys.c:540
+msgid "Select a row to get help information on its Action."
+msgstr "选择一行查看对应动作的信息。"
 
-#: src/fe-gtk/fkeys.c:697 src/fe-gtk/fkeys.c:792
-msgid "Key"
-msgstr "按键"
-
-#: src/fe-gtk/fkeys.c:698
-msgid "Action"
-msgstr "动作"
-
-#: src/fe-gtk/fkeys.c:707
+#: ../src/fe-gtk/fkeys.c:809
 msgid ": Keyboard Shortcuts"
 msgstr ":键盘快捷键"
 
-#: src/fe-gtk/fkeys.c:785
-msgid "Shift"
-msgstr "Shift"
-
-#: src/fe-gtk/fkeys.c:787
-msgid "Alt"
-msgstr "Alt"
-
-#: src/fe-gtk/fkeys.c:789
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: src/fe-gtk/fkeys.c:796
-msgid "Data 1"
-msgstr "数据 1"
-
-#: src/fe-gtk/fkeys.c:799
-msgid "Data 2"
-msgstr "数据 2"
-
-#: src/fe-gtk/fkeys.c:841
-msgid "Error opening keys config file\n"
-msgstr "打开按键配置文件时出错\n"
-
-#: src/fe-gtk/fkeys.c:1008
-#, c-format
-msgid ""
-"Unknown keyname %s in key bindings config file\n"
-"Load aborted, please fix %s"
-msgstr ""
-
-#: src/fe-gtk/fkeys.c:1046
-#, c-format
-msgid ""
-"Unknown action %s in key bindings config file\n"
-"Load aborted, Please fix %s"
-msgstr ""
-
-#: src/fe-gtk/fkeys.c:1067
-#, c-format
-msgid ""
-"Expecting Data line (beginning Dx{:|!}) but got:\n"
-"%s\n"
-"\n"
-"Load aborted, Please fix %s"
-msgstr ""
-
-#: src/fe-gtk/fkeys.c:1136
-#, c-format
-msgid ""
-"Key bindings config file is corrupt, load aborted\n"
-"Please fix %s"
-msgstr ""
-
-#: src/fe-gtk/gtkutil.c:118
+#: ../src/fe-gtk/gtkutil.c:108
 msgid "Cannot write to that file."
-msgstr "无法写入该文件。"
+msgstr "无法写入到该文件。"
 
-#: src/fe-gtk/gtkutil.c:120
+#: ../src/fe-gtk/gtkutil.c:110
 msgid "Cannot read that file."
 msgstr "无法读取该文件。"
 
-#: src/fe-gtk/ignoregui.c:100 src/fe-gtk/ignoregui.c:243
+#. duplicate, ignore
+#: ../src/fe-gtk/ignoregui.c:100 ../src/fe-gtk/ignoregui.c:243
 msgid "That mask already exists."
 msgstr "该掩码已存在。"
 
-#: src/fe-gtk/ignoregui.c:160 src/fe-gtk/maingui.c:2098
+#: ../src/fe-gtk/ignoregui.c:160
 msgid "Private"
 msgstr "私聊"
 
-#: src/fe-gtk/ignoregui.c:161
+#: ../src/fe-gtk/ignoregui.c:161
 msgid "Notice"
 msgstr "通知"
 
-#: src/fe-gtk/ignoregui.c:162
+#: ../src/fe-gtk/ignoregui.c:162
 msgid "CTCP"
 msgstr "CTCP"
 
-#: src/fe-gtk/ignoregui.c:163
+#: ../src/fe-gtk/ignoregui.c:163
 msgid "DCC"
 msgstr "DCC"
 
-#: src/fe-gtk/ignoregui.c:165
+#: ../src/fe-gtk/ignoregui.c:165
 msgid "Unignore"
 msgstr "取消忽略"
 
-#: src/fe-gtk/ignoregui.c:293
+#: ../src/fe-gtk/ignoregui.c:293
 msgid "Are you sure you want to remove all ignores?"
-msgstr ""
+msgstr "您确定要删除 %s 中的全部忽略项吗?"
 
-#: src/fe-gtk/ignoregui.c:303
+#: ../src/fe-gtk/ignoregui.c:303
 msgid "Enter mask to ignore:"
 msgstr "输入要忽略的掩码:"
 
-#: src/fe-gtk/ignoregui.c:350
+#: ../src/fe-gtk/ignoregui.c:350
 msgid ": Ignore list"
 msgstr ":忽略列表"
 
-#: src/fe-gtk/ignoregui.c:358
+#: ../src/fe-gtk/ignoregui.c:358
 msgid "Ignore Stats:"
 msgstr "忽略统计:"
 
-#: src/fe-gtk/ignoregui.c:366
+#: ../src/fe-gtk/ignoregui.c:366
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/fe-gtk/ignoregui.c:367
+#: ../src/fe-gtk/ignoregui.c:367
 msgid "Private:"
 msgstr "私聊:"
 
-#: src/fe-gtk/ignoregui.c:368
+#: ../src/fe-gtk/ignoregui.c:368
 msgid "Notice:"
 msgstr "通知:"
 
-#: src/fe-gtk/ignoregui.c:369
+#: ../src/fe-gtk/ignoregui.c:369
 msgid "CTCP:"
 msgstr "CTCP:"
 
-#: src/fe-gtk/ignoregui.c:370
+#: ../src/fe-gtk/ignoregui.c:370
 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:421
 msgid "Add..."
 msgstr "添加..."
 
-#: src/fe-gtk/joind.c:91
+#: ../src/fe-gtk/joind.c:91
 msgid "Channel name too short, try again."
-msgstr "频道名称过短,请重新尝试"
+msgstr "频道名称过短,请重新尝试。"
 
-#: src/fe-gtk/joind.c:133
+#: ../src/fe-gtk/joind.c:133
 msgid ": Connection Complete"
 msgstr ":连接完毕"
 
-#: src/fe-gtk/joind.c:158
+#: ../src/fe-gtk/joind.c:161
 #, c-format
 msgid "Connection to %s complete."
 msgstr "成功建立到 %s 的连接"
 
-#: src/fe-gtk/joind.c:167
+#: ../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 "在服务器列表窗口,没有添加自动进入的频道名称"
 
-#: src/fe-gtk/joind.c:173
+#: ../src/fe-gtk/joind.c:176
 msgid "What would you like to do next?"
 msgstr "您接下来要进行怎样的操作?"
 
-#: src/fe-gtk/joind.c:178
+#: ../src/fe-gtk/joind.c:181
 msgid "_Nothing, I'll join a channel later."
 msgstr "我稍后自行进入频道。(_N)"
 
-#: src/fe-gtk/joind.c:187
+#: ../src/fe-gtk/joind.c:190
 msgid "_Join this channel:"
 msgstr "进入以下频道(_J):"
 
-#: src/fe-gtk/joind.c:199
+#: ../src/fe-gtk/joind.c:202
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr "如果您知道想要进入的频道的名称,请在这里输入。"
+msgstr "如果您知道想要进入的频道的名称,请在此输入。"
 
-#: src/fe-gtk/joind.c:206
+#: ../src/fe-gtk/joind.c:209
 msgid "O_pen the Channel-List window."
 msgstr "打开频道列表窗口(_P):"
 
-#: src/fe-gtk/joind.c:213
+#: ../src/fe-gtk/joind.c:216
 msgid "Retrieving the Channel-List may take a minute or two."
-msgstr "检索频道列表可能需要一两分钟。"
+msgstr "取回频道列表可能需要一两分钟。"
 
-#: src/fe-gtk/joind.c:220
+#: ../src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
 msgstr "每次连接后都显示该对话框。(_A)"
 
-#: src/fe-gtk/maingui.c:437
+#: ../src/fe-gtk/maingui.c:397
 msgid "Dialog with"
 msgstr "与以下用户对话:"
 
-#: src/fe-gtk/maingui.c:736
+#: ../src/fe-gtk/maingui.c:695
 #, c-format
 msgid "Topic for %s is: %s"
 msgstr "%s 的主题:%s"
 
-#: src/fe-gtk/maingui.c:741
+#: ../src/fe-gtk/maingui.c:700
 msgid "No topic is set"
 msgstr "没有设置主题"
 
-#: src/fe-gtk/maingui.c:1130
+#: ../src/fe-gtk/maingui.c:1102
 #, c-format
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
 msgstr "这台服务器仍然有 %d 个与它相关的频道或对话。要全部关闭吗?"
 
-#: src/fe-gtk/maingui.c:1231
+#: ../src/fe-gtk/maingui.c:1203
 msgid "Quit HexChat?"
-msgstr ""
+msgstr "要退出 HexChat 吗?"
 
-#: src/fe-gtk/maingui.c:1252
+#: ../src/fe-gtk/maingui.c:1223
 msgid "Don't ask next time."
 msgstr "下次不再询问。"
 
-#: src/fe-gtk/maingui.c:1258
+#: ../src/fe-gtk/maingui.c:1229
 #, c-format
 msgid "You are connected to %i IRC networks."
 msgstr "您已连接到 %i 个 IRC 网络。"
 
-#: src/fe-gtk/maingui.c:1260
+#: ../src/fe-gtk/maingui.c:1231
 msgid "Are you sure you want to quit?"
 msgstr "您确定要退出吗?"
 
-#: src/fe-gtk/maingui.c:1262
+#: ../src/fe-gtk/maingui.c:1233
 msgid "Some file transfers are still active."
-msgstr "某些文件传输仍在进行."
+msgstr "某些文件传输仍在进行。"
 
-#: src/fe-gtk/maingui.c:1280
+#: ../src/fe-gtk/maingui.c:1251
 msgid "_Minimize to Tray"
 msgstr "最小化至系统托盘(_M)"
 
-#: src/fe-gtk/maingui.c:1500
+#: ../src/fe-gtk/maingui.c:1471
 msgid "Insert Attribute or Color Code"
 msgstr "插入属性或颜色代码"
 
-#: src/fe-gtk/maingui.c:1502
+#: ../src/fe-gtk/maingui.c:1473
 msgid "<b>Bold</b>"
 msgstr "<b>粗体</b>"
 
-#: src/fe-gtk/maingui.c:1503
+#: ../src/fe-gtk/maingui.c:1474
 msgid "<u>Underline</u>"
-msgstr "<u>底线</u>"
+msgstr "<u>下划线</u>"
 
-#: src/fe-gtk/maingui.c:1505
+#: ../src/fe-gtk/maingui.c:1475
+msgid "<i>Italic</i>"
+msgstr "<i>斜体</i>"
+
+#: ../src/fe-gtk/maingui.c:1476
 msgid "Normal"
 msgstr "正常"
 
-#: src/fe-gtk/maingui.c:1507
+#: ../src/fe-gtk/maingui.c:1478
 msgid "Colors 0-7"
 msgstr "颜色 0-7"
 
-#: src/fe-gtk/maingui.c:1517
+#: ../src/fe-gtk/maingui.c:1488
 msgid "Colors 8-15"
 msgstr "颜色 8-15"
 
-#: src/fe-gtk/maingui.c:1563
+#: ../src/fe-gtk/maingui.c:1534
 msgid "_Settings"
 msgstr "设置(_S)"
 
-#: src/fe-gtk/maingui.c:1565
+#: ../src/fe-gtk/maingui.c:1536
 msgid "_Log to Disk"
-msgstr "记录聊天日志到磁盘(_L)"
+msgstr "聊天记录写入磁盘(_L)"
 
-#: src/fe-gtk/maingui.c:1566
+#: ../src/fe-gtk/maingui.c:1537
 msgid "_Reload Scrollback"
 msgstr "重新载入最近日志(_R)"
 
-#: src/fe-gtk/maingui.c:1569
+#: ../src/fe-gtk/maingui.c:1540
 msgid "Strip _Colors"
-msgstr ""
+msgstr "提取色彩(_C)"
 
-#: src/fe-gtk/maingui.c:1570
+#: ../src/fe-gtk/maingui.c:1541
 msgid "_Hide Join/Part Messages"
 msgstr "隐藏进入/离开信息(_H)"
 
-#: src/fe-gtk/maingui.c:1579
+#: ../src/fe-gtk/maingui.c:1550
 msgid "_Extra Alerts"
 msgstr "额外警报(_E)"
 
-#: src/fe-gtk/maingui.c:1581
+#: ../src/fe-gtk/maingui.c:1552
 msgid "Beep on _Message"
 msgstr "有信息时响铃提示(_M)"
 
-#: src/fe-gtk/maingui.c:1583
+#: ../src/fe-gtk/maingui.c:1554
 msgid "Blink Tray _Icon"
 msgstr "闪烁托盘图标(_I)"
 
-#: src/fe-gtk/maingui.c:1585
+#: ../src/fe-gtk/maingui.c:1556
 msgid "Blink Task _Bar"
 msgstr "闪烁任务栏图标(_B)"
 
-#: src/fe-gtk/maingui.c:1625 src/fe-gtk/menu.c:2274
+#: ../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
 msgid "_Detach"
 msgstr "分离(_D)"
 
-#: src/fe-gtk/maingui.c:1627 src/fe-gtk/menu.c:2275 src/fe-gtk/menu.c:2280
-#: src/fe-gtk/search.c:234
+#: ../src/fe-gtk/maingui.c:1598 ../src/fe-gtk/menu.c:2330
+#: ../src/fe-gtk/menu.c:2335
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/fe-gtk/maingui.c:1966 src/fe-gtk/maingui.c:2072
+#: ../src/fe-gtk/maingui.c:1938 ../src/fe-gtk/maingui.c:2044
 msgid "User limit must be a number!\n"
 msgstr "用户限制必须是数字!\n"
 
-#: src/fe-gtk/maingui.c:2094
-msgid "Topic Protection"
-msgstr "主题保护"
+#: ../src/fe-gtk/maingui.c:2066
+msgid "Filter Colors"
+msgstr "筛选颜色"
 
-#: src/fe-gtk/maingui.c:2095
+#: ../src/fe-gtk/maingui.c:2067
 msgid "No outside messages"
 msgstr "无室外信息"
 
-#: src/fe-gtk/maingui.c:2096
-msgid "Secret"
-msgstr "秘密"
+#: ../src/fe-gtk/maingui.c:2068
+msgid "Registered Only"
+msgstr "仅已注册"
 
-#: src/fe-gtk/maingui.c:2097
+#: ../src/fe-gtk/maingui.c:2069
+msgid "Topic Protection"
+msgstr "主题保护"
+
+#: ../src/fe-gtk/maingui.c:2070
 msgid "Invite Only"
 msgstr "仅邀请"
 
-#: src/fe-gtk/maingui.c:2099
+#: ../src/fe-gtk/maingui.c:2071
 msgid "Moderated"
 msgstr "监管状态"
 
-#: src/fe-gtk/maingui.c:2100
+#: ../src/fe-gtk/maingui.c:2072
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/fe-gtk/maingui.c:2102
+#: ../src/fe-gtk/maingui.c:2074
 msgid "Keyword"
 msgstr "密码"
 
-#: src/fe-gtk/maingui.c:2114
+#: ../src/fe-gtk/maingui.c:2086
 msgid "User Limit"
 msgstr "用户限制"
 
-#: src/fe-gtk/maingui.c:2223
+#: ../src/fe-gtk/maingui.c:2196
 msgid "Show/Hide userlist"
 msgstr "显示/隐藏用户列表"
 
-#: src/fe-gtk/maingui.c:2356
-msgid ""
-"Unable to set transparent background!\n"
-"\n"
-"You may be using a non-compliant window\n"
-"manager that is not currently supported.\n"
-msgstr "无法设置透明背景!\n\n或许您正使用当前尚不被支持的\n窗口管理程序。\n"
-
-#: src/fe-gtk/maingui.c:2645
+#: ../src/fe-gtk/maingui.c:2609
 msgid "Enter new nickname:"
 msgstr "输入新昵称:"
 
-#: src/fe-gtk/menu.c:114
+#: ../src/fe-gtk/maingui.c:2832
+msgid "No results found."
+msgstr "搜索无结果。"
+
+#: ../src/fe-gtk/maingui.c:2928
+msgid "Search hit end or not found."
+msgstr "已搜索到尾部,未找到符合条件的结果。"
+
+#: ../src/fe-gtk/maingui.c:2944
+msgid "Highlight _all"
+msgstr "全部高亮(_A)"
+
+#: ../src/fe-gtk/maingui.c:2950
+msgid "Highlight all occurrences, and underline the current occurrence."
+msgstr "已高亮所有结果,并在当前匹配项下加上下划线。"
+
+#: ../src/fe-gtk/maingui.c:2952
+msgid "Mat_ch case"
+msgstr "匹配大小写(_M)"
+
+#: ../src/fe-gtk/maingui.c:2957
+msgid "Perform a case-sensitive search."
+msgstr "进行大小写敏感的搜索。"
+
+#: ../src/fe-gtk/maingui.c:2959
+msgid "_Regex"
+msgstr "正则表达式(_R)"
+
+#: ../src/fe-gtk/maingui.c:2964
+msgid "Regard search string as a regular expression."
+msgstr "将搜索字符串作为正则表达式使用。"
+
+#: ../src/fe-gtk/menu.c:115
 msgid "Host unknown"
 msgstr "未知主机"
 
-#: src/fe-gtk/menu.c:115
+#: ../src/fe-gtk/menu.c:116
 msgid "Account unknown"
-msgstr ""
+msgstr "未知账户"
 
-#: src/fe-gtk/menu.c:609
+#. let the translators tweak this if need be
+#: ../src/fe-gtk/menu.c:613
 #, c-format
 msgid "<tt><b>%-11s</b></tt> %s"
 msgstr "<tt><b>%-11s</b></tt> %s"
 
-#: src/fe-gtk/menu.c:615 src/fe-gtk/menu.c:619
+#: ../src/fe-gtk/menu.c:614
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/fe-gtk/menu.c:619 ../src/fe-gtk/menu.c:623
 msgid "Real Name:"
 msgstr "真实姓名:"
 
-#: src/fe-gtk/menu.c:626
+#: ../src/fe-gtk/menu.c:630
 msgid "User:"
 msgstr "用户:"
 
-#: src/fe-gtk/menu.c:633
+#: ../src/fe-gtk/menu.c:637
 msgid "Account:"
-msgstr ""
+msgstr "账户:"
 
-#: src/fe-gtk/menu.c:640
+#: ../src/fe-gtk/menu.c:647
 msgid "Country:"
 msgstr "国家:"
 
-#: src/fe-gtk/menu.c:647
+#: ../src/fe-gtk/menu.c:653
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/fe-gtk/menu.c:658
+#: ../src/fe-gtk/menu.c:664
 #, c-format
 msgid "%u minutes ago"
 msgstr "%u 分钟之前"
 
-#: src/fe-gtk/menu.c:660 src/fe-gtk/menu.c:663
+#: ../src/fe-gtk/menu.c:666 ../src/fe-gtk/menu.c:669
 msgid "Last Msg:"
 msgstr "最后发言:"
 
-#: src/fe-gtk/menu.c:673
+#: ../src/fe-gtk/menu.c:679
 msgid "Away Msg:"
 msgstr "离开信息:"
 
-#: src/fe-gtk/menu.c:731
+#: ../src/fe-gtk/menu.c:737
 #, c-format
 msgid "%d nicks selected."
 msgstr "已选择 %d 个昵称。"
 
-#: src/fe-gtk/menu.c:856
+#: ../src/fe-gtk/menu.c:862
 msgid ""
 "The Menubar is now hidden. You can show it again by pressing Control+F9 or "
 "right-clicking in a blank part of the main text area."
-msgstr ""
+msgstr "菜单栏当前已隐藏。您可以通过按下 Control+F9 组合键或以鼠标右键点选主要文本区域的空白部分重新显示它。"
 
-#: src/fe-gtk/menu.c:945
+#: ../src/fe-gtk/menu.c:970
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开链接"
 
-#: src/fe-gtk/menu.c:946
+#: ../src/fe-gtk/menu.c:971
 msgid "Copy Selected Link"
 msgstr "复制选取的链接"
 
-#: src/fe-gtk/menu.c:1008 src/fe-gtk/menu.c:1360
+#: ../src/fe-gtk/menu.c:1033 ../src/fe-gtk/menu.c:1393
 msgid "Join Channel"
 msgstr "进入频道"
 
-#: src/fe-gtk/menu.c:1012
+#: ../src/fe-gtk/menu.c:1037
 msgid "Part Channel"
 msgstr "离开频道"
 
-#: src/fe-gtk/menu.c:1014
+#: ../src/fe-gtk/menu.c:1039
 msgid "Cycle Channel"
 msgstr "离开频道,而后立即进入"
 
-#: src/fe-gtk/menu.c:1052
+#: ../src/fe-gtk/menu.c:1077
 msgid "_Autojoin"
-msgstr ""
+msgstr "自动加入(_A)"
 
-#: src/fe-gtk/menu.c:1054
+#: ../src/fe-gtk/menu.c:1079
 msgid "Autojoin Channel"
-msgstr ""
+msgstr "自动加入频道"
 
-#: src/fe-gtk/menu.c:1088 src/fe-gtk/menu.c:1092
+#: ../src/fe-gtk/menu.c:1113 ../src/fe-gtk/menu.c:1117
 msgid "_Auto-Connect"
-msgstr ""
+msgstr "自动连接(_A)"
 
-#: src/fe-gtk/menu.c:1112
+#: ../src/fe-gtk/menu.c:1137
 msgid ": User menu"
 msgstr ":用户菜单"
 
-#: src/fe-gtk/menu.c:1121
+#. sep
+#: ../src/fe-gtk/menu.c:1146
 msgid "Edit This Menu..."
 msgstr "编辑此菜单..."
 
-#: src/fe-gtk/menu.c:1251 src/fe-gtk/menu.c:1264
-msgid "Search hit end, not found."
-msgstr "已搜索到尾部,未找到符合条件的结果。"
+#: ../src/fe-gtk/menu.c:1292
+msgid "Marker line disabled."
+msgstr ""
+
+#: ../src/fe-gtk/menu.c:1298
+msgid "Marker line never set."
+msgstr ""
 
-#: src/fe-gtk/menu.c:1362
+#: ../src/fe-gtk/menu.c:1302
+msgid "Marker line reset manually."
+msgstr ""
+
+#: ../src/fe-gtk/menu.c:1304
+msgid "Marker line reset because exceeded scrollback limit."
+msgstr ""
+
+#: ../src/fe-gtk/menu.c:1306
+msgid "Marker line reset by CLEAR command."
+msgstr ""
+
+#: ../src/fe-gtk/menu.c:1308
+msgid "Marker line state unknown."
+msgstr ""
+
+#: ../src/fe-gtk/menu.c:1395
 msgid "Retrieve channel list..."
 msgstr "获取频道列表..."
 
-#: src/fe-gtk/menu.c:1430
+#: ../src/fe-gtk/menu.c:1461
+msgid " has been build without plugin support."
+msgstr "在无插件支持的选项下构建。"
+
+#: ../src/fe-gtk/menu.c:1469
 msgid ""
 "User Commands - Special codes:\n"
 "\n"
@@ -3960,9 +4031,9 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
+msgstr "用户命令 - 特殊代码:\n\n%c  =  当前频道\n%e  =  当前网络名称\n%m  =  机器信息\n%n  =  你的昵称\n%t  =  时间/日期\n%v  =  HexChat 版本\n%2  =  第 2 个词\n%3  =  第 3 个词\n&2  =  从第 2 个词到行末\n&3  =  从第 3 个词到行末\n\n如:\n/cmd john hello\n\n%2 是“john”\n&2 是“john hello”。"
 
-#: src/fe-gtk/menu.c:1446
+#: ../src/fe-gtk/menu.c:1485
 msgid ""
 "Userlist Buttons - Special codes:\n"
 "\n"
@@ -3974,9 +4045,10 @@ msgid ""
 "%n  =  your nick\n"
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
-msgstr "用户列表按钮 - 特殊编码:\n\n%a  =  所有选取的用户\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  选取的昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n"
+"%u  =  selected users account"
+msgstr "用户列表按钮 - 特殊代码:\n\n%a  =  所有选取的用户\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  选取昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n%u = 选取的用户账号"
 
-#: src/fe-gtk/menu.c:1456
+#: ../src/fe-gtk/menu.c:1496
 msgid ""
 "Dialog Buttons - Special codes:\n"
 "\n"
@@ -3988,9 +4060,10 @@ msgid ""
 "%n  =  your nick\n"
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
-msgstr "对话按钮 - 特殊编码:\n\n%a  =  所有选取的用户\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  选取的昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n"
+"%u  =  selected users account"
+msgstr "对话按钮 - 特殊代码:\n\n%a  =  所有选取的昵称\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  所选取昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n%u = 选取的用户账号"
 
-#: src/fe-gtk/menu.c:1466
+#: ../src/fe-gtk/menu.c:1507
 msgid ""
 "CTCP Replies - Special codes:\n"
 "\n"
@@ -4006,7 +4079,7 @@ msgid ""
 "\n"
 msgstr "CTCP 回应 - 特殊编码:\n\n%d  =  数据 (全部 ctcp)\n%e  =  当前网络名称\n%m  =  机器信息\n%s  =  发送 ctcp 的用户\n%t  =  时间/日期\n%2  =  第 2 个词\n%3  =  第 3 个词\n&2  =  从第 2 个词到行末\n&3  =  从第 3 个词到行末\n\n"
 
-#: src/fe-gtk/menu.c:1477
+#: ../src/fe-gtk/menu.c:1518
 #, c-format
 msgid ""
 "URL Handlers - Special codes:\n"
@@ -4016,1996 +4089,1942 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
+msgstr "URL 处理程序 - 特殊代码:\n\n%s  =  URL 字符串\n\n在命令前加一个 “!” 表示\n该命令应被发送到 shell 而\n非 HexChat"
 
-#: src/fe-gtk/menu.c:1486
+#: ../src/fe-gtk/menu.c:1527
 msgid ": User Defined Commands"
 msgstr ":用户自定义命令"
 
-#: src/fe-gtk/menu.c:1493
+#: ../src/fe-gtk/menu.c:1534
 msgid ": Userlist Popup menu"
 msgstr ":用户列表弹出菜单"
 
-#: src/fe-gtk/menu.c:1500
+#: ../src/fe-gtk/menu.c:1541
 msgid "Replace with"
 msgstr "使用以下替换"
 
-#: src/fe-gtk/menu.c:1500
+#: ../src/fe-gtk/menu.c:1541
 msgid ": Replace"
 msgstr ":替换"
 
-#: src/fe-gtk/menu.c:1507
+#: ../src/fe-gtk/menu.c:1548
 msgid ": URL Handlers"
 msgstr ":URL 处理程序"
 
-#: src/fe-gtk/menu.c:1526
+#: ../src/fe-gtk/menu.c:1567
 msgid ": Userlist buttons"
 msgstr ":用户列表按钮"
 
-#: src/fe-gtk/menu.c:1533
+#: ../src/fe-gtk/menu.c:1574
 msgid ": Dialog buttons"
 msgstr ":对话按钮"
 
-#: src/fe-gtk/menu.c:1540
+#: ../src/fe-gtk/menu.c:1581
 msgid ": CTCP Replies"
 msgstr ":CTCP 回应"
 
-#: src/fe-gtk/menu.c:1702
+#: ../src/fe-gtk/menu.c:1743
 msgid "He_xChat"
-msgstr ""
+msgstr "HexChat(_X)"
 
-#: src/fe-gtk/menu.c:1703
+#: ../src/fe-gtk/menu.c:1744
 msgid "Network Li_st..."
 msgstr "网络列表(_S)..."
 
-#: src/fe-gtk/menu.c:1706
+#: ../src/fe-gtk/menu.c:1747
 msgid "_New"
 msgstr "添加(_N)"
 
-#: src/fe-gtk/menu.c:1707
+#: ../src/fe-gtk/menu.c:1748
 msgid "Server Tab..."
 msgstr "服务器标签页..."
 
-#: src/fe-gtk/menu.c:1708
+#: ../src/fe-gtk/menu.c:1749
 msgid "Channel Tab..."
 msgstr "频道标签页..."
 
-#: src/fe-gtk/menu.c:1709
+#: ../src/fe-gtk/menu.c:1750
 msgid "Server Window..."
 msgstr "服务器窗口..."
 
-#: src/fe-gtk/menu.c:1710
+#: ../src/fe-gtk/menu.c:1751
 msgid "Channel Window..."
 msgstr "频道窗口..."
 
-#: src/fe-gtk/menu.c:1715 src/fe-gtk/menu.c:1717
+#: ../src/fe-gtk/menu.c:1755
 msgid "_Load Plugin or Script..."
 msgstr "载入插件或脚本(_L)..."
 
-#: src/fe-gtk/menu.c:1725 src/fe-gtk/plugin-tray.c:655
+#: ../src/fe-gtk/menu.c:1762 ../src/fe-gtk/plugin-tray.c:659
 msgid "_Quit"
 msgstr "离开(_Q)"
 
-#: src/fe-gtk/menu.c:1727
+#. 15
+#: ../src/fe-gtk/menu.c:1764
 msgid "_View"
 msgstr "查看(_V)"
 
-#: src/fe-gtk/menu.c:1729
+#: ../src/fe-gtk/menu.c:1766
 msgid "_Menu Bar"
 msgstr "菜单栏(_M)"
 
-#: src/fe-gtk/menu.c:1730
+#: ../src/fe-gtk/menu.c:1767
 msgid "_Topic Bar"
 msgstr "主题栏(_T)"
 
-#: src/fe-gtk/menu.c:1731
+#: ../src/fe-gtk/menu.c:1768
 msgid "_User List"
 msgstr "用户菜单(_U)"
 
-#: src/fe-gtk/menu.c:1732
+#: ../src/fe-gtk/menu.c:1769
 msgid "U_serlist Buttons"
 msgstr "用户列表按钮(_U)..."
 
-#: src/fe-gtk/menu.c:1733
+#: ../src/fe-gtk/menu.c:1770
 msgid "M_ode Buttons"
 msgstr "模式按钮(_O)"
 
-#: src/fe-gtk/menu.c:1735
+#: ../src/fe-gtk/menu.c:1772
 msgid "_Channel Switcher"
 msgstr "频道转换器(_C)"
 
-#: src/fe-gtk/menu.c:1737
+#: ../src/fe-gtk/menu.c:1774
 msgid "_Tabs"
 msgstr "标签页(_T)"
 
-#: src/fe-gtk/menu.c:1738
+#: ../src/fe-gtk/menu.c:1775
 msgid "T_ree"
 msgstr "树状图(_R)"
 
-#: src/fe-gtk/menu.c:1740
+#: ../src/fe-gtk/menu.c:1777
 msgid "_Network Meters"
 msgstr "网络流量(_N)"
 
-#: src/fe-gtk/menu.c:1742 src/fe-gtk/setup.c:235
+#: ../src/fe-gtk/menu.c:1779 ../src/fe-gtk/setup.c:212
 msgid "Off"
 msgstr "离线"
 
-#: src/fe-gtk/menu.c:1743
+#: ../src/fe-gtk/menu.c:1780
 msgid "Graph"
 msgstr "图形"
 
-#: src/fe-gtk/menu.c:1748
+#: ../src/fe-gtk/menu.c:1785
+msgid "_Fullscreen"
+msgstr "全屏(_F)"
+
+#: ../src/fe-gtk/menu.c:1787
 msgid "_Server"
 msgstr "服务器(_S)"
 
-#: src/fe-gtk/menu.c:1749
+#: ../src/fe-gtk/menu.c:1788
 msgid "_Disconnect"
 msgstr "断开连接(_D)"
 
-#: src/fe-gtk/menu.c:1750
+#: ../src/fe-gtk/menu.c:1789
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/fe-gtk/menu.c:1751
+#: ../src/fe-gtk/menu.c:1790
 msgid "_Join a Channel..."
-msgstr ""
+msgstr "进入频道(_J)..."
 
-#: src/fe-gtk/menu.c:1752
+#: ../src/fe-gtk/menu.c:1791
 msgid "_List of Channels..."
-msgstr ""
+msgstr "频道列表(_L)..."
 
-#: src/fe-gtk/menu.c:1755
+#: ../src/fe-gtk/menu.c:1794
 msgid "Marked _Away"
-msgstr ""
+msgstr "标记为离开(_A)"
 
-#: src/fe-gtk/menu.c:1757
+#: ../src/fe-gtk/menu.c:1796
 msgid "_Usermenu"
 msgstr "用户菜单(_U)"
 
-#: src/fe-gtk/menu.c:1759
+#. 40
+#: ../src/fe-gtk/menu.c:1798
 msgid "S_ettings"
 msgstr "设置(_E)"
 
-#: src/fe-gtk/menu.c:1760 src/fe-gtk/plugin-tray.c:652
+#: ../src/fe-gtk/menu.c:1799 ../src/fe-gtk/plugin-tray.c:656
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: src/fe-gtk/menu.c:1762
+#: ../src/fe-gtk/menu.c:1801
 msgid "Auto Replace..."
 msgstr "自动替换..."
 
-#: src/fe-gtk/menu.c:1763
+#: ../src/fe-gtk/menu.c:1802
 msgid "CTCP Replies..."
 msgstr "CTCP 回应..."
 
-#: src/fe-gtk/menu.c:1764
+#: ../src/fe-gtk/menu.c:1803
 msgid "Dialog Buttons..."
 msgstr "对话框按钮..."
 
-#: src/fe-gtk/menu.c:1765
+#: ../src/fe-gtk/menu.c:1804
 msgid "Keyboard Shortcuts..."
 msgstr "键盘快捷键..."
 
-#: src/fe-gtk/menu.c:1766
+#: ../src/fe-gtk/menu.c:1805
 msgid "Text Events..."
 msgstr "文本事件..."
 
-#: src/fe-gtk/menu.c:1767
+#: ../src/fe-gtk/menu.c:1806
 msgid "URL Handlers..."
 msgstr "URL 处理程序..."
 
-#: src/fe-gtk/menu.c:1768
+#: ../src/fe-gtk/menu.c:1807
 msgid "User Commands..."
 msgstr "用户命令..."
 
-#: src/fe-gtk/menu.c:1769
+#: ../src/fe-gtk/menu.c:1808
 msgid "Userlist Buttons..."
 msgstr "用户列表按钮..."
 
-#: src/fe-gtk/menu.c:1770
+#: ../src/fe-gtk/menu.c:1809
 msgid "Userlist Popup..."
 msgstr "用户列表弹出菜单..."
 
-#: src/fe-gtk/menu.c:1772
+#. 52
+#: ../src/fe-gtk/menu.c:1811
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: src/fe-gtk/menu.c:1773
+#: ../src/fe-gtk/menu.c:1812
 msgid "_Ban List..."
-msgstr ""
+msgstr "屏蔽列表(_B)..."
 
-#: src/fe-gtk/menu.c:1774
+#: ../src/fe-gtk/menu.c:1813
 msgid "Character Chart..."
-msgstr "特殊字符..."
+msgstr "字符表..."
 
-#: src/fe-gtk/menu.c:1775
+#: ../src/fe-gtk/menu.c:1814
 msgid "Direct Chat..."
 msgstr "直连聊天..."
 
-#: src/fe-gtk/menu.c:1776
+#: ../src/fe-gtk/menu.c:1815
 msgid "File _Transfers..."
-msgstr ""
+msgstr "文件传输(_T)..."
 
-#: src/fe-gtk/menu.c:1777
+#: ../src/fe-gtk/menu.c:1816
 msgid "Friends List..."
 msgstr "好友列表"
 
-#: src/fe-gtk/menu.c:1778
+#: ../src/fe-gtk/menu.c:1817
 msgid "Ignore List..."
 msgstr "忽略列表..."
 
-#: src/fe-gtk/menu.c:1779
+#: ../src/fe-gtk/menu.c:1818
 msgid "_Plugins and Scripts..."
-msgstr ""
+msgstr "插件和脚本(_P)..."
 
-#: src/fe-gtk/menu.c:1780
+#: ../src/fe-gtk/menu.c:1819
 msgid "_Raw Log..."
-msgstr ""
+msgstr "原始记录(_R)..."
 
-#: src/fe-gtk/menu.c:1781
+#. 61
+#: ../src/fe-gtk/menu.c:1820
 msgid "URL Grabber..."
 msgstr "URL 抓取程序..."
 
-#: src/fe-gtk/menu.c:1783
+#: ../src/fe-gtk/menu.c:1822
 msgid "Reset Marker Line"
 msgstr "重置标记线"
 
-#: src/fe-gtk/menu.c:1784
-msgid "_Copy Selection"
+#: ../src/fe-gtk/menu.c:1823
+msgid "Move to Marker Line"
 msgstr ""
 
-#: src/fe-gtk/menu.c:1785
+#: ../src/fe-gtk/menu.c:1824
+msgid "_Copy Selection"
+msgstr "复制选区(_C)"
+
+#: ../src/fe-gtk/menu.c:1825
 msgid "C_lear Text"
 msgstr "清空文本(_L)"
 
-#: src/fe-gtk/menu.c:1786
+#: ../src/fe-gtk/menu.c:1826
 msgid "Save Text..."
 msgstr "保存文本..."
 
-#: src/fe-gtk/menu.c:1788
+#: ../src/fe-gtk/menu.c:1828
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
-#: src/fe-gtk/menu.c:1789
+#: ../src/fe-gtk/menu.c:1829
 msgid "Search Text..."
 msgstr "搜索文本..."
 
-#: src/fe-gtk/menu.c:1790
-msgid "Reset Search"
-msgstr ""
-
-#: src/fe-gtk/menu.c:1791
+#: ../src/fe-gtk/menu.c:1830
 msgid "Search Next"
-msgstr ""
+msgstr "搜索下一个"
 
-#: src/fe-gtk/menu.c:1792
+#: ../src/fe-gtk/menu.c:1831
 msgid "Search Previous"
-msgstr ""
+msgstr "搜索上一个"
 
-#: src/fe-gtk/menu.c:1795 src/fe-gtk/menu.c:2266
+#: ../src/fe-gtk/menu.c:1834 ../src/fe-gtk/menu.c:2321
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: src/fe-gtk/menu.c:1797
+#. 74
+#: ../src/fe-gtk/menu.c:1835
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: src/fe-gtk/menu.c:1799
-msgid "Check for updates"
-msgstr "检查更新"
-
-#: src/fe-gtk/menu.c:1801
+#: ../src/fe-gtk/menu.c:1836
 msgid "_About"
 msgstr "关于(_A)"
 
-#: src/fe-gtk/menu.c:2279
+#: ../src/fe-gtk/menu.c:2334
 msgid "_Attach"
 msgstr "整合(_A)"
 
-#: src/fe-gtk/notifygui.c:126
+#: ../src/fe-gtk/notifygui.c:123 ../src/fe-gtk/plugingui.c:63
+msgid "Name"
+msgstr "名称"
+
+#: ../src/fe-gtk/notifygui.c:126
 msgid "Last Seen"
 msgstr "上次发现"
 
-#: src/fe-gtk/notifygui.c:168
+#: ../src/fe-gtk/notifygui.c:168
 msgid "Offline"
 msgstr "离线"
 
-#: src/fe-gtk/notifygui.c:188 src/fe-gtk/setup.c:308
+#: ../src/fe-gtk/notifygui.c:188 ../src/fe-gtk/setup.c:285
 msgid "Never"
 msgstr "从不"
 
-#: src/fe-gtk/notifygui.c:193 src/fe-gtk/notifygui.c:222
+#: ../src/fe-gtk/notifygui.c:193 ../src/fe-gtk/notifygui.c:222
 #, c-format
 msgid "%d minutes ago"
 msgstr "%d 分钟之前"
 
-#: src/fe-gtk/notifygui.c:195
+#: ../src/fe-gtk/notifygui.c:195
 #, c-format
 msgid "An hour ago"
-msgstr ""
+msgstr "1小时前"
 
-#: src/fe-gtk/notifygui.c:197
+#: ../src/fe-gtk/notifygui.c:197
 #, c-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d 小时之前"
 
-#: src/fe-gtk/notifygui.c:212
+#: ../src/fe-gtk/notifygui.c:212
 msgid "Online"
 msgstr "上线"
 
-#: src/fe-gtk/notifygui.c:341
+#: ../src/fe-gtk/notifygui.c:341
 msgid "Enter nickname to add:"
 msgstr "输入要添加的昵称:"
 
-#: src/fe-gtk/notifygui.c:370
+#: ../src/fe-gtk/notifygui.c:370
 msgid "Notify on these networks:"
 msgstr "在这些网络中进行通知:"
 
-#: src/fe-gtk/notifygui.c:381
+#: ../src/fe-gtk/notifygui.c:381
 msgid "Comma separated list of networks is accepted."
 msgstr "此处允许使用逗号分隔多个网络。"
 
-#: src/fe-gtk/notifygui.c:407
+#: ../src/fe-gtk/notifygui.c:407
 msgid ": Friends List"
 msgstr ":好友列表"
 
-#: src/fe-gtk/notifygui.c:429
+#: ../src/fe-gtk/notifygui.c:429
 msgid "Open Dialog"
-msgstr "打开对话"
+msgstr "打开对话框"
 
-#: src/fe-gtk/plugin-tray.c:264
+#: ../src/fe-gtk/plugin-tray.c:264
 #, c-format
 msgid ": Connected to %u networks and %u channels"
 msgstr ":已连接到 %u 个网络和 %u 个频道"
 
-#: src/fe-gtk/plugin-tray.c:624
+#: ../src/fe-gtk/plugin-tray.c:628
 msgid "_Restore Window"
-msgstr ""
+msgstr "还原窗口 (_R)"
 
-#: src/fe-gtk/plugin-tray.c:626
+#: ../src/fe-gtk/plugin-tray.c:630
 msgid "_Hide Window"
-msgstr ""
+msgstr "隐藏窗口 (_H)"
 
-#: src/fe-gtk/plugin-tray.c:630
+#: ../src/fe-gtk/plugin-tray.c:634
 msgid "_Blink on"
 msgstr "闪烁于(_B)"
 
-#: src/fe-gtk/plugin-tray.c:631 src/fe-gtk/setup.c:658
+#: ../src/fe-gtk/plugin-tray.c:635 ../src/fe-gtk/setup.c:647
 msgid "Channel Message"
 msgstr "频道消息"
 
-#: src/fe-gtk/plugin-tray.c:632 src/fe-gtk/setup.c:659
+#: ../src/fe-gtk/plugin-tray.c:636 ../src/fe-gtk/setup.c:648
 msgid "Private Message"
 msgstr "私聊消息"
 
-#: src/fe-gtk/plugin-tray.c:633 src/fe-gtk/setup.c:660
+#: ../src/fe-gtk/plugin-tray.c:637 ../src/fe-gtk/setup.c:649
 msgid "Highlighted Message"
 msgstr "高亮显示的消息"
 
-#: src/fe-gtk/plugin-tray.c:636
+#. blink_item (BIT_FILEOFFER, submenu, _("File Offer"));
+#: ../src/fe-gtk/plugin-tray.c:640
 msgid "_Change status"
 msgstr "更改状态(_C)"
 
-#: src/fe-gtk/plugin-tray.c:642
+#: ../src/fe-gtk/plugin-tray.c:646
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/fe-gtk/plugin-tray.c:645
+#: ../src/fe-gtk/plugin-tray.c:649
 msgid "_Back"
 msgstr "返回(_B)"
 
-#: src/fe-gtk/plugin-tray.c:710
+#: ../src/fe-gtk/plugin-tray.c:714
 #, c-format
 msgid ": Highlighted message from: %s (%s)"
 msgstr ":高亮消息来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:713
+#: ../src/fe-gtk/plugin-tray.c:717
 #, c-format
 msgid ": %u highlighted messages, latest from: %s (%s)"
 msgstr ":%u 条高亮消息,最近一条来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:718
+#: ../src/fe-gtk/plugin-tray.c:722
 #, c-format
 msgid "Highlighted message from: %s (%s)"
-msgstr ""
+msgstr "高亮消息来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:736
+#: ../src/fe-gtk/plugin-tray.c:740
 #, c-format
 msgid ": Channel message from: %s (%s)"
-msgstr ""
+msgstr ": 频道消息来自于: %s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:739
+#: ../src/fe-gtk/plugin-tray.c:743
 #, c-format
 msgid ": %u channel messages."
-msgstr ""
+msgstr ": %u 频道消息。"
 
-#: src/fe-gtk/plugin-tray.c:743
+#: ../src/fe-gtk/plugin-tray.c:747
 #, c-format
 msgid "Channel message from: %s (%s)"
-msgstr ""
+msgstr "频道消息来自于: %s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:765
+#: ../src/fe-gtk/plugin-tray.c:771
 #, c-format
 msgid ": Private message from: %s (%s)"
 msgstr ":私聊消息来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:768
+#: ../src/fe-gtk/plugin-tray.c:774
 #, c-format
 msgid ": %u private messages, latest from: %s (%s)"
 msgstr ":%u 条私聊消息,最近的一个来自于: %s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:772
+#: ../src/fe-gtk/plugin-tray.c:779
 #, c-format
 msgid "Private message from: %s (%s)"
-msgstr ""
+msgstr "私聊消息来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:818
+#: ../src/fe-gtk/plugin-tray.c:818
 #, 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:821
 #, c-format
 msgid ": %u file offers, latest from: %s (%s)"
 msgstr "Xchat: %u 个文件传输,最近的一个来自于:%s (%s)"
 
-#: src/fe-gtk/plugin-tray.c:826
+#: ../src/fe-gtk/plugin-tray.c:826
 #, c-format
 msgid "File offer from: %s (%s)"
-msgstr ""
+msgstr "文件传输来自于: %s (%s)"
 
-#: src/fe-gtk/plugingui.c:64
+#: ../src/fe-gtk/plugingui.c:64
 msgid "Version"
 msgstr "版本"
 
-#: src/fe-gtk/plugingui.c:66 src/fe-gtk/textgui.c:414
+#: ../src/fe-gtk/plugingui.c:66 ../src/fe-gtk/textgui.c:428
 msgid "Description"
 msgstr "描述"
 
-#: src/fe-gtk/plugingui.c:163
+#: ../src/fe-gtk/plugingui.c:163
 msgid "Select a Plugin or Script to load"
 msgstr "选择要载入的插件或脚本"
 
-#: src/fe-gtk/plugingui.c:252
+#: ../src/fe-gtk/plugingui.c:252
 msgid ": Plugins and Scripts"
 msgstr ":插件和脚本"
 
-#: src/fe-gtk/plugingui.c:267
+#: ../src/fe-gtk/plugingui.c:267
 msgid "_Load..."
 msgstr "载入(_L)..."
 
-#: src/fe-gtk/plugingui.c:270
+#: ../src/fe-gtk/plugingui.c:270
 msgid "_Unload"
-msgstr ""
+msgstr "卸载(_U)"
 
-#: src/fe-gtk/plugingui.c:273
+#: ../src/fe-gtk/plugingui.c:273
 msgid "_Reload"
-msgstr ""
+msgstr "重新载入(_R)"
 
-#: src/fe-gtk/rawlog.c:80 src/fe-gtk/rawlog.c:146 src/fe-gtk/textgui.c:428
-#: src/fe-gtk/urlgrab.c:216
+#: ../src/fe-gtk/rawlog.c:80 ../src/fe-gtk/rawlog.c:136
+#: ../src/fe-gtk/textgui.c:479 ../src/fe-gtk/urlgrab.c:216
 msgid "Save As..."
 msgstr "另存为..."
 
-#: src/fe-gtk/rawlog.c:112
+#: ../src/fe-gtk/rawlog.c:112
 #, c-format
 msgid ": Raw Log (%s)"
-msgstr ""
+msgstr ":原始聊天记录 (%s)"
 
-#: src/fe-gtk/rawlog.c:143
+#: ../src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
-msgstr ""
-
-#: src/fe-gtk/search.c:51
-msgid "The window you opened this Search for doesn't exist anymore."
-msgstr "您为该搜索打开的窗口已不存在。"
-
-#: src/fe-gtk/search.c:162
-msgid ": Search"
-msgstr ":搜索"
-
-#: src/fe-gtk/search.c:175
-msgid "Search hit end or not found."
-msgstr ""
-
-#: src/fe-gtk/search.c:193
-msgid "_Find"
-msgstr "查找(_F)"
-
-#: src/fe-gtk/search.c:197
-msgid "_Match case"
-msgstr "区分大小写(_M)"
+msgstr "清除原始记录"
 
-#: src/fe-gtk/search.c:201
-msgid "Perform a case-sensitive search."
-msgstr ""
-
-#: src/fe-gtk/search.c:205
-msgid "Search _backwards"
-msgstr "反向搜索"
-
-#: src/fe-gtk/search.c:209
-msgid "Search from the newest text line to the oldest."
-msgstr ""
-
-#: src/fe-gtk/search.c:213
-msgid "_Highlight all"
-msgstr ""
-
-#: src/fe-gtk/search.c:217
-msgid "Highlight all occurrences, and underline the current occurrence."
-msgstr ""
-
-#: src/fe-gtk/search.c:221
-msgid "R_egular expression"
-msgstr ""
-
-#: src/fe-gtk/search.c:225
-msgid "Regard search string as a regular expression."
-msgstr ""
-
-#: src/fe-gtk/search.c:235
-msgid "Close this box, but continue searching new lines."
-msgstr ""
-
-#: src/fe-gtk/search.c:237
-msgid "Close and _Reset"
-msgstr ""
-
-#: src/fe-gtk/search.c:238
-msgid ""
-"Close this box, reset highlighted search items, and stop searching new "
-"lines."
-msgstr ""
-
-#: src/fe-gtk/servlistgui.c:301 src/fe-gtk/servlistgui.c:499
+#: ../src/fe-gtk/servlistgui.c:301 ../src/fe-gtk/servlistgui.c:499
 msgid "New Network"
 msgstr "添加网络"
 
-#: src/fe-gtk/servlistgui.c:757
+#: ../src/fe-gtk/servlistgui.c:757
 #, c-format
 msgid "Really remove network \"%s\" and all its servers?"
-msgstr "确实要删除网络“%s”以及它的所有服务器吗?"
+msgstr "确实要删除网络 “%s” 以及它的所有服务器吗?"
 
-#: src/fe-gtk/servlistgui.c:1112
-msgid "User name and Real name cannot be left blank."
-msgstr "用户名与真实姓名不可为空白。"
+#: ../src/fe-gtk/servlistgui.c:1126 ../src/fe-gtk/servlistgui.c:1557
+msgid "User name cannot be left blank."
+msgstr "用户名不可留空。"
 
-#: src/fe-gtk/servlistgui.c:1576
+#: ../src/fe-gtk/servlistgui.c:1578
+msgid "You must have two unique nick names."
+msgstr ""
+
+#: ../src/fe-gtk/servlistgui.c:1630
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
+msgstr "您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
 
-#: src/fe-gtk/servlistgui.c:1650
+#: ../src/fe-gtk/servlistgui.c:1704
 #, c-format
 msgid ": Edit %s"
 msgstr ":编辑 %s"
 
-#: src/fe-gtk/servlistgui.c:1672
+#: ../src/fe-gtk/servlistgui.c:1725
 msgid "Servers"
-msgstr ""
+msgstr "服务器"
 
-#: src/fe-gtk/servlistgui.c:1673
+#: ../src/fe-gtk/servlistgui.c:1726
 msgid "Autojoin channels"
-msgstr ""
+msgstr "自动加入频道"
 
-#: src/fe-gtk/servlistgui.c:1674
+#: ../src/fe-gtk/servlistgui.c:1727
 msgid "Connect commands"
-msgstr ""
+msgstr "连接命令"
 
-#: src/fe-gtk/servlistgui.c:1686
+#: ../src/fe-gtk/servlistgui.c:1739
 msgid ""
 "%n=Nick name\n"
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
+msgstr "%n=昵称\n%p=密码\n%r=真实姓名\n%u=用户名"
 
-#: src/fe-gtk/servlistgui.c:1743
+#: ../src/fe-gtk/servlistgui.c:1795
 msgid "Key (Password)"
 msgstr "密码"
 
-#: src/fe-gtk/servlistgui.c:1795
+#: ../src/fe-gtk/servlistgui.c:1847
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/fe-gtk/servlistgui.c:1808
+#: ../src/fe-gtk/servlistgui.c:1860
 msgid "Connect to selected server only"
 msgstr "只连接到选取的服务器"
 
-#: src/fe-gtk/servlistgui.c:1809
+#: ../src/fe-gtk/servlistgui.c:1861
 msgid "Don't cycle through all the servers when the connection fails."
 msgstr "当连接失败时不要循环跳至所有的服务器。"
 
-#: src/fe-gtk/servlistgui.c:1810
+#: ../src/fe-gtk/servlistgui.c:1862
 msgid "Connect to this network automatically"
-msgstr ""
+msgstr "自动连接到此网络"
 
-#: src/fe-gtk/servlistgui.c:1811
+#: ../src/fe-gtk/servlistgui.c:1863
 msgid "Bypass proxy server"
 msgstr "代理服务器"
 
-#: src/fe-gtk/servlistgui.c:1812
+#: ../src/fe-gtk/servlistgui.c:1864
 msgid "Use SSL for all the servers on this network"
 msgstr "在本网络的所有服务器上使用 SSL"
 
-#: src/fe-gtk/servlistgui.c:1816
+#: ../src/fe-gtk/servlistgui.c:1868
 msgid "Accept invalid SSL certificates"
-msgstr ""
+msgstr "接受无效的 SSL 证书"
 
-#: src/fe-gtk/servlistgui.c:1820
+#: ../src/fe-gtk/servlistgui.c:1872
 msgid "Use global user information"
 msgstr "使用全局用户信息"
 
-#: src/fe-gtk/servlistgui.c:1822 src/fe-gtk/servlistgui.c:1940
+#: ../src/fe-gtk/servlistgui.c:1874 ../src/fe-gtk/servlistgui.c:1991
 msgid "_Nick name:"
 msgstr "昵称(_N):"
 
-#: src/fe-gtk/servlistgui.c:1823 src/fe-gtk/servlistgui.c:1947
+#: ../src/fe-gtk/servlistgui.c:1875 ../src/fe-gtk/servlistgui.c:1998
 msgid "Second choice:"
 msgstr "第二选择:"
 
-#: src/fe-gtk/servlistgui.c:1824
+#: ../src/fe-gtk/servlistgui.c:1876
 msgid "Rea_l name:"
 msgstr "真实姓名(_L):"
 
-#: src/fe-gtk/servlistgui.c:1825 src/fe-gtk/servlistgui.c:1961
+#: ../src/fe-gtk/servlistgui.c:1877 ../src/fe-gtk/servlistgui.c:2012
 msgid "_User name:"
 msgstr "用户名(_U):"
 
-#: src/fe-gtk/servlistgui.c:1827
+#: ../src/fe-gtk/servlistgui.c:1879
 msgid "Login method:"
-msgstr ""
+msgstr "登录方法:"
 
-#: src/fe-gtk/servlistgui.c:1833 src/fe-gtk/setup.c:618
+#: ../src/fe-gtk/servlistgui.c:1885 ../src/fe-gtk/setup.c:607
 msgid "Password:"
 msgstr "密码:"
 
-#: src/fe-gtk/servlistgui.c:1833
+#: ../src/fe-gtk/servlistgui.c:1885
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
+msgstr "登录时使用的密码。如果不确定请留空。"
 
-#: src/fe-gtk/servlistgui.c:1838
+#: ../src/fe-gtk/servlistgui.c:1890
 msgid "Character set:"
 msgstr "字符集:"
 
-#: src/fe-gtk/servlistgui.c:1918
+#: ../src/fe-gtk/servlistgui.c:1970
 msgid ": Network List"
 msgstr ":网络列表"
 
-#: src/fe-gtk/servlistgui.c:1930
+#: ../src/fe-gtk/servlistgui.c:1981
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/fe-gtk/servlistgui.c:1954
+#: ../src/fe-gtk/servlistgui.c:2005
 msgid "Third choice:"
 msgstr "第三选择:"
 
-#: src/fe-gtk/servlistgui.c:2014
+#: ../src/fe-gtk/servlistgui.c:2065
 msgid "Networks"
 msgstr "网络"
 
-#: src/fe-gtk/servlistgui.c:2062
+#: ../src/fe-gtk/servlistgui.c:2113
 msgid "Skip network list on startup"
 msgstr "启动时不打开网络列表"
 
-#: src/fe-gtk/servlistgui.c:2071
+#: ../src/fe-gtk/servlistgui.c:2122
 msgid "Show favorites only"
-msgstr ""
+msgstr "只显示已收藏的"
 
-#: src/fe-gtk/servlistgui.c:2101
+#: ../src/fe-gtk/servlistgui.c:2152
 msgid "_Edit..."
 msgstr "编辑(_E)"
 
-#: src/fe-gtk/servlistgui.c:2108
+#: ../src/fe-gtk/servlistgui.c:2159
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/fe-gtk/servlistgui.c:2109
+#: ../src/fe-gtk/servlistgui.c:2160
 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:2117
+#: ../src/fe-gtk/servlistgui.c:2168
 msgid "_Favor"
-msgstr ""
+msgstr "收藏 (_F)"
 
-#: src/fe-gtk/servlistgui.c:2118
+#: ../src/fe-gtk/servlistgui.c:2169
 msgid "Mark or unmark this network as a favorite."
-msgstr ""
+msgstr "标记/取消标记 收藏此网络"
 
-#: src/fe-gtk/servlistgui.c:2142
+#: ../src/fe-gtk/servlistgui.c:2193
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: src/fe-gtk/setup.c:93
+#: ../src/fe-gtk/setup.c:88
 msgid "Afrikaans"
-msgstr ""
+msgstr "南非语"
 
-#: src/fe-gtk/setup.c:94
+#: ../src/fe-gtk/setup.c:89
 msgid "Albanian"
-msgstr "阿尔巴尼亚"
+msgstr "阿尔巴尼亚语"
 
-#: src/fe-gtk/setup.c:95
+#: ../src/fe-gtk/setup.c:90
 msgid "Amharic"
-msgstr ""
+msgstr "阿姆哈拉语"
 
-#: src/fe-gtk/setup.c:96
+#: ../src/fe-gtk/setup.c:91
 msgid "Asturian"
-msgstr ""
+msgstr "阿斯图里亚斯语"
 
-#: src/fe-gtk/setup.c:97
+#: ../src/fe-gtk/setup.c:92
 msgid "Azerbaijani"
-msgstr "亚塞拜然"
+msgstr "阿塞拜疆语"
 
-#: src/fe-gtk/setup.c:98
+#: ../src/fe-gtk/setup.c:93
 msgid "Basque"
-msgstr ""
+msgstr "巴斯克语"
 
-#: src/fe-gtk/setup.c:99
+#: ../src/fe-gtk/setup.c:94
 msgid "Belarusian"
-msgstr "白俄"
+msgstr "白俄罗斯语"
 
-#: src/fe-gtk/setup.c:100
+#: ../src/fe-gtk/setup.c:95
 msgid "Bulgarian"
-msgstr "保加利亚"
+msgstr "保加利亚语"
 
-#: src/fe-gtk/setup.c:102
+#: ../src/fe-gtk/setup.c:97
 msgid "Chinese (Simplified)"
-msgstr ""
+msgstr "简体中文"
 
-#: src/fe-gtk/setup.c:103
+#: ../src/fe-gtk/setup.c:98
 msgid "Chinese (Traditional)"
-msgstr ""
+msgstr "正体中文"
 
-#: src/fe-gtk/setup.c:104
+#: ../src/fe-gtk/setup.c:99
 msgid "Czech"
-msgstr ""
+msgstr "捷克语"
 
-#: src/fe-gtk/setup.c:105
+#: ../src/fe-gtk/setup.c:100
 msgid "Danish"
-msgstr ""
+msgstr "丹麦语"
 
-#: src/fe-gtk/setup.c:106
+#: ../src/fe-gtk/setup.c:101
 msgid "Dutch"
-msgstr ""
+msgstr "荷兰语"
 
-#: src/fe-gtk/setup.c:107
+#: ../src/fe-gtk/setup.c:102
 msgid "English (British)"
-msgstr ""
+msgstr "英语(英国)"
 
-#: src/fe-gtk/setup.c:108
+#: ../src/fe-gtk/setup.c:103
 msgid "English"
-msgstr ""
+msgstr "英语"
 
-#: src/fe-gtk/setup.c:109
+#: ../src/fe-gtk/setup.c:104
 msgid "Estonian"
-msgstr "爱沙尼亚"
+msgstr "爱沙尼亚语"
 
-#: src/fe-gtk/setup.c:110
+#: ../src/fe-gtk/setup.c:105
 msgid "Finnish"
-msgstr ""
+msgstr "芬兰语"
 
-#: src/fe-gtk/setup.c:111
+#: ../src/fe-gtk/setup.c:106
 msgid "French"
-msgstr ""
+msgstr "法语"
 
-#: src/fe-gtk/setup.c:112
+#: ../src/fe-gtk/setup.c:107
 msgid "Galician"
-msgstr ""
+msgstr "加利西亚语"
 
-#: src/fe-gtk/setup.c:113
+#: ../src/fe-gtk/setup.c:108
 msgid "German"
-msgstr ""
+msgstr "德语"
 
-#: src/fe-gtk/setup.c:114
+#: ../src/fe-gtk/setup.c:109
 msgid "Greek"
-msgstr ""
+msgstr "希腊语"
 
-#: src/fe-gtk/setup.c:115
+#: ../src/fe-gtk/setup.c:110
 msgid "Gujarati"
-msgstr ""
+msgstr "古吉拉特语"
 
-#: src/fe-gtk/setup.c:116
+#: ../src/fe-gtk/setup.c:111
 msgid "Hindi"
-msgstr "印度"
+msgstr "印度语"
 
-#: src/fe-gtk/setup.c:117
+#: ../src/fe-gtk/setup.c:112
 msgid "Hungarian"
-msgstr ""
+msgstr "匈牙利语"
 
-#: src/fe-gtk/setup.c:118
+#: ../src/fe-gtk/setup.c:113
 msgid "Indonesian"
-msgstr ""
+msgstr "印度尼西亚语"
 
-#: src/fe-gtk/setup.c:119
+#: ../src/fe-gtk/setup.c:114
 msgid "Italian"
-msgstr ""
+msgstr "意大利语"
 
-#: src/fe-gtk/setup.c:120
+#: ../src/fe-gtk/setup.c:115
 msgid "Japanese"
-msgstr ""
+msgstr "日本语"
 
-#: src/fe-gtk/setup.c:121
+#: ../src/fe-gtk/setup.c:116
 msgid "Kannada"
-msgstr ""
+msgstr "卡纳达语"
 
-#: src/fe-gtk/setup.c:122
+#: ../src/fe-gtk/setup.c:117
 msgid "Kinyarwanda"
-msgstr ""
+msgstr "卢旺达语"
 
-#: src/fe-gtk/setup.c:123
+#: ../src/fe-gtk/setup.c:118
 msgid "Korean"
-msgstr ""
+msgstr "朝鲜语"
 
-#: src/fe-gtk/setup.c:124
+#: ../src/fe-gtk/setup.c:119
 msgid "Latvian"
-msgstr ""
+msgstr "拉脱维亚语"
 
-#: src/fe-gtk/setup.c:125
+#: ../src/fe-gtk/setup.c:120
 msgid "Lithuanian"
-msgstr ""
+msgstr "立陶宛语"
 
-#: src/fe-gtk/setup.c:126
+#: ../src/fe-gtk/setup.c:121
 msgid "Macedonian"
-msgstr ""
+msgstr "马其顿语"
 
-#: src/fe-gtk/setup.c:127
+#: ../src/fe-gtk/setup.c:122
 msgid "Malay"
-msgstr "马来西亚"
+msgstr "马来西亚语"
 
-#: src/fe-gtk/setup.c:128
+#: ../src/fe-gtk/setup.c:123
 msgid "Malayalam"
-msgstr ""
+msgstr "马拉雅拉姆语"
 
-#: src/fe-gtk/setup.c:129
+#: ../src/fe-gtk/setup.c:124
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "挪威语(波克默尔语)"
 
-#: src/fe-gtk/setup.c:130
+#: ../src/fe-gtk/setup.c:125
 msgid "Norwegian (Nynorsk)"
-msgstr ""
+msgstr "挪威语(尼诺斯克语)"
 
-#: src/fe-gtk/setup.c:131
+#: ../src/fe-gtk/setup.c:126
 msgid "Polish"
-msgstr ""
+msgstr "波兰语"
 
-#: src/fe-gtk/setup.c:132
+#: ../src/fe-gtk/setup.c:127
 msgid "Portuguese"
-msgstr ""
+msgstr "葡萄牙语"
 
-#: src/fe-gtk/setup.c:133
+#: ../src/fe-gtk/setup.c:128
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "葡萄牙语(巴西)"
 
-#: src/fe-gtk/setup.c:134
+#: ../src/fe-gtk/setup.c:129
 msgid "Punjabi"
-msgstr ""
+msgstr "旁遮普语"
 
-#: src/fe-gtk/setup.c:135
+#: ../src/fe-gtk/setup.c:130
 msgid "Russian"
-msgstr ""
+msgstr "俄语"
 
-#: src/fe-gtk/setup.c:136
+#: ../src/fe-gtk/setup.c:131
 msgid "Serbian"
-msgstr ""
+msgstr "塞尔维亚语"
 
-#: src/fe-gtk/setup.c:137
+#: ../src/fe-gtk/setup.c:132
 msgid "Slovak"
-msgstr ""
+msgstr "斯洛伐克语"
 
-#: src/fe-gtk/setup.c:138
+#: ../src/fe-gtk/setup.c:133
 msgid "Slovenian"
-msgstr ""
+msgstr "斯洛文尼亚语"
 
-#: src/fe-gtk/setup.c:139
+#: ../src/fe-gtk/setup.c:134
 msgid "Spanish"
-msgstr ""
+msgstr "西班牙语"
 
-#: src/fe-gtk/setup.c:140
+#: ../src/fe-gtk/setup.c:135
 msgid "Swedish"
-msgstr ""
+msgstr "瑞典语"
 
-#: src/fe-gtk/setup.c:141
+#: ../src/fe-gtk/setup.c:136
 msgid "Thai"
-msgstr "泰国"
+msgstr "泰语"
+
+#: ../src/fe-gtk/setup.c:137
+msgid "Turkish"
+msgstr "土耳其语"
 
-#: src/fe-gtk/setup.c:142
+#: ../src/fe-gtk/setup.c:138
 msgid "Ukrainian"
-msgstr ""
+msgstr "乌克兰语"
 
-#: src/fe-gtk/setup.c:143
+#: ../src/fe-gtk/setup.c:139
 msgid "Vietnamese"
-msgstr "越南"
+msgstr "越南语"
 
-#: src/fe-gtk/setup.c:144
+#: ../src/fe-gtk/setup.c:140
 msgid "Walloon"
-msgstr ""
+msgstr "瓦隆语"
 
-#: src/fe-gtk/setup.c:151 src/fe-gtk/setup.c:1850
+#: ../src/fe-gtk/setup.c:147 ../src/fe-gtk/setup.c:1814
 msgid "General"
 msgstr "一般"
 
-#: src/fe-gtk/setup.c:153
+#: ../src/fe-gtk/setup.c:149
 msgid "Language:"
-msgstr ""
+msgstr "语言:"
 
-#: src/fe-gtk/setup.c:154
+#: ../src/fe-gtk/setup.c:150
 msgid "Main font:"
-msgstr ""
+msgstr "主要字体:"
 
-#: src/fe-gtk/setup.c:156
+#: ../src/fe-gtk/setup.c:152
 msgid "Font:"
 msgstr "字体:"
 
-#: src/fe-gtk/setup.c:159
+#: ../src/fe-gtk/setup.c:155
 msgid "Text Box"
-msgstr ""
+msgstr "文本框"
 
-#: src/fe-gtk/setup.c:160
+#: ../src/fe-gtk/setup.c:156
 msgid "Colored nick names"
 msgstr "彩色昵称"
 
-#: src/fe-gtk/setup.c:160
+#: ../src/fe-gtk/setup.c:156
 msgid "Give each person on IRC a different color"
 msgstr "给 IRC 上的每名用户使用一种不同的颜色"
 
-#: src/fe-gtk/setup.c:161
+#: ../src/fe-gtk/setup.c:157
 msgid "Indent nick names"
-msgstr "缩进昵称"
+msgstr "昵称缩进"
 
-#: src/fe-gtk/setup.c:161
+#: ../src/fe-gtk/setup.c:157
 msgid "Make nick names right-justified"
 msgstr "让昵称右侧对齐"
 
-#: src/fe-gtk/setup.c:163
-msgid "Transparent background"
-msgstr "透明背景"
-
-#: src/fe-gtk/setup.c:164 src/fe-gtk/setup.c:172
+#: ../src/fe-gtk/setup.c:158
 msgid "Show marker line"
 msgstr "显示标记线"
 
-#: src/fe-gtk/setup.c:164 src/fe-gtk/setup.c:172
+#: ../src/fe-gtk/setup.c:158
 msgid "Insert a red line after the last read text."
 msgstr "在最后读取的文本后添加一条红线。"
 
-#: src/fe-gtk/setup.c:165 src/fe-gtk/setup.c:173
+#: ../src/fe-gtk/setup.c:159
 msgid "Background image:"
 msgstr "背景图像:"
 
-#: src/fe-gtk/setup.c:167
+#: ../src/fe-gtk/setup.c:161
 msgid "Transparency Settings"
 msgstr "透明度设置"
 
-#: src/fe-gtk/setup.c:168
-msgid "Red:"
-msgstr "红:"
-
-#: src/fe-gtk/setup.c:169
-msgid "Green:"
-msgstr "绿:"
-
-#: src/fe-gtk/setup.c:170
-msgid "Blue:"
-msgstr "蓝:"
+#: ../src/fe-gtk/setup.c:162
+msgid "Window Opacity:"
+msgstr "窗口透明度:"
 
-#: src/fe-gtk/setup.c:176 src/fe-gtk/setup.c:549
+#: ../src/fe-gtk/setup.c:164 ../src/fe-gtk/setup.c:538
 msgid "Time Stamps"
 msgstr "时间戳"
 
-#: src/fe-gtk/setup.c:177
+#: ../src/fe-gtk/setup.c:165
 msgid "Enable time stamps"
 msgstr "启用时间戳"
 
-#: src/fe-gtk/setup.c:178
+#: ../src/fe-gtk/setup.c:166
 msgid "Time stamp format:"
 msgstr "时间戳格式:"
 
-#: src/fe-gtk/setup.c:180 src/fe-gtk/setup.c:553
+#: ../src/fe-gtk/setup.c:168 ../src/fe-gtk/setup.c:542
 msgid "See the strftime MSDN article for details."
-msgstr ""
+msgstr "请参考 MSDN 上 strftime 的详细解释。"
 
-#: src/fe-gtk/setup.c:182 src/fe-gtk/setup.c:555
+#: ../src/fe-gtk/setup.c:170 ../src/fe-gtk/setup.c:544
 msgid "See the strftime manpage for details."
-msgstr ""
+msgstr "请参考手册页上 strftime 的详细解释。"
 
-#: src/fe-gtk/setup.c:185
+#: ../src/fe-gtk/setup.c:173
 msgid "Title Bar"
-msgstr ""
+msgstr "标题栏"
 
-#: src/fe-gtk/setup.c:186
+#: ../src/fe-gtk/setup.c:174
 msgid "Show channel modes"
-msgstr ""
+msgstr "显示频道模式"
 
-#: src/fe-gtk/setup.c:187
+#: ../src/fe-gtk/setup.c:175
 msgid "Show number of users"
-msgstr ""
+msgstr "显示用户数"
 
-#: src/fe-gtk/setup.c:194 src/fe-gtk/setup.c:245
+#: ../src/fe-gtk/setup.c:182 ../src/fe-gtk/setup.c:222
 msgid "A-Z"
 msgstr "A-Z"
 
-#: src/fe-gtk/setup.c:195
+#: ../src/fe-gtk/setup.c:183
 msgid "Last-spoke order"
 msgstr "按最后发言时间"
 
-#: src/fe-gtk/setup.c:201
+#: ../src/fe-gtk/setup.c:189
 msgid "Input Box"
-msgstr ""
+msgstr "输入框"
 
-#: src/fe-gtk/setup.c:202 src/fe-gtk/setup.c:277
+#: ../src/fe-gtk/setup.c:190 ../src/fe-gtk/setup.c:254
 msgid "Use the Text box font and colors"
 msgstr "使用文本框字体及颜色"
 
-#: src/fe-gtk/setup.c:203
+#: ../src/fe-gtk/setup.c:191
+msgid "Render colors and attributes"
+msgstr "渲染色彩和属性"
+
+#: ../src/fe-gtk/setup.c:192
 msgid "Show nick box"
-msgstr ""
+msgstr "显示昵称框"
 
-#: src/fe-gtk/setup.c:204
+#: ../src/fe-gtk/setup.c:193
 msgid "Show user mode icon in nick box"
-msgstr ""
+msgstr "在昵称框中显示用户模式图标"
 
-#: src/fe-gtk/setup.c:206 src/fe-gtk/setup.c:215
+#: ../src/fe-gtk/setup.c:194
 msgid "Spell checking"
 msgstr "拼写检查"
 
-#: src/fe-gtk/setup.c:207
+#: ../src/fe-gtk/setup.c:195
 msgid "Dictionaries to use:"
-msgstr ""
+msgstr "要使用的字典:"
 
-#: src/fe-gtk/setup.c:209
+#: ../src/fe-gtk/setup.c:197
 msgid ""
-"Use language codes (as in \"share\\myspell\\dicts\").\n"
+"Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
+msgstr "要使用的语言代码 (位于 \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" 中).\n以英文逗号分隔每一项。"
 
-#: src/fe-gtk/setup.c:211
+#: ../src/fe-gtk/setup.c:199
 msgid "Use language codes. Separate multiple entries with commas."
-msgstr ""
+msgstr "要使用的语言代码,以英文逗号分隔每一项。"
 
-#: src/fe-gtk/setup.c:219
+#: ../src/fe-gtk/setup.c:202
 msgid "Nick Completion"
 msgstr "昵称自动补全"
 
-#: src/fe-gtk/setup.c:220
+#: ../src/fe-gtk/setup.c:203
 msgid "Nick completion suffix:"
 msgstr "昵称自动补全后缀:"
 
-#: src/fe-gtk/setup.c:221
+#: ../src/fe-gtk/setup.c:204
 msgid "Nick completion sorted:"
 msgstr "昵称排序:"
 
-#: src/fe-gtk/setup.c:222
+#: ../src/fe-gtk/setup.c:205
 msgid "Nick completion amount:"
-msgstr ""
+msgstr "昵称自动补全量:"
 
-#: src/fe-gtk/setup.c:222
+#: ../src/fe-gtk/setup.c:205
 msgid "Threshold of nicks to start listing instead of completing"
-msgstr ""
+msgstr "开始列出昵称而不是补全昵称的"
 
-#: src/fe-gtk/setup.c:222
+#: ../src/fe-gtk/setup.c:205
 msgid "nicks."
-msgstr ""
-
-#: src/fe-gtk/setup.c:225
-msgid "Input Box Codes"
-msgstr "输入框编码"
+msgstr "阈值。"
 
-#: src/fe-gtk/setup.c:226
-#, c-format
-msgid "Interpret %nnn as an ASCII value"
-msgstr "把 %nnn 解释为 ASCII 值"
-
-#: src/fe-gtk/setup.c:227
-msgid "Interpret %C, %B as Color, Bold etc"
-msgstr "转换 %C、%B 为颜色、粗体等"
-
-#: src/fe-gtk/setup.c:236
+#: ../src/fe-gtk/setup.c:213
 msgid "Graphical"
-msgstr ""
+msgstr "图形化的"
 
-#: src/fe-gtk/setup.c:244
+#: ../src/fe-gtk/setup.c:221
 msgid "A-Z, Ops first"
 msgstr "A-Z,管理员在最先"
 
-#: src/fe-gtk/setup.c:246
+#: ../src/fe-gtk/setup.c:223
 msgid "Z-A, Ops last"
 msgstr "Z-A,管理员在最后"
 
-#: src/fe-gtk/setup.c:247
+#: ../src/fe-gtk/setup.c:224
 msgid "Z-A"
 msgstr "Z-A"
 
-#: src/fe-gtk/setup.c:248
+#: ../src/fe-gtk/setup.c:225
 msgid "Unsorted"
 msgstr "不排序"
 
-#: src/fe-gtk/setup.c:254 src/fe-gtk/setup.c:266
+#: ../src/fe-gtk/setup.c:231 ../src/fe-gtk/setup.c:243
 msgid "Left (Upper)"
 msgstr "左上"
 
-#: src/fe-gtk/setup.c:255 src/fe-gtk/setup.c:267
+#: ../src/fe-gtk/setup.c:232 ../src/fe-gtk/setup.c:244
 msgid "Left (Lower)"
 msgstr "左下"
 
-#: src/fe-gtk/setup.c:256 src/fe-gtk/setup.c:268
+#: ../src/fe-gtk/setup.c:233 ../src/fe-gtk/setup.c:245
 msgid "Right (Upper)"
 msgstr "右上"
 
-#: src/fe-gtk/setup.c:257 src/fe-gtk/setup.c:269
+#: ../src/fe-gtk/setup.c:234 ../src/fe-gtk/setup.c:246
 msgid "Right (Lower)"
 msgstr "右下"
 
-#: src/fe-gtk/setup.c:258
+#: ../src/fe-gtk/setup.c:235
 msgid "Top"
 msgstr "顶部"
 
-#: src/fe-gtk/setup.c:259
+#: ../src/fe-gtk/setup.c:236
 msgid "Bottom"
 msgstr "底部"
 
-#: src/fe-gtk/setup.c:260
+#: ../src/fe-gtk/setup.c:237
 msgid "Hidden"
 msgstr "隐藏"
 
-#: src/fe-gtk/setup.c:275
+#: ../src/fe-gtk/setup.c:252
 msgid "User List"
 msgstr "用户列表"
 
-#: src/fe-gtk/setup.c:276
+#: ../src/fe-gtk/setup.c:253
 msgid "Show hostnames in user list"
 msgstr "在用户列表中显示主机名"
 
-#: src/fe-gtk/setup.c:278
+#: ../src/fe-gtk/setup.c:255
 msgid "Show icons for user modes"
-msgstr ""
+msgstr "显示用户模式的图标"
 
-#: src/fe-gtk/setup.c:278
+#: ../src/fe-gtk/setup.c:255
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
+msgstr "在用户列表中使用图形化图标,而不是文本图标"
 
-#: src/fe-gtk/setup.c:279
+#: ../src/fe-gtk/setup.c:256
 msgid "Color nicknames in userlist"
-msgstr ""
+msgstr "用户列表中的昵称着色"
 
-#: src/fe-gtk/setup.c:279
+#: ../src/fe-gtk/setup.c:256
 msgid "Will color nicknames the same as in chat."
-msgstr ""
+msgstr "昵称色彩与聊天窗口中一致。"
 
-#: src/fe-gtk/setup.c:280
+#: ../src/fe-gtk/setup.c:257
 msgid "Show user count in channels"
-msgstr ""
+msgstr "显示当前频道用户数"
 
-#: src/fe-gtk/setup.c:282
+#. {ST_TOGGLE, N_("Resizable user list"),
+#. P_OFFINTNL(hex_gui_ulist_resizable),0,0,0},
+#: ../src/fe-gtk/setup.c:259
 msgid "User list sorted by:"
 msgstr "用户列表排列方式:"
 
-#: src/fe-gtk/setup.c:283
+#: ../src/fe-gtk/setup.c:260
 msgid "Show user list at:"
 msgstr "显示用户列表于:"
 
-#: src/fe-gtk/setup.c:285
+#: ../src/fe-gtk/setup.c:262
 msgid "Away Tracking"
-msgstr ""
+msgstr "追踪离开状态"
 
-#: src/fe-gtk/setup.c:286
+#: ../src/fe-gtk/setup.c:263
 msgid "Track the Away status of users and mark them in a different color"
 msgstr "追踪用户的离开状态并且以不同颜色标记"
 
-#: src/fe-gtk/setup.c:287
+#: ../src/fe-gtk/setup.c:264
 msgid "On channels smaller than:"
 msgstr "在小于此值的频道里:"
 
-#: src/fe-gtk/setup.c:289
+#: ../src/fe-gtk/setup.c:266
 msgid "Action Upon Double Click"
 msgstr "双击时的动作"
 
-#: src/fe-gtk/setup.c:292
+#: ../src/fe-gtk/setup.c:269
 msgid "Extra Gadgets"
-msgstr ""
+msgstr "附加小程序"
 
-#: src/fe-gtk/setup.c:293
+#: ../src/fe-gtk/setup.c:270
 msgid "Lag meter:"
-msgstr ""
+msgstr "延时表:"
 
-#: src/fe-gtk/setup.c:294
+#: ../src/fe-gtk/setup.c:271
 msgid "Throttle meter:"
-msgstr ""
+msgstr "流量表;"
 
-#: src/fe-gtk/setup.c:301
+#: ../src/fe-gtk/setup.c:278
 msgid "Windows"
 msgstr "窗口"
 
-#: src/fe-gtk/setup.c:302 src/fe-gtk/setup.c:324
+#: ../src/fe-gtk/setup.c:279 ../src/fe-gtk/setup.c:301
 msgid "Tabs"
 msgstr "标签页"
 
-#: src/fe-gtk/setup.c:309
+#: ../src/fe-gtk/setup.c:286
 msgid "Always"
 msgstr "总是"
 
-#: src/fe-gtk/setup.c:310
+#: ../src/fe-gtk/setup.c:287
 msgid "Only requested tabs"
 msgstr "只有请求的标签页"
 
-#: src/fe-gtk/setup.c:316
+#: ../src/fe-gtk/setup.c:293
 msgid "Automatic"
-msgstr ""
+msgstr "自动"
 
-#: src/fe-gtk/setup.c:317
+#: ../src/fe-gtk/setup.c:294
 msgid "In an extra tab"
-msgstr ""
+msgstr "在另外的标签页中"
 
-#: src/fe-gtk/setup.c:318
+#: ../src/fe-gtk/setup.c:295
 msgid "In the front tab"
-msgstr ""
+msgstr "在最前的标签页中"
 
-#: src/fe-gtk/setup.c:326
+#. 0 tabs
+#. 1 reserved
+#: ../src/fe-gtk/setup.c:303
 msgid "Tree"
 msgstr "树状图"
 
-#: src/fe-gtk/setup.c:333
+#. {ST_HEADER,	N_("Channel Switcher"),0,0,0},
+#: ../src/fe-gtk/setup.c:310
 msgid "Switcher type:"
 msgstr "转换器类型:"
 
-#: src/fe-gtk/setup.c:334
+#: ../src/fe-gtk/setup.c:311
 msgid "Open an extra tab for server messages"
 msgstr "打开额外的标签页存放服务器信息"
 
-#: src/fe-gtk/setup.c:335
+#: ../src/fe-gtk/setup.c:312
 msgid "Open a new tab when you receive a private message"
 msgstr "当您收到私聊消息时打开新的标签页"
 
-#: src/fe-gtk/setup.c:336
+#: ../src/fe-gtk/setup.c:313
 msgid "Sort tabs in alphabetical order"
 msgstr "按字母表顺序排序标签页"
 
-#: src/fe-gtk/setup.c:337
+#: ../src/fe-gtk/setup.c:314
 msgid "Show icons in the channel tree"
-msgstr ""
+msgstr "在频道树中显示图标"
 
-#: src/fe-gtk/setup.c:338
+#: ../src/fe-gtk/setup.c:315
 msgid "Show dotted lines in the channel tree"
-msgstr ""
+msgstr "在频道树中显示虚线"
 
-#: src/fe-gtk/setup.c:339
+#: ../src/fe-gtk/setup.c:316
+msgid "Scroll mouse-wheel to change tabs"
+msgstr "用鼠标滚轮改变当前标签页"
+
+#: ../src/fe-gtk/setup.c:317
 msgid "Smaller text"
 msgstr "小字"
 
-#: src/fe-gtk/setup.c:340
+#: ../src/fe-gtk/setup.c:318
 msgid "Focus new tabs:"
 msgstr "聚焦到新标签页:"
 
-#: src/fe-gtk/setup.c:341
+#: ../src/fe-gtk/setup.c:319
 msgid "Placement of notices:"
-msgstr ""
+msgstr "放置通知:"
 
-#: src/fe-gtk/setup.c:342
+#: ../src/fe-gtk/setup.c:320
 msgid "Show channel switcher at:"
 msgstr "显示频道转换器于:"
 
-#: src/fe-gtk/setup.c:343
+#: ../src/fe-gtk/setup.c:321
 msgid "Shorten tab labels to:"
 msgstr "缩短标签页标签页至:"
 
-#: src/fe-gtk/setup.c:343
+#: ../src/fe-gtk/setup.c:321
 msgid "letters."
 msgstr "个字母。"
 
-#: src/fe-gtk/setup.c:345
+#: ../src/fe-gtk/setup.c:323
 msgid "Tabs or Windows"
 msgstr "标签页或窗口"
 
-#: src/fe-gtk/setup.c:346
+#: ../src/fe-gtk/setup.c:324
 msgid "Open channels in:"
 msgstr "打开频道于:"
 
-#: src/fe-gtk/setup.c:347
+#: ../src/fe-gtk/setup.c:325
 msgid "Open dialogs in:"
 msgstr "打开对话框于:"
 
-#: src/fe-gtk/setup.c:348
+#: ../src/fe-gtk/setup.c:326
 msgid "Open utilities in:"
 msgstr "打开工具于:"
 
-#: src/fe-gtk/setup.c:348
+#: ../src/fe-gtk/setup.c:326
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
 msgstr "打开 DCC、忽略、通知等动作时使用标签页还是窗口?"
 
-#: src/fe-gtk/setup.c:355
+#: ../src/fe-gtk/setup.c:333
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
-#: src/fe-gtk/setup.c:356
+#: ../src/fe-gtk/setup.c:334
 msgid "Scrollback"
-msgstr ""
+msgstr "往回滚动"
 
-#: src/fe-gtk/setup.c:364
+#: ../src/fe-gtk/setup.c:342
 msgid "Ask for confirmation"
-msgstr ""
+msgstr "请求确认"
 
-#: src/fe-gtk/setup.c:365
+#: ../src/fe-gtk/setup.c:343
 msgid "Ask for download folder"
-msgstr ""
+msgstr "请求指定下载文件夹"
 
-#: src/fe-gtk/setup.c:366
+#: ../src/fe-gtk/setup.c:344
 msgid "Save without interaction"
-msgstr ""
+msgstr "直接保存无需交互"
 
-#: src/fe-gtk/setup.c:372
+#: ../src/fe-gtk/setup.c:350
 msgid "Files and Directories"
 msgstr "文件和目录"
 
-#: src/fe-gtk/setup.c:373
+#: ../src/fe-gtk/setup.c:351
 msgid "Auto accept file offers:"
 msgstr "自动接受文件传输:"
 
-#: src/fe-gtk/setup.c:374
+#: ../src/fe-gtk/setup.c:352
 msgid "Download files to:"
 msgstr "把文件下载到:"
 
-#: src/fe-gtk/setup.c:375
+#: ../src/fe-gtk/setup.c:353
 msgid "Move completed files to:"
-msgstr "移动完成下载的文件到:"
+msgstr "将完成下载的文件移动到:"
 
-#: src/fe-gtk/setup.c:376
+#: ../src/fe-gtk/setup.c:354
 msgid "Save nick name in filenames"
 msgstr "把昵称存入文件名"
 
-#: src/fe-gtk/setup.c:378
+#: ../src/fe-gtk/setup.c:356
 msgid "Auto Open DCC Windows"
 msgstr "自动打开 DDC 窗口"
 
-#: src/fe-gtk/setup.c:379
+#: ../src/fe-gtk/setup.c:357
 msgid "Send window"
 msgstr "发送窗口"
 
-#: src/fe-gtk/setup.c:380
+#: ../src/fe-gtk/setup.c:358
 msgid "Receive window"
 msgstr "接收窗口"
 
-#: src/fe-gtk/setup.c:381
+#: ../src/fe-gtk/setup.c:359
 msgid "Chat window"
 msgstr "聊天窗口"
 
-#: src/fe-gtk/setup.c:383
+#: ../src/fe-gtk/setup.c:361
 msgid "Maximum File Transfer Speeds (bytes per second)"
 msgstr "最大文件传输速度(字节每秒)"
 
-#: src/fe-gtk/setup.c:384
+#: ../src/fe-gtk/setup.c:362
 msgid "One upload:"
 msgstr "每个上传任务:"
 
-#: src/fe-gtk/setup.c:385 src/fe-gtk/setup.c:387
+#: ../src/fe-gtk/setup.c:363 ../src/fe-gtk/setup.c:365
 msgid "Maximum speed for one transfer"
 msgstr "一个传送进程的最大速度"
 
-#: src/fe-gtk/setup.c:386
+#: ../src/fe-gtk/setup.c:364
 msgid "One download:"
 msgstr "每个下载任务:"
 
-#: src/fe-gtk/setup.c:388
+#: ../src/fe-gtk/setup.c:366
 msgid "All uploads combined:"
 msgstr "所有上传:"
 
-#: src/fe-gtk/setup.c:389 src/fe-gtk/setup.c:391
+#: ../src/fe-gtk/setup.c:367 ../src/fe-gtk/setup.c:369
 msgid "Maximum speed for all files"
 msgstr "所有文件的最大速度"
 
-#: src/fe-gtk/setup.c:390
+#: ../src/fe-gtk/setup.c:368
 msgid "All downloads combined:"
 msgstr "所有下载"
 
-#: src/fe-gtk/setup.c:418 src/fe-gtk/setup.c:461 src/fe-gtk/setup.c:1851
+#: ../src/fe-gtk/setup.c:396 ../src/fe-gtk/setup.c:449
+#: ../src/fe-gtk/setup.c:1815
 msgid "Alerts"
 msgstr "提示"
 
-#: src/fe-gtk/setup.c:422 src/fe-gtk/setup.c:464
+#: ../src/fe-gtk/setup.c:400 ../src/fe-gtk/setup.c:452
 msgid "Show tray balloons on:"
-msgstr "显示托盘气泡提示于:"
+msgstr "托盘气泡提示显示于:"
 
-#: src/fe-gtk/setup.c:424
+#: ../src/fe-gtk/setup.c:402
 msgid "Blink tray icon on:"
-msgstr "闪烁托盘图标于:"
+msgstr "托盘图标闪烁于:"
+
+#: ../src/fe-gtk/setup.c:404
+msgid "Bounce dock icon on:"
+msgstr ""
 
-#: src/fe-gtk/setup.c:425 src/fe-gtk/setup.c:465
+#: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:453
 msgid "Blink task bar on:"
-msgstr "闪烁任务栏图标于:"
+msgstr "任务栏图标闪烁于:"
 
-#: src/fe-gtk/setup.c:427 src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:466
+#: ../src/fe-gtk/setup.c:411 ../src/fe-gtk/setup.c:414
+#: ../src/fe-gtk/setup.c:416 ../src/fe-gtk/setup.c:454
 msgid "Make a beep sound on:"
 msgstr "响铃于:"
 
-#: src/fe-gtk/setup.c:427
+#: ../src/fe-gtk/setup.c:411
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
+msgstr "在选择的事件上播放系统 \"即时消息提醒\" 声音"
 
-#: src/fe-gtk/setup.c:429
+#: ../src/fe-gtk/setup.c:414
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
+msgstr "在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
+
+#: ../src/fe-gtk/setup.c:416
+msgid "Play a GTK beep upon the selected events"
+msgstr "在已选择的事件上播放 GTK beep 声"
 
-#: src/fe-gtk/setup.c:432 src/fe-gtk/setup.c:468
+#: ../src/fe-gtk/setup.c:420 ../src/fe-gtk/setup.c:456
 msgid "Omit alerts when marked as being away"
-msgstr ""
+msgstr "标记为离开时不提醒"
 
-#: src/fe-gtk/setup.c:433 src/fe-gtk/setup.c:469
+#: ../src/fe-gtk/setup.c:421 ../src/fe-gtk/setup.c:457
 msgid "Omit alerts while the window is focused"
-msgstr ""
+msgstr "窗口获得焦点时不提醒"
 
-#: src/fe-gtk/setup.c:435
+#: ../src/fe-gtk/setup.c:423
 msgid "Tray Behavior"
-msgstr ""
+msgstr "托盘行为"
 
-#: src/fe-gtk/setup.c:437 src/fe-gtk/setup.c:439
+#: ../src/fe-gtk/setup.c:425 ../src/fe-gtk/setup.c:427
 msgid "Enable system tray icon"
 msgstr "激活系统托盘图标"
 
-#: src/fe-gtk/setup.c:441
+#: ../src/fe-gtk/setup.c:429
 msgid "Minimize to tray"
-msgstr ""
+msgstr "最小化至系统托盘"
 
-#: src/fe-gtk/setup.c:442
+#: ../src/fe-gtk/setup.c:430
 msgid "Close to tray"
-msgstr ""
+msgstr "关闭到系统托盘"
 
-#: src/fe-gtk/setup.c:443
+#: ../src/fe-gtk/setup.c:431
 msgid "Automatically mark away/back"
-msgstr ""
+msgstr "自动取消离开状态"
 
-#: src/fe-gtk/setup.c:443
+#: ../src/fe-gtk/setup.c:431
 msgid "Automatically change status when hiding to tray."
-msgstr ""
+msgstr "在隐藏到托盘后自动改变状态。"
 
-#: src/fe-gtk/setup.c:445
+#: ../src/fe-gtk/setup.c:433
 msgid "Only show tray balloons when hidden or iconified"
-msgstr ""
+msgstr "仅在隐藏或缩小为图标是显示托盘气泡"
 
-#: src/fe-gtk/setup.c:448 src/fe-gtk/setup.c:471
+#: ../src/fe-gtk/setup.c:436 ../src/fe-gtk/setup.c:459
 msgid "Highlighted Messages"
 msgstr "高亮显示消息"
 
-#: src/fe-gtk/setup.c:449 src/fe-gtk/setup.c:472
+#: ../src/fe-gtk/setup.c:437 ../src/fe-gtk/setup.c:460
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr "高亮消息是当您的昵称被提到时所显示的消息,同时还包括:"
+msgstr "高亮消息是当您的昵称被提到时所显示的消息,同时还显示:"
 
-#: src/fe-gtk/setup.c:451 src/fe-gtk/setup.c:474
+#: ../src/fe-gtk/setup.c:439 ../src/fe-gtk/setup.c:462
 msgid "Extra words to highlight:"
 msgstr "需要高亮显示的其他单词:"
 
-#: src/fe-gtk/setup.c:452 src/fe-gtk/setup.c:475
+#: ../src/fe-gtk/setup.c:440 ../src/fe-gtk/setup.c:463
 msgid "Nick names not to highlight:"
 msgstr "不高亮显示的昵称:"
 
-#: src/fe-gtk/setup.c:453 src/fe-gtk/setup.c:476
+#: ../src/fe-gtk/setup.c:441 ../src/fe-gtk/setup.c:464
 msgid "Nick names to always highlight:"
 msgstr "总是高亮显示的昵称:"
 
-#: src/fe-gtk/setup.c:454 src/fe-gtk/setup.c:477
+#: ../src/fe-gtk/setup.c:442 ../src/fe-gtk/setup.c:465
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
 msgstr "请用逗号分隔多个词组。\n可以使用通配符。"
 
-#: src/fe-gtk/setup.c:484
+#: ../src/fe-gtk/setup.c:472
 msgid "Default Messages"
 msgstr "默认信息"
 
-#: src/fe-gtk/setup.c:485
+#: ../src/fe-gtk/setup.c:473
 msgid "Quit:"
 msgstr "退出:"
 
-#: src/fe-gtk/setup.c:486
+#: ../src/fe-gtk/setup.c:474
 msgid "Leave channel:"
 msgstr "离开频道:"
 
-#: src/fe-gtk/setup.c:487
+#: ../src/fe-gtk/setup.c:475
 msgid "Away:"
 msgstr "离开:"
 
-#: src/fe-gtk/setup.c:489
+#: ../src/fe-gtk/setup.c:477
 msgid "Away"
 msgstr "离开"
 
-#: src/fe-gtk/setup.c:490
+#: ../src/fe-gtk/setup.c:478
 msgid "Show away once"
 msgstr "只显示离开一次"
 
-#: src/fe-gtk/setup.c:490
+#: ../src/fe-gtk/setup.c:478
 msgid "Show identical away messages only once."
-msgstr ""
+msgstr "同样的离开信息只显示一次"
 
-#: src/fe-gtk/setup.c:491
+#: ../src/fe-gtk/setup.c:479
 msgid "Automatically unmark away"
 msgstr "自动取消离开状态"
 
-#: src/fe-gtk/setup.c:491
+#: ../src/fe-gtk/setup.c:479
 msgid "Unmark yourself as away before sending messages."
-msgstr ""
+msgstr "发送信息前取消您的离开状态"
 
-#: src/fe-gtk/setup.c:493 src/fe-gtk/setup.c:525
+#: ../src/fe-gtk/setup.c:481 ../src/fe-gtk/setup.c:514
 msgid "Miscellaneous"
-msgstr ""
+msgstr "杂项"
 
-#: src/fe-gtk/setup.c:494
+#: ../src/fe-gtk/setup.c:482
 msgid "Display MODEs in raw form"
 msgstr "使用原始格式显示模式"
 
-#: src/fe-gtk/setup.c:495
+#: ../src/fe-gtk/setup.c:483
 msgid "WHOIS on notify"
-msgstr ""
+msgstr "通知列表 Whois"
 
-#: src/fe-gtk/setup.c:495
+#: ../src/fe-gtk/setup.c:483
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
+msgstr "当您通知列表中的某位用户上线时发送 /WHOIS 命令"
 
-#: src/fe-gtk/setup.c:496
+#: ../src/fe-gtk/setup.c:484
 msgid "Hide join and part messages"
 msgstr "隐藏进入/离开信息"
 
-#: src/fe-gtk/setup.c:496
+#: ../src/fe-gtk/setup.c:484
 msgid "Hide channel join/part messages by default."
+msgstr "默认隐藏频道里的进入/离开信息"
+
+#: ../src/fe-gtk/setup.c:485
+msgid "Hide nick change messages"
 msgstr ""
 
-#: src/fe-gtk/setup.c:503
+#: ../src/fe-gtk/setup.c:492
 msgid "*!*@*.host"
-msgstr ""
+msgstr "*!*@*.host"
 
-#: src/fe-gtk/setup.c:504
+#: ../src/fe-gtk/setup.c:493
 msgid "*!*@domain"
-msgstr ""
+msgstr "*!*@domain"
 
-#: src/fe-gtk/setup.c:505
+#: ../src/fe-gtk/setup.c:494
 msgid "*!*user@*.host"
-msgstr ""
+msgstr "*!*user@*.host"
 
-#: src/fe-gtk/setup.c:506
+#: ../src/fe-gtk/setup.c:495
 msgid "*!*user@domain"
-msgstr ""
+msgstr "*!*user@domain"
 
-#: src/fe-gtk/setup.c:512
+#: ../src/fe-gtk/setup.c:501
 msgid "Auto Copy Behavior"
-msgstr ""
+msgstr "自动复制行为"
 
-#: src/fe-gtk/setup.c:513
+#: ../src/fe-gtk/setup.c:502
 msgid "Automatically copy selected text"
-msgstr ""
+msgstr "自动复制已选中文本"
 
-#: src/fe-gtk/setup.c:514
+#: ../src/fe-gtk/setup.c:503
 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 ""
+msgstr "在释放鼠标左键时将选中文本复制到剪贴板。否则,使用 CONTROL-SHIFT-C 将选中文本复制到剪贴板。"
 
-#: src/fe-gtk/setup.c:517
+#: ../src/fe-gtk/setup.c:506
 msgid "Automatically include time stamps"
-msgstr ""
+msgstr "自动加上时间戳"
 
-#: src/fe-gtk/setup.c:518
+#: ../src/fe-gtk/setup.c:507
 msgid ""
 "Automatically include time stamps in copied lines of text. Otherwise, "
 "include time stamps if the SHIFT key is held down while selecting."
-msgstr ""
+msgstr "自动在复制的每行文本后加上时间戳,否则,在选择时按下 SHIFT 键后包含时间戳。"
 
-#: src/fe-gtk/setup.c:520
+#: ../src/fe-gtk/setup.c:509
 msgid "Automatically include color information"
-msgstr ""
+msgstr "自动加上颜色信息"
 
-#: src/fe-gtk/setup.c:521
+#: ../src/fe-gtk/setup.c:510
 msgid ""
 "Automatically include color information in copied lines of text.  Otherwise,"
 " include color information if the CONTROL key is held down while selecting."
-msgstr ""
+msgstr "自动在复制的每行文本中加上颜色信息,否则,在选择时按下 CONTROL 键后包含颜色信息。"
 
-#: src/fe-gtk/setup.c:526
+#: ../src/fe-gtk/setup.c:515
 msgid "Real name:"
-msgstr ""
+msgstr "真实姓名:"
 
-#: src/fe-gtk/setup.c:528
+#: ../src/fe-gtk/setup.c:517
 msgid "Alternative fonts:"
-msgstr ""
+msgstr "备用字体:"
 
-#: src/fe-gtk/setup.c:528
+#: ../src/fe-gtk/setup.c:517
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr ""
+msgstr "分隔多项时使用英文逗号,逗号两侧无空格。"
 
-#: src/fe-gtk/setup.c:530
+#: ../src/fe-gtk/setup.c:519
 msgid "Display lists in compact mode"
-msgstr ""
+msgstr "在紧凑模式中显示列表"
 
-#: src/fe-gtk/setup.c:530
+#: ../src/fe-gtk/setup.c:519
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
+msgstr "减少用户列表/用户频道树的行与行之间的空隙。"
 
-#: src/fe-gtk/setup.c:531
+#: ../src/fe-gtk/setup.c:520
 msgid "Use server time if supported"
-msgstr ""
+msgstr "在支持的情况下使用服务器时间"
 
-#: src/fe-gtk/setup.c:531
+#: ../src/fe-gtk/setup.c:520
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
+msgstr "在支持服务器时间扩展的情况下,显示从服务器获取的时间戳信息。"
 
-#: src/fe-gtk/setup.c:532
+#: ../src/fe-gtk/setup.c:521
 msgid "Automatically reconnect to servers on disconnect"
-msgstr ""
+msgstr "断线重连"
 
-#: src/fe-gtk/setup.c:533
+#: ../src/fe-gtk/setup.c:522
 msgid "Auto reconnect delay:"
 msgstr "自动重连间隔:"
 
-#: src/fe-gtk/setup.c:534
+#: ../src/fe-gtk/setup.c:523
 msgid "Auto join delay:"
-msgstr ""
+msgstr "自动重连间隔:"
 
-#: src/fe-gtk/setup.c:535
+#: ../src/fe-gtk/setup.c:524
 msgid "Ban Type:"
-msgstr ""
+msgstr "屏蔽类型:"
 
-#: src/fe-gtk/setup.c:535
+#: ../src/fe-gtk/setup.c:524
 msgid ""
 "Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
-msgstr ""
+msgstr "尝试在屏蔽或者设置静默时使用该屏蔽掩码 (需要 irc_who_join)。"
 
-#: src/fe-gtk/setup.c:542 src/fe-gtk/setup.c:1853
+#: ../src/fe-gtk/setup.c:531 ../src/fe-gtk/setup.c:1817
 msgid "Logging"
 msgstr "聊天记录"
 
-#: src/fe-gtk/setup.c:543
+#: ../src/fe-gtk/setup.c:532
 msgid "Display scrollback from previous session"
-msgstr "显示上一会话时的信息会滚"
+msgstr "显示上一会话时的信息回滚"
 
-#: src/fe-gtk/setup.c:544
+#: ../src/fe-gtk/setup.c:533
 msgid "Scrollback lines:"
-msgstr "回滚行数:"
+msgstr "往回滚动的行数:"
 
-#: src/fe-gtk/setup.c:545
+#: ../src/fe-gtk/setup.c:534
 msgid "Enable logging of conversations to disk"
-msgstr "允许记录对话内容到磁盘"
+msgstr "允许对话记录写入磁盘"
 
-#: src/fe-gtk/setup.c:546
+#: ../src/fe-gtk/setup.c:535
 msgid "Log filename:"
 msgstr "聊天记录文件名称:"
 
-#: src/fe-gtk/setup.c:547
+#: ../src/fe-gtk/setup.c:536
 #, c-format
 msgid "%s=Server %c=Channel %n=Network."
 msgstr "%s=服务器 %c=频道 %n=网络。"
 
-#: src/fe-gtk/setup.c:550
+#: ../src/fe-gtk/setup.c:539
 msgid "Insert timestamps in logs"
-msgstr "在聊天记录中进入时间戳"
+msgstr "在聊天记录中插入时间戳"
 
-#: src/fe-gtk/setup.c:551
+#: ../src/fe-gtk/setup.c:540
 msgid "Log timestamp format:"
 msgstr "聊天记录时间戳格式:"
 
-#: src/fe-gtk/setup.c:558
+#: ../src/fe-gtk/setup.c:547
 msgid "URLs"
 msgstr "URL"
 
-#: src/fe-gtk/setup.c:559
+#: ../src/fe-gtk/setup.c:548
 msgid "Enable logging of URLs to disk"
-msgstr ""
+msgstr "允许URL记录写入磁盘"
 
-#: src/fe-gtk/setup.c:560
+#: ../src/fe-gtk/setup.c:549
 msgid "Enable URL grabber"
-msgstr ""
+msgstr "开启 URL 抓取程序"
 
-#: src/fe-gtk/setup.c:561
+#: ../src/fe-gtk/setup.c:550
 msgid "Maximum number of URLs to grab:"
-msgstr ""
+msgstr "抓取最多的 URL 条目数:"
 
-#: src/fe-gtk/setup.c:568
+#: ../src/fe-gtk/setup.c:557
 msgid "(Disabled)"
 msgstr "(已禁用)"
 
-#: src/fe-gtk/setup.c:569
+#: ../src/fe-gtk/setup.c:558
 msgid "Wingate"
 msgstr "Wingate"
 
-#: src/fe-gtk/setup.c:570
+#: ../src/fe-gtk/setup.c:559
 msgid "Socks4"
 msgstr "Socks4"
 
-#: src/fe-gtk/setup.c:571
+#: ../src/fe-gtk/setup.c:560
 msgid "Socks5"
 msgstr "Socks5"
 
-#: src/fe-gtk/setup.c:572
+#: ../src/fe-gtk/setup.c:561
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/fe-gtk/setup.c:574
+#: ../src/fe-gtk/setup.c:563
 msgid "MS Proxy (ISA)"
 msgstr "MS Proxy (ISA)"
 
-#: src/fe-gtk/setup.c:577
+#: ../src/fe-gtk/setup.c:566
 msgid "Auto"
-msgstr ""
+msgstr "自动"
 
-#: src/fe-gtk/setup.c:584
+#: ../src/fe-gtk/setup.c:573
 msgid "All Connections"
 msgstr "所有连接"
 
-#: src/fe-gtk/setup.c:585
+#: ../src/fe-gtk/setup.c:574
 msgid "IRC Server Only"
 msgstr "仅 IRC 服务器"
 
-#: src/fe-gtk/setup.c:586
+#: ../src/fe-gtk/setup.c:575
 msgid "DCC Get Only"
 msgstr "仅 DCC Get"
 
-#: src/fe-gtk/setup.c:592
+#: ../src/fe-gtk/setup.c:581
 msgid "Your Address"
 msgstr "您的地址"
 
-#: src/fe-gtk/setup.c:593
+#: ../src/fe-gtk/setup.c:582
 msgid "Bind to:"
 msgstr "绑定到:"
 
-#: src/fe-gtk/setup.c:594
+#: ../src/fe-gtk/setup.c:583
 msgid "Only useful for computers with multiple addresses."
 msgstr "只对有多个地址的计算机有用。"
 
-#: src/fe-gtk/setup.c:596
+#: ../src/fe-gtk/setup.c:585
 msgid "File Transfers"
-msgstr ""
+msgstr "文件传输"
 
-#: src/fe-gtk/setup.c:597
+#: ../src/fe-gtk/setup.c:586
 msgid "Get my address from the IRC server"
 msgstr "从 IRC 服务器获取我的地址"
 
-#: src/fe-gtk/setup.c:598
+#: ../src/fe-gtk/setup.c:587
 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:599
+#: ../src/fe-gtk/setup.c:588
 msgid "DCC IP address:"
 msgstr "DCC IP 地址:"
 
-#: src/fe-gtk/setup.c:600
+#: ../src/fe-gtk/setup.c:589
 msgid "Claim you are at this address when offering files."
-msgstr "发送文件时声称您是这个地址。"
+msgstr "发送文件时声称您使用此地址。"
 
-#: src/fe-gtk/setup.c:601
+#: ../src/fe-gtk/setup.c:590
 msgid "First DCC send port:"
 msgstr "第一个 DCC 文件发送端口:"
 
-#: src/fe-gtk/setup.c:602
+#: ../src/fe-gtk/setup.c:591
 msgid "Last DCC send port:"
 msgstr "最后一个 DCC 文件传送端口:"
 
-#: src/fe-gtk/setup.c:603
+#: ../src/fe-gtk/setup.c:592
 msgid "!Leave ports at zero for full range."
 msgstr "! 端口保留为 0 表示允许所有范围"
 
-#: src/fe-gtk/setup.c:605
+#: ../src/fe-gtk/setup.c:594
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/fe-gtk/setup.c:606
+#: ../src/fe-gtk/setup.c:595
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: src/fe-gtk/setup.c:607
+#: ../src/fe-gtk/setup.c:596
 msgid "Port:"
-msgstr "端口:"
+msgstr "端口号:"
 
-#: src/fe-gtk/setup.c:608
+#: ../src/fe-gtk/setup.c:597
 msgid "Type:"
 msgstr "类型:"
 
-#: src/fe-gtk/setup.c:609
+#: ../src/fe-gtk/setup.c:598
 msgid "Use proxy for:"
 msgstr "应用代理于:"
 
-#: src/fe-gtk/setup.c:611
+#: ../src/fe-gtk/setup.c:600
 msgid "Proxy Authentication"
 msgstr "代理服务器验证"
 
-#: src/fe-gtk/setup.c:613
+#: ../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:615
+#: ../src/fe-gtk/setup.c:604
 msgid "Use Authentication (HTTP or Socks5 only)"
 msgstr "使用验证(仅支持 HTTP 或 Socks5 代理服务器)"
 
-#: src/fe-gtk/setup.c:617
+#: ../src/fe-gtk/setup.c:606
 msgid "Username:"
 msgstr "用户名:"
 
-#: src/fe-gtk/setup.c:1073
+#: ../src/fe-gtk/setup.c:1052
 msgid "Select an Image File"
 msgstr "选择一个图像文件"
 
-#: src/fe-gtk/setup.c:1109
+#: ../src/fe-gtk/setup.c:1088
 msgid "Select Download Folder"
 msgstr "选择下载目录"
 
-#: src/fe-gtk/setup.c:1118
+#: ../src/fe-gtk/setup.c:1098
 msgid "Select font"
 msgstr "选择字体"
 
-#: src/fe-gtk/setup.c:1218
+#: ../src/fe-gtk/setup.c:1199
 msgid "Browse..."
 msgstr "浏览..."
 
-#: src/fe-gtk/setup.c:1357
-msgid "Mark identified users with:"
-msgstr "标记验证过的用户为:"
-
-#: src/fe-gtk/setup.c:1359
-msgid "Mark not-identified users with:"
-msgstr "标记未验证过的用户为:"
-
-#: src/fe-gtk/setup.c:1366
+#: ../src/fe-gtk/setup.c:1337
 msgid "Open Data Folder"
 msgstr "打开数据目录"
 
-#: src/fe-gtk/setup.c:1420
+#: ../src/fe-gtk/setup.c:1388
 msgid "Select color"
 msgstr "选择颜色"
 
-#: src/fe-gtk/setup.c:1500
+#: ../src/fe-gtk/setup.c:1476
 msgid "Text Colors"
 msgstr "文本颜色"
 
-#: src/fe-gtk/setup.c:1502
+#: ../src/fe-gtk/setup.c:1478
 msgid "mIRC colors:"
 msgstr "mIRC 颜色:"
 
-#: src/fe-gtk/setup.c:1510
+#: ../src/fe-gtk/setup.c:1486
 msgid "Local colors:"
 msgstr "本地颜色:"
 
-#: src/fe-gtk/setup.c:1518 src/fe-gtk/setup.c:1523
+#: ../src/fe-gtk/setup.c:1494 ../src/fe-gtk/setup.c:1499
 msgid "Foreground:"
 msgstr "前景:"
 
-#: src/fe-gtk/setup.c:1519 src/fe-gtk/setup.c:1524
+#: ../src/fe-gtk/setup.c:1495 ../src/fe-gtk/setup.c:1500
 msgid "Background:"
 msgstr "背景:"
 
-#: src/fe-gtk/setup.c:1521
+#: ../src/fe-gtk/setup.c:1497
 msgid "Selected Text"
-msgstr ""
+msgstr "选中文本"
 
-#: src/fe-gtk/setup.c:1526
+#: ../src/fe-gtk/setup.c:1502
 msgid "Interface Colors"
 msgstr "界面颜色"
 
-#: src/fe-gtk/setup.c:1528
+#: ../src/fe-gtk/setup.c:1504
 msgid "New data:"
 msgstr "新数据:"
 
-#: src/fe-gtk/setup.c:1529
+#: ../src/fe-gtk/setup.c:1505
 msgid "Marker line:"
 msgstr "标记线:"
 
-#: src/fe-gtk/setup.c:1530
+#: ../src/fe-gtk/setup.c:1506
 msgid "New message:"
 msgstr "新信息:"
 
-#: src/fe-gtk/setup.c:1531
+#: ../src/fe-gtk/setup.c:1507
 msgid "Away user:"
 msgstr "离开的用户:"
 
-#: src/fe-gtk/setup.c:1532
+#: ../src/fe-gtk/setup.c:1508
 msgid "Highlight:"
 msgstr "高亮显示:"
 
-#: src/fe-gtk/setup.c:1534
+#: ../src/fe-gtk/setup.c:1509
 msgid "Spell checker:"
-msgstr ""
+msgstr "拼写检查程序:"
 
-#: src/fe-gtk/setup.c:1537
+#: ../src/fe-gtk/setup.c:1511
 msgid "Color Stripping"
-msgstr ""
+msgstr "颜色取样"
 
-#: src/fe-gtk/setup.c:1634 src/fe-gtk/textgui.c:379
+#: ../src/fe-gtk/setup.c:1608 ../src/fe-gtk/textgui.c:372
 msgid "Event"
 msgstr "事件"
 
-#: src/fe-gtk/setup.c:1640
+#: ../src/fe-gtk/setup.c:1614
 msgid "Sound file"
 msgstr "声音文件"
 
-#: src/fe-gtk/setup.c:1684
+#: ../src/fe-gtk/setup.c:1658
 msgid "Select a sound file"
 msgstr "选择声音文件"
 
-#: src/fe-gtk/setup.c:1769
+#: ../src/fe-gtk/setup.c:1743
 msgid "Sound file:"
 msgstr "声音文件:"
 
-#: src/fe-gtk/setup.c:1784
+#: ../src/fe-gtk/setup.c:1758
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
-#: src/fe-gtk/setup.c:1795
+#: ../src/fe-gtk/setup.c:1769
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/fe-gtk/setup.c:1842
+#: ../src/fe-gtk/setup.c:1806
 msgid "Interface"
 msgstr "界面"
 
-#: src/fe-gtk/setup.c:1843
+#: ../src/fe-gtk/setup.c:1807
 msgid "Appearance"
-msgstr ""
+msgstr "外观"
 
-#: src/fe-gtk/setup.c:1844
+#: ../src/fe-gtk/setup.c:1808
 msgid "Input box"
 msgstr "输入框"
 
-#: src/fe-gtk/setup.c:1845
+#: ../src/fe-gtk/setup.c:1809
 msgid "User list"
 msgstr "用户列表"
 
-#: src/fe-gtk/setup.c:1846
+#: ../src/fe-gtk/setup.c:1810
 msgid "Channel switcher"
 msgstr "频道转换器"
 
-#: src/fe-gtk/setup.c:1847
+#: ../src/fe-gtk/setup.c:1811
 msgid "Colors"
 msgstr "颜色"
 
-#: src/fe-gtk/setup.c:1849
+#: ../src/fe-gtk/setup.c:1813
 msgid "Chatting"
 msgstr "聊天"
 
-#: src/fe-gtk/setup.c:1852
+#: ../src/fe-gtk/setup.c:1816
 msgid "Sounds"
-msgstr ""
+msgstr "声音"
 
-#: src/fe-gtk/setup.c:1854
+#: ../src/fe-gtk/setup.c:1818
 msgid "Advanced"
 msgstr "高级"
 
-#: src/fe-gtk/setup.c:1857
+#: ../src/fe-gtk/setup.c:1821
 msgid "Network setup"
 msgstr "网络设置"
 
-#: src/fe-gtk/setup.c:1858
+#: ../src/fe-gtk/setup.c:1822
 msgid "File transfers"
 msgstr "文件传输"
 
-#: src/fe-gtk/setup.c:1978
+#: ../src/fe-gtk/setup.c:1942
 msgid "Categories"
 msgstr "类别"
 
-#: src/fe-gtk/setup.c:2191
+#: ../src/fe-gtk/setup.c:2135
 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:2218
-msgid "Invalid time stamp format! See the strftime MSDN article for details."
-msgstr ""
-
-#: src/fe-gtk/setup.c:2224
+#: ../src/fe-gtk/setup.c:2160
 msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
+msgstr "真实姓名选项不能留空。回落到 “realname”。"
 
-#: src/fe-gtk/setup.c:2231
+#: ../src/fe-gtk/setup.c:2167
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr "有些设置需要重新启动 xchat 才会生效。"
+msgstr "有些设置需要重新启动程序才会生效。"
 
-#: src/fe-gtk/setup.c:2239
+#: ../src/fe-gtk/setup.c:2175
 msgid ""
 "*WARNING*\n"
 "Auto accepting DCC to your home directory\n"
@@ -6013,86 +6032,92 @@ msgid ""
 "Someone could send you a .bash_profile"
 msgstr "*警告*\n自动接收 DCC 到您的主目录中是危险之举,\n且有被盗用的可能性。例如:\n某人可能会给您发送一份 .bash_profile 文件"
 
-#: src/fe-gtk/setup.c:2271
+#: ../src/fe-gtk/setup.c:2198
 msgid ": Preferences"
 msgstr ":首选项"
 
-#: src/fe-gtk/sexy-spell-entry.c:463
+#: ../src/fe-gtk/sexy-spell-entry.c:545
 msgid "<i>(no suggestions)</i>"
-msgstr ""
+msgstr "<i>(无拼写建议)</i>"
 
-#: src/fe-gtk/sexy-spell-entry.c:477
+#: ../src/fe-gtk/sexy-spell-entry.c:559
 msgid "More..."
-msgstr ""
+msgstr "更多..."
 
-#: src/fe-gtk/sexy-spell-entry.c:546
+#. + Add to Dictionary
+#: ../src/fe-gtk/sexy-spell-entry.c:631
 #, c-format
 msgid "Add \"%s\" to Dictionary"
-msgstr ""
+msgstr "将 \"%s\" 添加到字典"
 
-#: src/fe-gtk/sexy-spell-entry.c:588
+#. - Ignore All
+#: ../src/fe-gtk/sexy-spell-entry.c:676
 msgid "Ignore All"
-msgstr ""
+msgstr "全部忽略"
 
-#: src/fe-gtk/sexy-spell-entry.c:623
+#: ../src/fe-gtk/sexy-spell-entry.c:711
 msgid "Spelling Suggestions"
-msgstr ""
+msgstr "拼写建议"
 
-#: src/fe-gtk/sexy-spell-entry.c:1046
+#: ../src/fe-gtk/sexy-spell-entry.c:1272
 #, c-format
 msgid "enchant error for language: %s"
-msgstr ""
+msgstr "enchant 在以下语言中出错:%s"
 
-#: src/fe-gtk/textgui.c:170
+#: ../src/fe-gtk/textgui.c:171
 msgid "There was an error parsing the string"
 msgstr "解析字符串时出错"
 
-#: src/fe-gtk/textgui.c:178
+#: ../src/fe-gtk/textgui.c:179
 #, c-format
 msgid "This signal is only passed %d args, $%d is invalid"
 msgstr "该信号只接受 %d 个参数,$%d 无效"
 
-#: src/fe-gtk/textgui.c:294 src/fe-gtk/textgui.c:317
+#: ../src/fe-gtk/textgui.c:289 ../src/fe-gtk/textgui.c:311
 msgid "Print Texts File"
 msgstr "打印文本文件"
 
-#: src/fe-gtk/textgui.c:362
-msgid "Edit Events"
-msgstr "编辑事件"
-
-#: src/fe-gtk/textgui.c:413
+#: ../src/fe-gtk/textgui.c:421
 msgid "$ Number"
 msgstr "$ 数字"
 
-#: src/fe-gtk/textgui.c:430
+#: ../src/fe-gtk/textgui.c:453
+msgid "Edit Events"
+msgstr "编辑事件"
+
+#: ../src/fe-gtk/textgui.c:481
 msgid "Load From..."
 msgstr "从...载入"
 
-#: src/fe-gtk/textgui.c:431
+#: ../src/fe-gtk/textgui.c:483
 msgid "Test All"
 msgstr "测试全部"
 
-#: src/fe-gtk/urlgrab.c:198
+#: ../src/fe-gtk/textgui.c:485
+msgid "OK"
+msgstr ""
+
+#: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"
 msgstr ":URL 抓取程序"
 
-#: src/fe-gtk/urlgrab.c:212
+#: ../src/fe-gtk/urlgrab.c:212
 msgid "Clear list"
 msgstr "清空列表"
 
-#: src/fe-gtk/urlgrab.c:214
+#: ../src/fe-gtk/urlgrab.c:214
 msgid "Copy selected URL"
 msgstr "复制选取的 URL"
 
-#: src/fe-gtk/urlgrab.c:214
+#: ../src/fe-gtk/urlgrab.c:214
 msgid "Copy"
 msgstr "复制"
 
-#: src/fe-gtk/urlgrab.c:216
+#: ../src/fe-gtk/urlgrab.c:216
 msgid "Save list to a file"
-msgstr "保存列表到文件"
+msgstr "列表保存到文件"
 
-#: src/fe-gtk/userlistgui.c:108
+#: ../src/fe-gtk/userlistgui.c:108
 #, c-format
 msgid "%d ops, %d total"
 msgstr "%d 位管理员,共 %d 人"