summary refs log tree commit diff stats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2018-04-03 16:14:25 -0400
committerPatrick Griffis <tingping@tingping.se>2018-04-03 16:14:25 -0400
commit08fb808ea4b190734b56b30c1f0a5eec68944864 (patch)
tree03944e684fa6e25d6069fb4ee3757641b5ef9052 /po/zh_CN.po
parentc70c1e1896bcef9230c63b24eec886725ecbbd72 (diff)
Update translations
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1049
1 files changed, 619 insertions, 430 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0442538f..4ea01a1b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-# 
+#
 # Translators:
 # Aron Xu <happyaron.xu@gmail.com>, 2010
 # Dalin <ayi880@hotmail.com>, 2003
@@ -21,69 +21,77 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-15 19:25-0400\n"
+"POT-Creation-Date: 2018-04-03 16:11-0400\n"
 "PO-Revision-Date: 2017-09-23 18:37+0000\n"
 "Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/hexchat/hexchat/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/hexchat/hexchat/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/misc/hexchat.appdata.xml.in:4 data/misc/hexchat.appdata.xml.in:5
-#: data/misc/hexchat.desktop.in.in:3
+#: data/misc/io.github.Hexchat.appdata.xml.in:4
+#: data/misc/io.github.Hexchat.appdata.xml.in:5
+#: data/misc/io.github.Hexchat.desktop.in.in:3
 msgid "HexChat"
 msgstr "HexChat"
 
-#: data/misc/hexchat.appdata.xml.in:9 data/misc/hexchat.desktop.in.in:4
+#: data/misc/io.github.Hexchat.appdata.xml.in:9
+#: data/misc/io.github.Hexchat.desktop.in.in:4
 msgid "IRC Client"
 msgstr "IRC 客户端"
 
-#: data/misc/hexchat.appdata.xml.in:11
+#: data/misc/io.github.Hexchat.appdata.xml.in:11
 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 客户端。它允许以安全的方式进入多个网络,与用户进行私密聊天,或者在频道中使用自定义界面,甚至还可以传送文件。"
+msgstr ""
+"HexChat 是一款易于使用的可扩展 IRC 客户端。它允许以安全的方式进入多个网络,与"
+"用户进行私密聊天,或者在频道中使用自定义界面,甚至还可以传送文件。"
 
-#: data/misc/hexchat.appdata.xml.in:12
+#: data/misc/io.github.Hexchat.appdata.xml.in:12
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr "HexChat 支持以下特性: DCC、SASL、代理、拼写检查、消息提醒、聊天记录、自定义主题和 Python/Perl 脚本。"
+msgstr ""
+"HexChat 支持以下特性: DCC、SASL、代理、拼写检查、消息提醒、聊天记录、自定义主"
+"题和 Python/Perl 脚本。"
 
-#: data/misc/hexchat.appdata.xml.in:22
+#: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
 msgstr "主聊天窗口"
 
-#: data/misc/hexchat.desktop.in.in:5
+#: data/misc/io.github.Hexchat.desktop.in.in:5
 msgid "Chat with other people online"
 msgstr "与其他人在线聊天"
 
-#: data/misc/hexchat.desktop.in.in:6
+#: data/misc/io.github.Hexchat.desktop.in.in:6
 msgid "IM;Chat;"
 msgstr "IM;聊天;"
 
-#: data/misc/hexchat.desktop.in.in:8 data/misc/htm.desktop.in:5
+#: data/misc/io.github.Hexchat.desktop.in.in:8
+#: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
 msgstr ""
 
-#: data/misc/hexchat.desktop.in.in:18
+#: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
 msgstr "打开安全模式"
 
-#: data/misc/htm.desktop.in:3
+#: data/misc/io.github.Hexchat.ThemeManager.desktop.in:3
 msgid "HexChat Theme Manager"
 msgstr "HexChat 主题管理器"
 
 #. 0 means unlimited
 #. STRINGS
-#: src/common/cfgfiles.c:841
+#: src/common/cfgfiles.c:843
 msgid "I'm busy"
 msgstr "我很忙"
 
-#: src/common/cfgfiles.c:878
+#: src/common/cfgfiles.c:880
 msgid "Leaving"
 msgstr "已离开"
 
@@ -99,18 +107,18 @@ msgstr "开"
 msgid "{unset}"
 msgstr "{未设置}"
 
-#: src/common/chanopt.c:128 src/common/text.c:1314 src/fe-gtk/notifygui.c:125
+#: src/common/chanopt.c:128 src/common/text.c:1325 src/fe-gtk/notifygui.c:125
 #: src/fe-gtk/setup.c:1886
 msgid "Network"
 msgstr "网络"
 
 #: src/common/chanopt.c:129 src/common/chanopt.c:131 src/fe-gtk/maingui.c:1539
-#: src/fe-gtk/maingui.c:1659 src/fe-gtk/maingui.c:3353
+#: src/fe-gtk/maingui.c:1659 src/fe-gtk/maingui.c:3376
 msgid "<none>"
 msgstr "<无>"
 
-#: src/common/chanopt.c:130 src/common/text.c:1014 src/common/text.c:1018
-#: src/common/text.c:1487 src/fe-gtk/chanlist.c:777 src/fe-gtk/ignoregui.c:159
+#: src/common/chanopt.c:130 src/common/text.c:1025 src/common/text.c:1029
+#: src/common/text.c:1498 src/fe-gtk/chanlist.c:777 src/fe-gtk/ignoregui.c:159
 #: src/fe-gtk/servlistgui.c:1791
 msgid "Channel"
 msgstr "频道"
@@ -145,7 +153,7 @@ msgid "Aborted"
 msgstr "已中止"
 
 #: src/common/dcc.c:1790 src/common/dcc.c:1801 src/common/dcc.c:1817
-#: src/common/outbound.c:2601
+#: src/common/outbound.c:2604
 #, c-format
 msgid "Cannot access %s\n"
 msgstr "无法获取 %s\n"
@@ -153,9 +161,9 @@ msgstr "无法获取 %s\n"
 #. ! if (osvi.dwMajorVersion >= 5)
 #. fallback to error number
 #: src/common/dcc.c:1791 src/common/dcc.c:1802 src/common/dcc.c:1818
-#: src/common/text.c:1298 src/common/text.c:1341 src/common/text.c:1352
-#: src/common/text.c:1359 src/common/text.c:1372 src/common/text.c:1389
-#: src/common/text.c:1494 src/common/util.c:175
+#: src/common/text.c:1309 src/common/text.c:1352 src/common/text.c:1363
+#: src/common/text.c:1370 src/common/text.c:1383 src/common/text.c:1400
+#: src/common/text.c:1505 src/common/util.c:175
 msgid "Error"
 msgstr "错误"
 
@@ -307,7 +315,9 @@ msgstr "你没有 %s 的写入权限。此会话中的信息不可保存。"
 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"
+msgstr ""
+"* 不要以 root 身份执行 IRC!您应该\n"
+"  使用普通用户帐号来登录。\n"
 
 #: src/common/ignore.c:127 src/common/ignore.c:131 src/common/ignore.c:135
 #: src/common/ignore.c:139 src/common/ignore.c:143 src/common/ignore.c:147
@@ -321,30 +331,30 @@ msgstr "是  "
 msgid "NO   "
 msgstr "否   "
 
-#: src/common/ignore.c:378
+#: src/common/ignore.c:370
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
 msgstr "您正受到来自 %s 的洗屏攻击,忽略 %s\n"
 
-#: src/common/ignore.c:403
+#: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
 msgstr "您正受到来自 %s 的 MSG 洪水攻击,设置图形化自动对话框为关闭。\n"
 
-#: src/common/inbound.c:1279
+#: src/common/inbound.c:1282
 #, c-format
 msgid "Resolved to %s"
 msgstr "解析到 %s"
 
-#: src/common/inbound.c:1281 src/common/inbound.c:1309
+#: src/common/inbound.c:1284 src/common/inbound.c:1312
 msgid "Not found"
 msgstr "找不到"
 
-#: src/common/inbound.c:1298
+#: src/common/inbound.c:1301
 msgid "Resolved to:"
 msgstr "解析到:"
 
-#: src/common/inbound.c:1328
+#: src/common/inbound.c:1331
 #, c-format
 msgid "Looking up %s..."
 msgstr "查找 %s..."
@@ -406,100 +416,105 @@ msgstr "可用插件命令:"
 msgid "Type /HELP <command> for more information, or /HELP -l"
 msgstr "请输入 /HELP <命令名> 或者 /HELP -l 以获取更多信息"
 
-#: src/common/outbound.c:2387
+#: src/common/outbound.c:2390
 #, c-format
 msgid "Unknown arg '%s' ignored."
 msgstr "忽略未知参数 “%s”。"
 
-#: src/common/outbound.c:3145 src/common/outbound.c:3175
+#: src/common/outbound.c:3148 src/common/outbound.c:3178
 msgid "Quiet is not supported by this server."
 msgstr "此服务器不支持静默。"
 
 #. error
-#: src/common/outbound.c:3622 src/common/outbound.c:3647
+#: src/common/outbound.c:3625 src/common/outbound.c:3650
 msgid "No such plugin found.\n"
 msgstr "找不到该插件。\n"
 
-#: src/common/outbound.c:3627 src/fe-gtk/plugingui.c:191
+#: src/common/outbound.c:3630 src/fe-gtk/plugingui.c:191
 msgid "That plugin is refusing to unload.\n"
 msgstr "无法卸载该插件。\n"
 
-#: src/common/outbound.c:3929
+#: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
 msgstr "ADDBUTTON <名称> <动作>,在用户列表下添加一个按钮"
 
-#: src/common/outbound.c:3930
+#: src/common/outbound.c:3933
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
 msgstr "ADDSERVER <新网络> <新服务器/6667>,向网络列表添加新网络新服务器信息"
 
-#: src/common/outbound.c:3932
+#: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
 msgstr "ALLCHAN <命令>,向您所在的所有频道发送命令"
 
-#: src/common/outbound.c:3934
+#: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
 msgstr "ALLCHANL <命令>,向您所在服务器的所有频道发送命令。"
 
-#: src/common/outbound.c:3936
+#: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
 msgstr "ALLSERV <命令>,向您所在的所有服务器发送命令"
 
-#: src/common/outbound.c:3937
+#: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
 msgstr "AWAY [<离开原因>],设置为离开状态(使用 /BACK 解除)"
 
-#: src/common/outbound.c:3938
+#: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
 msgstr "BACK,取消离开状态"
 
-#: src/common/outbound.c:3940
+#: src/common/outbound.c:3943
 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 <掩码> [<拦截类型>],禁止所有符合 <掩码> 的用户进入当前的频道。如果他们已在该频道,这个命令不会将其踢出(需要具有频道管理员身份)"
+msgstr ""
+"BAN <掩码> [<拦截类型>],禁止所有符合 <掩码> 的用户进入当前的频道。如果他们已"
+"在该频道,这个命令不会将其踢出(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:3941
+#: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
 msgstr "CHANOPT [-quiet] <变量名> [<值>]"
 
-#: src/common/outbound.c:3942
+#: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current "
-"connection"
+"CHARSET [<encoding>], get or set the encoding used for the current connection"
 msgstr "CHARSET [<编码字符集>],获取及设置当前连接所使用的编码字符集"
 
-#: src/common/outbound.c:3943
+#: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
 msgstr "CLEAR [ALL|HISTORY|[-]<amount>],清空当前的窗口文本或命令历史。"
 
-#: src/common/outbound.c:3944
+#: src/common/outbound.c:3947
 msgid ""
 "CLOSE [-m], Closes the current tab, closing the window if this is the only "
 "open tab, or with the \"-m\" flag, closes all queries."
-msgstr "CLOSE【关闭】 [-m],关闭当前选项卡,关闭当前的唯一活动窗口,或者是关闭所有查询的 -m 选项。"
+msgstr ""
+"CLOSE【关闭】 [-m],关闭当前选项卡,关闭当前的唯一活动窗口,或者是关闭所有查"
+"询的 -m 选项。"
 
-#: src/common/outbound.c:3947
+#: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr "COUNTRY [-s] <国家地区代码|通配符>,查看国家代码对应的国家名,比如 :cn = 中国"
+msgstr ""
+"COUNTRY [-s] <国家地区代码|通配符>,查看国家代码对应的国家名,比如 :cn = 中国"
 
-#: src/common/outbound.c:3949
+#: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr "CTCP <昵称> <要发送的信息>,给昵称为 <昵称> 者发送 CTCP 信息,常用是 VERSION 和 USERINFO"
+msgstr ""
+"CTCP <昵称> <要发送的信息>,给昵称为 <昵称> 者发送 CTCP 信息,常用是 VERSION "
+"和 USERINFO"
 
-#: src/common/outbound.c:3951
+#: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately "
-"rejoins"
+"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
 msgstr "CYCLE [<频道>],离开当前频道并立即重新进入"
 
-#: src/common/outbound.c:3953
+#: src/common/outbound.c:3956
 msgid ""
 "\n"
 "DCC GET <nick>                      - accept an offered file\n"
@@ -510,309 +525,357 @@ 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 <昵称>                     - 接收昵称为 <昵称> 者使用 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"
+msgstr ""
+"\n"
+"DCC GET <昵称>                     - 接收昵称为 <昵称> 者使用 DCC 发送给\n"
+"                                      您的文件\n"
+"DCC SEND [-maxcps=#] <昵称> [文件] - 使用 DCC 发送文件给 <昵称>\n"
+"DCC PSEND [-maxcps=#] <昵称> [文件] - 使用被动模式 DCC 发送文件给 <昵称>\n"
+"DCC LIST                           - 显示 DCC 列表\n"
+"DCC CHAT <昵称>                    - 与 <昵称> 进行 DCC 直连聊天\n"
+"DCC PCHAT <昵称>                    - 使用 DCC 被动模式与 <昵称> 聊天\n"
+"DCC CLOSE <类型> <昵称> <文件>         例如:\n"
+"         /dcc close send johnsmith file.tar.gz"
 
-#: src/common/outbound.c:3965
+#: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr "DEHOP <昵称>,取消当前频道内昵称为 <昵称> 的副管理员身份(需要具有频道管理员身份)"
+msgstr ""
+"DEHOP <昵称>,取消当前频道内昵称为 <昵称> 的副管理员身份(需要具有频道管理员身"
+"份)"
 
-#: src/common/outbound.c:3967
+#: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
 msgstr "DELBUTTON <名称>,删除用户列表下的那个按钮"
 
-#: src/common/outbound.c:3969
+#: src/common/outbound.c:3972
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEOP <昵称>,取消昵称为 <昵称> 者在当前频道的管理员身份(需要具有频道管理员身份)"
+msgstr ""
+"DEOP <昵称>,取消昵称为 <昵称> 者在当前频道的管理员身份(需要具有频道管理员身"
+"份)"
 
-#: src/common/outbound.c:3971
+#: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEVOICE <昵称>,取消昵称为 <昵称> 者在当前频道的发言权(需要具有频道管理员身份)"
+msgstr ""
+"DEVOICE <昵称>,取消昵称为 <昵称> 者在当前频道的发言权(需要具有频道管理员身"
+"份)"
 
-#: src/common/outbound.c:3972
+#: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
 msgstr "DISCON,断开服务器连接"
 
-#: src/common/outbound.c:3973
+#: src/common/outbound.c:3976
 msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
 msgstr "DNS <昵称|主机|IP>,解析用户昵称、 IP 地址或者主机名"
 
-#: src/common/outbound.c:3974
+#: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
 msgstr ""
 
-#: src/common/outbound.c:3975
+#: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
 msgstr "ECHO <文本>,在本地显示文本"
 
-#: src/common/outbound.c:3978
+#: src/common/outbound.c:3981
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr "EXEC [-o] <命令>,执行命令。如果使用了 -o 选项则输出到当前频道,否则输出到当前文本框"
+msgstr ""
+"EXEC [-o] <命令>,执行命令。如果使用了 -o 选项则输出到当前频道,否则输出到当"
+"前文本框"
 
-#: src/common/outbound.c:3980
+#: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
 msgstr "EXECCONT,向进程发送 SIGCONT 信号"
 
-#: src/common/outbound.c:3983
+#: src/common/outbound.c:3986
 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:3985
+#: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
 msgstr "EXECSTOP,向进程发送 SIGSTOP 信号"
 
-#: src/common/outbound.c:3986
+#: src/common/outbound.c:3989
 msgid "EXECWRITE, sends data to the processes stdin"
 msgstr "EXECWRITE,把数据发送给进程的标准输入"
 
-#: src/common/outbound.c:3990
+#: src/common/outbound.c:3993
 msgid "EXPORTCONF, exports HexChat settings"
 msgstr "EXPORTCONF, 导出 HexChat 设置"
 
-#: src/common/outbound.c:3993
+#: src/common/outbound.c:3996
 msgid "FLUSHQ, flushes the current server's send queue"
 msgstr "FLUSHQ,清空当前服务器的发送队列"
 
-#: src/common/outbound.c:3995
+#: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
 msgstr "GATE <主机> [<端口号>],经由某主机来代理,默认端口为 23"
 
-#: src/common/outbound.c:4000
+#: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
 msgstr "GHOST <昵称> [密码],消灭此幽灵昵称"
 
-#: src/common/outbound.c:4005
+#: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
 msgstr "HOP <昵称>,给昵称为 <昵称> 者以副管理员的身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4006
+#: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
 msgstr "ID <密码>,向昵称服务器验证你的身份"
 
-#: src/common/outbound.c:4008
+#: src/common/outbound.c:4011
 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 <掩码> <类型..> <选项..>\n    掩码 - 要忽略的主机掩码,比如 *!*@*.aol.com\n    类型 - 要忽略数据的类型,应以下选项之一或全部:\n            PRIV,CHAN,NOTI,CTCP,INVI,ALL\n    选项 - 忽略选项:NOSAVE,QUIET"
+msgstr ""
+"IGNORE <掩码> <类型..> <选项..>\n"
+"    掩码 - 要忽略的主机掩码,比如 *!*@*.aol.com\n"
+"    类型 - 要忽略数据的类型,应以下选项之一或全部:\n"
+"            PRIV,CHAN,NOTI,CTCP,INVI,ALL\n"
+"    选项 - 忽略选项:NOSAVE,QUIET"
 
-#: src/common/outbound.c:4015
+#: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr "INVITE <昵称> [<频道>],邀请昵称为 <昵称> 者进入频道,默认为当前的频道(需要具有频道管理员身份)"
+msgstr ""
+"INVITE <昵称> [<频道>],邀请昵称为 <昵称> 者进入频道,默认为当前的频道(需要具"
+"有频道管理员身份)"
 
-#: src/common/outbound.c:4016
+#: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
 msgstr "JOIN <频道>,进入频道"
 
-#: src/common/outbound.c:4018
+#: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
 msgstr "KICK <昵称> [原因],将该昵称从当前频道中踢出 (需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4020
+#: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr "KICKBAN <昵称> [原因],把 <昵称> 踢出当前频道,并禁止再次进入(需要具有频道管理员身份)"
+msgstr ""
+"KICKBAN <昵称> [原因],把 <昵称> 踢出当前频道,并禁止再次进入(需要具有频道管"
+"理员身份)"
 
-#: src/common/outbound.c:4023
+#: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
 msgstr "LAGCHECK,强制进行延迟检查"
 
-#: src/common/outbound.c:4025
+#: src/common/outbound.c:4028
 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 "LASTLOG [-h] [-m] [-r] [--] <字符串>,在缓冲区中搜索该字符串\n    使用 -h 选项高亮显示搜索到的字符串(多个)\n    使用 -m 选项严格匹配大小写\n    使用 -r 选项将字符串作为正则表达式搜索\n    使用 -- (双破折号) 标记选项参数结束,例如要搜索的字符串是 '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the "
+"string '-r'"
+msgstr ""
+"LASTLOG [-h] [-m] [-r] [--] <字符串>,在缓冲区中搜索该字符串\n"
+"    使用 -h 选项高亮显示搜索到的字符串(多个)\n"
+"    使用 -m 选项严格匹配大小写\n"
+"    使用 -r 选项将字符串作为正则表达式搜索\n"
+"    使用 -- (双破折号) 标记选项参数结束,例如要搜索的字符串是 '-r'"
 
-#: src/common/outbound.c:4031
+#: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
 msgstr "LOAD [-e] <文件>,载入插件或脚本"
 
-#: src/common/outbound.c:4034
+#: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
 msgstr "MDEHOP,撤销当前频道中所有副管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4036
+#: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
 msgstr "MDEOP,撤销当前频道中所有管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4038
+#: src/common/outbound.c:4041
 msgid ""
-"ME <action>, sends the action to the current channel (actions are written in"
-" the 3rd person, like /me jumps)"
-msgstr "ME <动作>,向当前频道中发送一个动作(动作使用英语的第 3 人称陈述,例如 /me 跳一下)"
+"ME <action>, sends the action to the current channel (actions are written in "
+"the 3rd person, like /me jumps)"
+msgstr ""
+"ME <动作>,向当前频道中发送一个动作(动作使用英语的第 3 人称陈述,例如 /me 跳"
+"一下)"
 
-#: src/common/outbound.c:4042
+#: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
 msgstr ""
 
-#: src/common/outbound.c:4044
+#: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
 msgstr "MKICK,踢出当前频道中除您自己以外的所有用户(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4047
+#: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
 msgstr "MOP,给当前频道中所有用户赋予管理员的身份(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4048
+#: src/common/outbound.c:4051
 msgid ""
-"MSG <nick> <message>, sends a private message, message \".\" to send to last"
-" nick or prefix with \"=\" for dcc chat"
-msgstr "MSG <昵称> <消息>,发送私信, 昵称为 \".\" 发送给上一个昵称的用户,或者以 \"=\" 开头发送 dcc 聊天"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last "
+"nick or prefix with \"=\" for dcc chat"
+msgstr ""
+"MSG <昵称> <消息>,发送私信, 昵称为 \".\" 发送给上一个昵称的用户,或者以 \"="
+"\" 开头发送 dcc 聊天"
 
-#: src/common/outbound.c:4051
+#: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
 msgstr "NAMES [频道],列出该频道的所有昵称"
 
-#: src/common/outbound.c:4053
+#: src/common/outbound.c:4056
 msgid "NCTCP <nick> <message>, Sends a CTCP notice"
 msgstr "NCTCP <昵称> <消息>,给昵称为 <nick> 者发送一则 CTCP 通知"
 
-#: src/common/outbound.c:4054
+#: src/common/outbound.c:4057
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
 msgstr "NEWSERVER [-noconnect] <主机名> [<端口号>]"
 
-#: src/common/outbound.c:4055
+#: src/common/outbound.c:4058
 msgid "NICK <nickname>, sets your nick"
 msgstr "NICK <昵称>,设置您的昵称"
 
-#: src/common/outbound.c:4058
+#: src/common/outbound.c:4061
 msgid "NOTICE <nick/channel> <message>, sends a notice"
 msgstr "NOTICE <昵称/频道> <消息>,发送一条通知"
 
-#: src/common/outbound.c:4060
+#: src/common/outbound.c:4063
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr "NOTIFY [-n 网络1[,网络2,...]] [<昵称>],列出您的通知列表,或在列表中添加某人"
+msgstr ""
+"NOTIFY [-n 网络1[,网络2,...]] [<昵称>],列出您的通知列表,或在列表中添加某人"
 
-#: src/common/outbound.c:4062
+#: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
 msgstr "OP <昵称>,委任 <昵称> 为频道管理员(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4064
+#: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
 msgstr "PART [<频道>] [<离开原因>],离开频道,默认为当前的频道"
 
-#: src/common/outbound.c:4066
+#: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
 msgstr "PING <昵称 | 频道>,向某位用户或频道发送 CTCP PING 消息"
 
-#: src/common/outbound.c:4068
+#: src/common/outbound.c:4071
 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:4070
+#: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr "QUIET <掩码> [<静默类型>],在服务器支持的情况下将当前服务器中满足掩码的每个人设为静默状态。"
+msgstr ""
+"QUIET <掩码> [<静默类型>],在服务器支持的情况下将当前服务器中满足掩码的每个人"
+"设为静默状态。"
 
-#: src/common/outbound.c:4072
+#: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
 msgstr "QUIT [<退出原因>],从与当前服务器断开连接"
 
-#: src/common/outbound.c:4074
+#: src/common/outbound.c:4077
 msgid "QUOTE <text>, sends the text in raw form to the server"
 msgstr "QUOTE <文本>,向服务器发送原始格式的文本"
 
-#: src/common/outbound.c:4077
+#: src/common/outbound.c:4080
 msgid ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
-"/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
+"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as /"
+"RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
 "reconnect to all the open servers"
-msgstr "RECONNECT [-ssl] [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前的服务器或用 /RECONNECT ALL 重新连接所有服务器"
+msgstr ""
+"RECONNECT [-ssl] [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前的"
+"服务器或用 /RECONNECT ALL 重新连接所有服务器"
 
-#: src/common/outbound.c:4080
+#: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<host>] [<port>] [<password>], Can be called just as /RECONNECT "
 "to reconnect to the current server or with /RECONNECT ALL to reconnect to "
 "all the open servers"
-msgstr "RECONNECT [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前服务器或用 /RECONNECT ALL 重新连接所有服务器"
+msgstr ""
+"RECONNECT [<主机>] [<端口号>] [<密码>],可用 /RECONNECT 重新连接当前服务器或"
+"用 /RECONNECT ALL 重新连接所有服务器"
 
-#: src/common/outbound.c:4082
+#: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr "RECV <text>,向 HexChat 发送原始数据,就好像从 IRC 服务器上接收到的一样"
+msgstr ""
+"RECV <text>,向 HexChat 发送原始数据,就好像从 IRC 服务器上接收到的一样"
 
-#: src/common/outbound.c:4083
+#: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
 msgstr "RELOAD <名称>,重新载入插件/脚本"
 
-#: src/common/outbound.c:4085
+#: src/common/outbound.c:4088
 msgid "SAY <text>, sends the text to the object in the current window"
 msgstr "SAY <文本>,向当前窗口中的对象发送文本"
 
-#: src/common/outbound.c:4086
+#: src/common/outbound.c:4089
 msgid "SEND <nick> [<file>]"
 msgstr "SEND <昵称> [<文件>]"
 
-#: src/common/outbound.c:4089
+#: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
 msgstr "SERVCHAN [-ssl] <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: src/common/outbound.c:4092
+#: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
 msgstr "SERVCHAN <主机> <端口号> <频道>,连接服务器并进入某频道"
 
-#: src/common/outbound.c:4096
+#: src/common/outbound.c:4099
 msgid ""
 "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the "
 "default port is 6667 for normal connections, and 6697 for ssl connections"
-msgstr "SERVER [-ssl] <主机> [<端口号>] [<密码>],连接到服务器。普通连接的默认端口是6667,SSL连接的默认端口是6697。"
+msgstr ""
+"SERVER [-ssl] <主机> [<端口号>] [<密码>],连接到服务器。普通连接的默认端口是"
+"6667,SSL连接的默认端口是6697。"
 
-#: src/common/outbound.c:4099
+#: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
 msgstr "SERVER <主机> [<端口号>] [<密码>],连接服务器。默认端口为 6667"
 
-#: src/common/outbound.c:4101
+#: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
 msgstr "SET [-e] [-off|-on] [-quiet] <变量名> [<值>]"
 
-#: src/common/outbound.c:4102
+#: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
 msgstr "SETCURSOR [-|+]<位置>,重新定位输入框中光标的位置。"
 
-#: src/common/outbound.c:4103
+#: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
 msgstr "SETTAB <新名称>,改变选项卡的名字,tab_trunc 变量的限制仍然有效"
 
-#: src/common/outbound.c:4104
+#: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
 msgstr "SETTEXT <新文本>,替换输入框中的文本"
 
-#: src/common/outbound.c:4107
+#: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current "
-"topic"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
 msgstr "TOPIC [<频道主题>],设置频道主题,如果未指定内容则显示当前主题"
 
-#: src/common/outbound.c:4109
+#: src/common/outbound.c:4112
 msgid ""
 "\n"
 "TRAY -f <timeout> <file1> [<file2>] Blink tray between two icons.\n"
@@ -820,83 +883,91 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr "\nTRAY -f <时间> <文件1> [<文件2>] 在托盘中使用两个图标进行闪烁。\nTRAY -f <文件名>                  设置托盘为固定图标。\nTRAY -i <数字>                    使用内部图标闪烁托盘。\nTRAY -t <文本>                      设置托盘工具提示。\nTRAY -b <标题> <文本>              设置托盘气泡通知。"
+msgstr ""
+"\n"
+"TRAY -f <时间> <文件1> [<文件2>] 在托盘中使用两个图标进行闪烁。\n"
+"TRAY -f <文件名>                  设置托盘为固定图标。\n"
+"TRAY -i <数字>                    使用内部图标闪烁托盘。\n"
+"TRAY -t <文本>                      设置托盘工具提示。\n"
+"TRAY -b <标题> <文本>              设置托盘气泡通知。"
 
-#: src/common/outbound.c:4116
+#: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
 msgstr "UNBAN <掩码> [<掩码>...],解禁指定的掩码。"
 
-#: src/common/outbound.c:4117
+#: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
 msgstr "UNIGNORE <掩码> [QUIET]"
 
-#: src/common/outbound.c:4118
+#: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
 msgstr "UNLOAD <名称>,卸载插件或脚本"
 
-#: src/common/outbound.c:4120
+#: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
-" server."
-msgstr "UNQUIET <掩码> [<掩码>...],在服务器支持测情况下解除指定掩码的静默状态。"
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
+"server."
+msgstr ""
+"UNQUIET <掩码> [<掩码>...],在服务器支持测情况下解除指定掩码的静默状态。"
 
-#: src/common/outbound.c:4121
+#: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
 msgstr "URL <url>,在浏览器中打开 URL"
 
-#: src/common/outbound.c:4123
+#: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
-"userlist"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
 msgstr "USELECT [-a] [-s] <昵称1> <昵称2>...,在频道用户列表中以高亮度标示昵称"
 
-#: src/common/outbound.c:4126
+#: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
 msgstr "VOICE <昵称>,给予昵称为 <昵称> 者发言权(需要具有频道管理员身份)"
 
-#: src/common/outbound.c:4128
+#: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
 msgstr "WALLCHAN <消息>,发送信息到所有的频道"
 
-#: src/common/outbound.c:4130
+#: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
 msgstr "WALLCHOP <消息>,给当前频道中所有管理员发送消息"
 
-#: src/common/outbound.c:4163
+#: src/common/outbound.c:4166
 #, c-format
 msgid "User Command for: %s\n"
 msgstr "用户命令:%s\n"
 
-#: src/common/outbound.c:4190
+#: src/common/outbound.c:4193
 #, c-format
 msgid "Usage: %s\n"
 msgstr "用法:%s\n"
 
-#: src/common/outbound.c:4195
+#: src/common/outbound.c:4198
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr "\n没有关于该命令的帮助信息。\n"
+msgstr ""
+"\n"
+"没有关于该命令的帮助信息。\n"
 
-#: src/common/outbound.c:4201
+#: src/common/outbound.c:4204
 msgid "No such command.\n"
 msgstr "此命令不存在。\n"
 
-#: src/common/outbound.c:4534
+#: src/common/outbound.c:4537
 msgid "Bad arguments for user command.\n"
 msgstr "用户命令的参数有误。\n"
 
-#: src/common/outbound.c:4740
+#: src/common/outbound.c:4743
 msgid "Too many recursive usercommands, aborting."
 msgstr "用户命令产生太多递归,中止执行。"
 
-#: src/common/outbound.c:4829
+#: src/common/outbound.c:4832
 #, c-format
 msgid "Unknown Command %s. Try /help\n"
 msgstr "未知命令 %s。请尝试键入 /help\n"
 
-#: src/common/plugin.c:401
+#: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
 msgstr "无 hexchat_plugin_init 符号,这确实是 HexChat 的插件吗?"
 
@@ -937,27 +1008,29 @@ msgstr "重复命令的秒数\n"
 msgid "%5d %8.1f %7d  %s\n"
 msgstr "%5d %8.1f %7d  %s\n"
 
-#: src/common/server.c:511
+#: src/common/server.c:514
 msgid "Are you sure this is a SSL capable server and port?\n"
 msgstr "您确信该服务器的此端口支持 SSL?\n"
 
-#: src/common/server.c:870
+#: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr "无法解析主机名 %s\n请检查您的 IP 设置!\n"
+msgstr ""
+"无法解析主机名 %s\n"
+"请检查您的 IP 设置!\n"
 
-#: src/common/server.c:875
+#: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
 msgstr "代理传送失败。\n"
 
-#: src/common/servlist.c:546
+#: src/common/servlist.c:547
 #, c-format
 msgid "Cycling to next server in %s...\n"
 msgstr "跳转至 %s 的下一个服务器...\n"
 
-#: src/common/servlist.c:1184
+#: src/common/servlist.c:1185
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -1121,8 +1194,7 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$t 中止了与 %C18$1%O 的 DCC 直连聊天。"
 
 #: src/common/textevents.h:145
-msgid ""
-"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr "%C24*%O$t 已与 %C18$1%C %C30[%C24$2%C30]%O 建立了 DCC 直连聊天连接"
 
 #: src/common/textevents.h:148
@@ -1156,9 +1228,11 @@ msgstr ""
 
 #: src/common/textevents.h:169
 msgid ""
-"%C20*%O$tReceived a malformed DCC request from "
-"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
-msgstr "%C20*%O$t 收到来自 %C18$1%O 的有错的 DCC 请求。$a010%C23*%O$t 数据包内容:%C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O"
+"$tContents of packet: %C23$2%O"
+msgstr ""
+"%C20*%O$t 收到来自 %C18$1%O 的有错的 DCC 请求。$a010%C23*%O$t 数据包内容:"
+"%C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1175,11 +1249,12 @@ msgstr "%C23*%O$t 到 %C18$1%O 的 DCC RECV 连接 '%C23$2%O'  已中断。"
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr "%C24*%O$t 来自 %C18$3%O DCC RECV 连接 '%C23$1%O'  完成 %C30[%C24$4%O cps%C30]%O"
+msgstr ""
+"%C24*%O$t 来自 %C18$3%O DCC RECV 连接 '%C23$1%O'  完成 %C30[%C24$4%O cps"
+"%C30]%O"
 
 #: src/common/textevents.h:184
-msgid ""
-"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr "%C24*%O$t 建立与 %C18$1 的 DCC RECV 连接 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1192,8 +1267,7 @@ msgstr "%C20*%O$t DCC RECV:无法打开 %C23$1%C 进行写入(%C20$2%O)。 "
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
-"instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
 msgstr "%C23*%O$t 文件 '%C24$1%C' 已存在,将把文件另存为 '%C23$2%O'。"
 
 #: src/common/textevents.h:196
@@ -1207,11 +1281,12 @@ msgstr "%C23*%O$t 到 %C18$1%O 的 DCC SEND 连接 '%C23$2%C' 已中断。"
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr "%C24*%O$t 到 %C18$2%C 的 DCC SEND 连接 '%C23$1%C'  完成 %C30[%C24$3%C cps%C30]%O"
+msgstr ""
+"%C24*%O$t 到 %C18$2%C 的 DCC SEND 连接 '%C23$1%C'  完成 %C30[%C24$3%C cps"
+"%C30]%O"
 
 #: src/common/textevents.h:205
-msgid ""
-"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr "%C24*%O$t 已建立到 %C18$1 %C30[%O%C24$2%C30]%O 的 DCC SEND 连接"
 
 #: src/common/textevents.h:208
@@ -1445,7 +1520,8 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O,登录时间:%C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr "%C23*%O$t%C28[%C18$1%C28]%O 真实主机: %C23$2%O,真实 IP: %C30[%C23$3%C30]%O"
+msgstr ""
+"%C23*%O$t%C28[%C18$1%C28]%O 真实主机: %C23$2%O,真实 IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1490,504 +1566,508 @@ msgstr "**** 聊天记录于 %s 开始记录\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr "* 无法以可写入方式打开日志(log)文件。\n请检查 %s 的权限"
+msgstr ""
+"* 无法以可写入方式打开日志(log)文件。\n"
+"请检查 %s 的权限"
 
-#: src/common/text.c:949
+#: src/common/text.c:960
 msgid "Left message"
 msgstr "左侧信息"
 
-#: src/common/text.c:950
+#: src/common/text.c:961
 msgid "Right message"
 msgstr "右侧信息"
 
-#: src/common/text.c:955 src/common/text.c:1339 src/common/text.c:1377
-#: src/common/text.c:1382 src/common/text.c:1423
+#: src/common/text.c:966 src/common/text.c:1350 src/common/text.c:1388
+#: src/common/text.c:1393 src/common/text.c:1434
 msgid "IP address"
 msgstr "IP 地址"
 
-#: src/common/text.c:956 src/common/text.c:1200 src/common/text.c:1259
-#: src/common/text.c:1266
+#: src/common/text.c:967 src/common/text.c:1211 src/common/text.c:1270
+#: src/common/text.c:1277
 msgid "Username"
 msgstr "用户名"
 
-#: src/common/text.c:961
+#: src/common/text.c:972
 msgid "The nick of the joining person"
 msgstr "进入用户的昵称"
 
-#: src/common/text.c:962
+#: src/common/text.c:973
 msgid "The channel being joined"
 msgstr "进入的频道"
 
-#: src/common/text.c:963 src/common/text.c:1031 src/common/text.c:1082
+#: src/common/text.c:974 src/common/text.c:1042 src/common/text.c:1093
 msgid "The host of the person"
 msgstr "此人的主机名"
 
-#: src/common/text.c:964
+#: src/common/text.c:975
 msgid "The account of the person"
 msgstr "这个人的帐号"
 
-#: src/common/text.c:968 src/common/text.c:975 src/common/text.c:982
-#: src/common/text.c:1199 src/common/text.c:1206 src/common/text.c:1211
-#: src/common/text.c:1216 src/common/text.c:1221 src/common/text.c:1227
-#: src/common/text.c:1232 src/common/text.c:1236 src/common/text.c:1242
-#: src/common/text.c:1248 src/common/text.c:1312 src/common/text.c:1328
-#: src/common/text.c:1333 src/common/text.c:1338 src/common/text.c:1347
-#: src/common/text.c:1358 src/common/text.c:1365 src/common/text.c:1371
-#: src/common/text.c:1376 src/common/text.c:1381 src/common/text.c:1388
-#: src/common/text.c:1394 src/common/text.c:1400 src/common/text.c:1405
-#: src/common/text.c:1410 src/common/text.c:1414 src/common/text.c:1420
-#: src/common/text.c:1428 src/common/text.c:1432 src/common/text.c:1467
-#: src/common/text.c:1472
+#: src/common/text.c:979 src/common/text.c:986 src/common/text.c:993
+#: src/common/text.c:1210 src/common/text.c:1217 src/common/text.c:1222
+#: src/common/text.c:1227 src/common/text.c:1232 src/common/text.c:1238
+#: src/common/text.c:1243 src/common/text.c:1247 src/common/text.c:1253
+#: src/common/text.c:1259 src/common/text.c:1323 src/common/text.c:1339
+#: src/common/text.c:1344 src/common/text.c:1349 src/common/text.c:1358
+#: src/common/text.c:1369 src/common/text.c:1376 src/common/text.c:1382
+#: src/common/text.c:1387 src/common/text.c:1392 src/common/text.c:1399
+#: src/common/text.c:1405 src/common/text.c:1411 src/common/text.c:1416
+#: src/common/text.c:1421 src/common/text.c:1425 src/common/text.c:1431
+#: src/common/text.c:1439 src/common/text.c:1443 src/common/text.c:1478
+#: src/common/text.c:1483
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/common/text.c:969
+#: src/common/text.c:980
 msgid "The action"
 msgstr "动作"
 
-#: src/common/text.c:970 src/common/text.c:977
+#: src/common/text.c:981 src/common/text.c:988
 msgid "Mode char"
 msgstr "模式字符"
 
-#: src/common/text.c:971 src/common/text.c:978 src/common/text.c:984
+#: src/common/text.c:982 src/common/text.c:989 src/common/text.c:995
 msgid "Identified text"
 msgstr "验证文本"
 
-#: src/common/text.c:976
+#: src/common/text.c:987
 msgid "The text"
 msgstr "文本"
 
-#: src/common/text.c:983 src/common/text.c:1059 src/common/text.c:1065
+#: src/common/text.c:994 src/common/text.c:1070 src/common/text.c:1076
 msgid "The message"
 msgstr "信息"
 
-#: src/common/text.c:988 src/common/text.c:993 src/common/text.c:998
-#: src/common/text.c:1264 src/common/text.c:1272 src/common/text.c:1278
-#: src/common/text.c:1284 src/common/text.c:1313 src/common/text.c:1441
-#: src/common/text.c:1483
+#: src/common/text.c:999 src/common/text.c:1004 src/common/text.c:1009
+#: src/common/text.c:1275 src/common/text.c:1283 src/common/text.c:1289
+#: src/common/text.c:1295 src/common/text.c:1324 src/common/text.c:1452
+#: src/common/text.c:1494
 msgid "Server Name"
 msgstr "服务器名"
 
-#: src/common/text.c:989
+#: src/common/text.c:1000
 msgid "Acknowledged Capabilities"
 msgstr "已知能力"
 
-#: src/common/text.c:994
+#: src/common/text.c:1005
 msgid "Removed Capabilities"
 msgstr "已移除的能力"
 
-#: src/common/text.c:999
+#: src/common/text.c:1010
 msgid "Server Capabilities"
 msgstr "服务器能力"
 
-#: src/common/text.c:1003
+#: src/common/text.c:1014
 msgid "Requested Capabilities"
 msgstr "请求能力"
 
-#: src/common/text.c:1007 src/common/text.c:1069
+#: src/common/text.c:1018 src/common/text.c:1080
 msgid "Old nickname"
 msgstr "原昵称"
 
-#: src/common/text.c:1008 src/common/text.c:1070
+#: src/common/text.c:1019 src/common/text.c:1081
 msgid "New nickname"
 msgstr "新昵称"
 
-#: src/common/text.c:1012
+#: src/common/text.c:1023
 msgid "Nick of person who changed the topic"
 msgstr "更改主题的用户"
 
-#: src/common/text.c:1013 src/common/text.c:1019 src/fe-gtk/chanlist.c:779
+#: src/common/text.c:1024 src/common/text.c:1030 src/fe-gtk/chanlist.c:779
 #: src/fe-gtk/chanlist.c:881 src/fe-gtk/setup.c:337
 msgid "Topic"
 msgstr "主题"
 
-#: src/common/text.c:1023 src/common/text.c:1076
+#: src/common/text.c:1034 src/common/text.c:1087
 msgid "The nickname of the kicker"
 msgstr "能踢人的用户"
 
-#: src/common/text.c:1024 src/common/text.c:1074
+#: src/common/text.c:1035 src/common/text.c:1085
 msgid "The person being kicked"
 msgstr "被踢者"
 
-#: src/common/text.c:1025 src/common/text.c:1032 src/common/text.c:1036
-#: src/common/text.c:1041 src/common/text.c:1075 src/common/text.c:1083
-#: src/common/text.c:1090
+#: src/common/text.c:1036 src/common/text.c:1043 src/common/text.c:1047
+#: src/common/text.c:1052 src/common/text.c:1086 src/common/text.c:1094
+#: src/common/text.c:1101
 msgid "The channel"
 msgstr "频道"
 
-#: src/common/text.c:1026 src/common/text.c:1077 src/common/text.c:1084
+#: src/common/text.c:1037 src/common/text.c:1088 src/common/text.c:1095
 msgid "The reason"
 msgstr "原因"
 
-#: src/common/text.c:1030 src/common/text.c:1081
+#: src/common/text.c:1041 src/common/text.c:1092
 msgid "The nick of the person leaving"
 msgstr "离开的用户"
 
-#: src/common/text.c:1037 src/common/text.c:1043
+#: src/common/text.c:1048 src/common/text.c:1054
 msgid "The time"
 msgstr "时间"
 
-#: src/common/text.c:1042
+#: src/common/text.c:1053
 msgid "The creator"
 msgstr "建立者"
 
-#: src/common/text.c:1047 src/fe-gtk/dccgui.c:827 src/fe-gtk/dccgui.c:1064
+#: src/common/text.c:1058 src/fe-gtk/dccgui.c:827 src/fe-gtk/dccgui.c:1064
 msgid "Nick"
 msgstr "昵称"
 
-#: src/common/text.c:1048 src/common/text.c:1334
+#: src/common/text.c:1059 src/common/text.c:1345
 msgid "Reason"
 msgstr "原因"
 
-#: src/common/text.c:1049 src/common/text.c:1201 src/common/text.c:1302
+#: src/common/text.c:1060 src/common/text.c:1212 src/common/text.c:1313
 msgid "Host"
 msgstr "主机"
 
-#: src/common/text.c:1053 src/common/text.c:1058 src/common/text.c:1063
+#: src/common/text.c:1064 src/common/text.c:1069 src/common/text.c:1074
 msgid "Who it's from"
 msgstr "来自于"
 
-#: src/common/text.c:1054
+#: src/common/text.c:1065
 msgid "The time in x.x format (see below)"
 msgstr "时间格式为 x.x (见下)"
 
-#: src/common/text.c:1064 src/common/text.c:1101
+#: src/common/text.c:1075 src/common/text.c:1112
 msgid "The Channel it's going to"
 msgstr "要进入的频道"
 
-#: src/common/text.c:1088
+#: src/common/text.c:1099
 msgid "The sound"
 msgstr "声音"
 
-#: src/common/text.c:1089 src/common/text.c:1095 src/common/text.c:1100
+#: src/common/text.c:1100 src/common/text.c:1106 src/common/text.c:1111
 msgid "The nick of the person"
 msgstr "此人的昵称"
 
-#: src/common/text.c:1094 src/common/text.c:1099
+#: src/common/text.c:1105 src/common/text.c:1110
 msgid "The CTCP event"
 msgstr "CTCP 事件"
 
-#: src/common/text.c:1105
+#: src/common/text.c:1116
 msgid "The nick of the person who set the key"
 msgstr "设置密码的用户"
 
-#: src/common/text.c:1106
+#: src/common/text.c:1117
 msgid "The key"
 msgstr "密码"
 
-#: src/common/text.c:1110
+#: src/common/text.c:1121
 msgid "The nick of the person who set the limit"
 msgstr "设置限制的用户"
 
-#: src/common/text.c:1111
+#: src/common/text.c:1122
 msgid "The limit"
 msgstr "限制"
 
-#: src/common/text.c:1115
+#: src/common/text.c:1126
 msgid "The nick of the person who did the op'ing"
 msgstr "使用了 op 命令的用户"
 
-#: src/common/text.c:1116
+#: src/common/text.c:1127
 msgid "The nick of the person who has been op'ed"
 msgstr "被授予管理员身份的用户"
 
-#: src/common/text.c:1120
+#: src/common/text.c:1131
 msgid "The nick of the person who has been halfop'ed"
 msgstr "被授予副管理员身份的用户"
 
-#: src/common/text.c:1121
+#: src/common/text.c:1132
 msgid "The nick of the person who did the halfop'ing"
 msgstr "使用 halfop 命令的用户"
 
-#: src/common/text.c:1125
+#: src/common/text.c:1136
 msgid "The nick of the person who did the voice'ing"
 msgstr "使用 voice 命令的用户"
 
-#: src/common/text.c:1126
+#: src/common/text.c:1137
 msgid "The nick of the person who has been voice'ed"
 msgstr "被赋予发言权的用户"
 
-#: src/common/text.c:1130
+#: src/common/text.c:1141
 msgid "The nick of the person who did the banning"
 msgstr "使用 ban 命令的用户"
 
-#: src/common/text.c:1131 src/common/text.c:1163
+#: src/common/text.c:1142 src/common/text.c:1174
 msgid "The ban mask"
 msgstr "ban 掩码"
 
-#: src/common/text.c:1135
+#: src/common/text.c:1146
 msgid "The nick of the person who did the quieting"
 msgstr "使用了静默选项的用户昵称"
 
-#: src/common/text.c:1136 src/common/text.c:1168
+#: src/common/text.c:1147 src/common/text.c:1179
 msgid "The quiet mask"
 msgstr "quiet 掩码"
 
-#: src/common/text.c:1140
+#: src/common/text.c:1151
 msgid "The nick who removed the key"
 msgstr "取消密码的用户"
 
-#: src/common/text.c:1144
+#: src/common/text.c:1155
 msgid "The nick who removed the limit"
 msgstr "取消用户限制的用户"
 
-#: src/common/text.c:1148
+#: src/common/text.c:1159
 msgid "The nick of the person who did the deop'ing"
 msgstr "使用 deop 命令的用户"
 
-#: src/common/text.c:1149
+#: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
 msgstr "被取消管理员身份的用户"
 
-#: src/common/text.c:1152
+#: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
 msgstr "使用 dehalfop 命令的用户"
 
-#: src/common/text.c:1153
+#: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
 msgstr "被取消副管理员身份的用户"
 
-#: src/common/text.c:1157
+#: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
 msgstr "使用 devoice 命令的用户"
 
-#: src/common/text.c:1158
+#: src/common/text.c:1169
 msgid "The nick of the person who has been devoice'ed"
 msgstr "被取消发言权的用户"
 
-#: src/common/text.c:1162
+#: src/common/text.c:1173
 msgid "The nick of the person who did the unban'ing"
 msgstr "使用 unban 命令的用户"
 
-#: src/common/text.c:1167
+#: src/common/text.c:1178
 msgid "The nick of the person who did the unquiet'ing"
 msgstr "使用了 unquiet 选项的用户昵称"
 
-#: src/common/text.c:1172
+#: src/common/text.c:1183
 msgid "The nick of the person who did the exempt"
 msgstr "使用 exempt 命令的用户"
 
-#: src/common/text.c:1173 src/common/text.c:1178
+#: src/common/text.c:1184 src/common/text.c:1189
 msgid "The exempt mask"
 msgstr "exempt 掩码"
 
-#: src/common/text.c:1177
+#: src/common/text.c:1188
 msgid "The nick of the person removed the exempt"
 msgstr "取消 exempt 的用户"
 
-#: src/common/text.c:1182
+#: src/common/text.c:1193
 msgid "The nick of the person who did the invite"
 msgstr "使用 invite 命令的用户"
 
-#: src/common/text.c:1183 src/common/text.c:1188
+#: src/common/text.c:1194 src/common/text.c:1199
 msgid "The invite mask"
 msgstr "invite 掩码"
 
-#: src/common/text.c:1187
+#: src/common/text.c:1198
 msgid "The nick of the person removed the invite"
 msgstr "取消 invite 的用户"
 
-#: src/common/text.c:1192
+#: src/common/text.c:1203
 msgid "The nick of the person setting the mode"
 msgstr "设置模式的用户"
 
-#: src/common/text.c:1193
+#: src/common/text.c:1204
 msgid "The mode's sign (+/-)"
 msgstr "模式符号(+/-)"
 
-#: src/common/text.c:1194
+#: src/common/text.c:1205
 msgid "The mode letter"
 msgstr "模式字符"
 
-#: src/common/text.c:1195
+#: src/common/text.c:1206
 msgid "The channel it's being set on"
 msgstr "被设置的频道"
 
-#: src/common/text.c:1202
+#: src/common/text.c:1213
 msgid "Full name"
 msgstr "全名"
 
-#: src/common/text.c:1207
+#: src/common/text.c:1218
 msgid "Channel Membership/\"is an IRC operator\""
 msgstr "频道成员/“是 IRC 管理员”"
 
-#: src/common/text.c:1212
+#: src/common/text.c:1223
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/common/text.c:1217 src/common/text.c:1222
+#: src/common/text.c:1228 src/common/text.c:1233
 msgid "Idle time"
 msgstr "发呆时间"
 
-#: src/common/text.c:1223
+#: src/common/text.c:1234
 msgid "Signon time"
 msgstr "登录时间"
 
-#: src/common/text.c:1228
+#: src/common/text.c:1239
 msgid "Away reason"
 msgstr "离开原因"
 
-#: src/common/text.c:1237 src/common/text.c:1243 src/common/text.c:1251
-#: src/common/text.c:1267 src/common/text.c:1459
+#: src/common/text.c:1248 src/common/text.c:1254 src/common/text.c:1262
+#: src/common/text.c:1278 src/common/text.c:1470
 msgid "Message"
 msgstr "信息"
 
-#: src/common/text.c:1244
+#: src/common/text.c:1255
 msgid "Account"
 msgstr "帐户"
 
-#: src/common/text.c:1249
+#: src/common/text.c:1260
 msgid "Real user@host"
 msgstr "真实 user@host"
 
-#: src/common/text.c:1250
+#: src/common/text.c:1261
 msgid "Real IP"
 msgstr "真实 IP"
 
-#: src/common/text.c:1255 src/common/text.c:1282 src/common/text.c:1288
-#: src/common/text.c:1318 src/common/text.c:1323 src/common/text.c:1482
+#: src/common/text.c:1266 src/common/text.c:1293 src/common/text.c:1299
+#: src/common/text.c:1329 src/common/text.c:1334 src/common/text.c:1493
 msgid "Channel Name"
 msgstr "频道名"
 
-#: src/common/text.c:1260
+#: src/common/text.c:1271
 msgid "Mechanism"
 msgstr "机制"
 
-#: src/common/text.c:1265 src/common/text.c:1273
+#: src/common/text.c:1276 src/common/text.c:1284
 msgid "Raw Numeric or Identifier"
 msgstr "原始数字/标识符"
 
-#: src/common/text.c:1271 src/common/text.c:1277 src/common/text.c:1445
+#: src/common/text.c:1282 src/common/text.c:1288 src/common/text.c:1456
 #: src/fe-gtk/menu.c:1547 src/fe-gtk/menu.c:1795 src/fe-gtk/setup.c:216
 #: src/fe-gtk/textgui.c:378
 msgid "Text"
 msgstr "文本"
 
-#: src/common/text.c:1283
+#: src/common/text.c:1294
 msgid "Nick of person who invited you"
 msgstr "邀请您的用户"
 
-#: src/common/text.c:1289 src/fe-gtk/chanlist.c:778
+#: src/common/text.c:1300 src/fe-gtk/chanlist.c:778
 msgid "Users"
 msgstr "用户"
 
-#: src/common/text.c:1293
+#: src/common/text.c:1304
 msgid "Nickname in use"
 msgstr "昵称已被使用"
 
-#: src/common/text.c:1294
+#: src/common/text.c:1305
 msgid "Nick being tried"
 msgstr "已尝试过的昵称"
 
-#: src/common/text.c:1303 src/common/text.c:1449
+#: src/common/text.c:1314 src/common/text.c:1460
 msgid "IP"
 msgstr "IP"
 
-#: src/common/text.c:1304 src/common/text.c:1340
+#: src/common/text.c:1315 src/common/text.c:1351
 msgid "Port"
 msgstr "端口"
 
-#: src/common/text.c:1319 src/common/text.c:1329
+#: src/common/text.c:1330 src/common/text.c:1340
 msgid "Modes string"
 msgstr "模式字符串"
 
-#: src/common/text.c:1324 src/fe-gtk/urlgrab.c:96
+#: src/common/text.c:1335 src/fe-gtk/urlgrab.c:96
 msgid "URL"
 msgstr "URL"
 
-#: src/common/text.c:1345 src/common/text.c:1370
+#: src/common/text.c:1356 src/common/text.c:1381
 msgid "DCC Type"
 msgstr "DCC 类型"
 
-#: src/common/text.c:1346 src/common/text.c:1351 src/common/text.c:1356
-#: src/common/text.c:1363 src/common/text.c:1383 src/common/text.c:1387
-#: src/common/text.c:1393 src/common/text.c:1399 src/common/text.c:1406
-#: src/common/text.c:1415 src/common/text.c:1421
+#: src/common/text.c:1357 src/common/text.c:1362 src/common/text.c:1367
+#: src/common/text.c:1374 src/common/text.c:1394 src/common/text.c:1398
+#: src/common/text.c:1404 src/common/text.c:1410 src/common/text.c:1417
+#: src/common/text.c:1426 src/common/text.c:1432
 msgid "Filename"
 msgstr "文件名"
 
-#: src/common/text.c:1357 src/common/text.c:1364
+#: src/common/text.c:1368 src/common/text.c:1375
 msgid "Destination filename"
 msgstr "目标文件名"
 
-#: src/common/text.c:1366 src/common/text.c:1395
+#: src/common/text.c:1377 src/common/text.c:1406
 msgid "CPS"
 msgstr "CPS"
 
-#: src/common/text.c:1401
+#: src/common/text.c:1412
 msgid "Pathname"
 msgstr "路径名"
 
-#: src/common/text.c:1416 src/fe-gtk/dccgui.c:823
+#: src/common/text.c:1427 src/fe-gtk/dccgui.c:823
 msgid "Position"
 msgstr "位置"
 
-#: src/common/text.c:1422 src/fe-gtk/dccgui.c:822
+#: src/common/text.c:1433 src/fe-gtk/dccgui.c:822
 msgid "Size"
 msgstr "大小"
 
-#: src/common/text.c:1427
+#: src/common/text.c:1438
 msgid "DCC String"
 msgstr "DCC 字符串"
 
-#: src/common/text.c:1433
+#: src/common/text.c:1444
 msgid "Away Reason"
 msgstr "离开原因"
 
-#: src/common/text.c:1437
+#: src/common/text.c:1448
 msgid "Number of notify items"
 msgstr "通知条目数"
 
-#: src/common/text.c:1453
+#: src/common/text.c:1464
 msgid "Old Filename"
 msgstr "原文件名"
 
-#: src/common/text.c:1454
+#: src/common/text.c:1465
 msgid "New Filename"
 msgstr "新文件名"
 
-#: src/common/text.c:1458
+#: src/common/text.c:1469
 msgid "Receiver"
 msgstr "接收者"
 
-#: src/common/text.c:1463
+#: src/common/text.c:1474
 msgid "Hostmask"
 msgstr "主机掩码"
 
-#: src/common/text.c:1468
+#: src/common/text.c:1479
 msgid "Hostname"
 msgstr "主机名"
 
-#: src/common/text.c:1473
+#: src/common/text.c:1484
 msgid "The Packet"
 msgstr "包"
 
-#: src/common/text.c:1477
+#: src/common/text.c:1488
 msgid "Seconds"
 msgstr "秒"
 
-#: src/common/text.c:1481
+#: src/common/text.c:1492
 msgid "Nick of person who have been invited"
 msgstr "被邀请的用户"
 
-#: src/common/text.c:1488
+#: src/common/text.c:1499
 msgid "Banmask"
 msgstr "屏蔽掩码"
 
-#: src/common/text.c:1489
+#: src/common/text.c:1500
 msgid "Who set the ban"
 msgstr "设置屏蔽的用户"
 
-#: src/common/text.c:1490
+#: src/common/text.c:1501
 msgid "Ban time"
 msgstr "屏蔽时间"
 
-#: src/common/text.c:2255
+#: src/common/text.c:2266
 #, c-format
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr "无法读取声音文件:\n%s"
+msgstr ""
+"无法读取声音文件:\n"
+"%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3117,15 +3197,15 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: src/common/dbus/dbus-client.c:83
+#: src/common/dbus/dbus-client.c:82
 msgid "Couldn't connect to session bus"
 msgstr "无法连接到会话 bus"
 
-#: src/common/dbus/dbus-client.c:105
+#: src/common/dbus/dbus-client.c:104
 msgid "Failed to complete NameHasOwner"
 msgstr "完成 NameHasOwner 失败"
 
-#: src/common/dbus/dbus-client.c:154 src/common/dbus/dbus-client.c:171
+#: src/common/dbus/dbus-client.c:153 src/common/dbus/dbus-client.c:170
 msgid "Failed to complete Command"
 msgstr "完成命令失败"
 
@@ -3137,12 +3217,12 @@ msgstr "远程访问"
 msgid "plugin for remote access using DBUS"
 msgstr "用 DBUS 远程访问的插件"
 
-#: src/common/dbus/dbus-plugin.c:900
+#: src/common/dbus/dbus-plugin.c:899
 #, c-format
 msgid "Couldn't connect to session bus: %s\n"
 msgstr "无法连接到会话 bus:%s\n"
 
-#: src/common/dbus/dbus-plugin.c:917
+#: src/common/dbus/dbus-plugin.c:916
 #, c-format
 msgid "Failed to acquire %s: %s\n"
 msgstr "获取 %s 失败:%s\n"
@@ -3346,7 +3426,10 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr "不能访问文件:%s\n%s。\n无法续传。"
+msgstr ""
+"不能访问文件:%s\n"
+"%s。\n"
+"无法续传。"
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
@@ -3498,7 +3581,10 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr "打开字体失败:\n\n%s"
+msgstr ""
+"打开字体失败:\n"
+"\n"
+"%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3516,23 +3602,31 @@ msgstr "网络发送队列:%d 字节"
 
 #: 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 "
-"text (which will be sent to the channel/person), commands or user commands. "
-"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 "“Run Command” 会执行 Data 1 中的数据,就如同您是在输入按键序列后出现的输入框中键入这些数据一样。这样,它就会包含文本 (这些文本会被发送给频道或某人)、命令或用户命令。执行时,Data 1 中所有“\\n”字符 被用来分隔命令,因此您可以执行不止一个命令。如果您想在执行的文本中包含字符“\\”,您应该输入“\\\\”"
+"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 text "
+"(which will be sent to the channel/person), commands or user commands. 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 ""
+"“Run Command” 会执行 Data 1 中的数据,就如同您是在输入按键序列后出现的输入框"
+"中键入这些数据一样。这样,它就会包含文本 (这些文本会被发送给频道或某人)、命令"
+"或用户命令。执行时,Data 1 中所有“\\n”字符 被用来分隔命令,因此您可以执行不止"
+"一个命令。如果您想在执行的文本中包含字符“\\”,您应该输入“\\\\”"
 
 #: 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 "
+"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 "
 "switch will be relative to the current position. Set Data 1 to auto to "
 "switch to the page with the most recent and important activity (queries "
 "first, then channels with hilight, channels with dialogue, channels with "
 "other data)"
-msgstr "“Change Page”命令在您笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签页。如果 Data 2 被设置成任意值,切换标签页的数将相对于当前位置。Data 1 设置为自动将自动切换到最近最重要的活动中(优先处理最近请求,其次显示高亮频道,再次显示有对话的频道,最后显示其他 data 的频道)"
+msgstr ""
+"“Change Page”命令在您笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签"
+"页。如果 Data 2 被设置成任意值,切换标签页的数将相对于当前位置。Data 1 设置为"
+"自动将自动切换到最近最重要的活动中(优先处理最近请求,其次显示高亮频道,再次显"
+"示有对话的频道,最后显示其他 data 的频道)"
 
 #: src/fe-gtk/fkeys.c:145
 msgid ""
@@ -3542,40 +3636,47 @@ msgstr "“Insert in Buffer” 命令把数据 1 中的内容插入到接收按
 
 #: 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 "“Scroll Page” 命令在文本窗口组件中上下滚动一页或一行。设置 Data 1 为 Top、Bottom、Up、DOWN、+1 或 -1。"
+"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 ""
+"“Scroll Page” 命令在文本窗口组件中上下滚动一页或一行。设置 Data 1 为 Top、"
+"Bottom、Up、DOWN、+1 或 -1。"
 
 #: 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"
+"The Set Buffer command sets the entry where the key sequence was entered to "
+"the contents of Data 1"
 msgstr "“Set Buffer” 命令把接收到按键序列后的输入区域设置为数据 1 中的内容"
 
 #: 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” 命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
+"The Last Command command sets the entry to contain the last command entered "
+"- the same as pressing up in a shell"
+msgstr ""
+"“Last Command” 命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
 
 #: 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” 命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
+"The Next Command command sets the entry to contain the next command entered "
+"- the same as pressing down in a shell"
+msgstr ""
+"“Next Command” 命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
 
 #: 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 键会选择上一次使用的昵称,而非下一个昵称"
+"or command. If Data 1 is set then double-tabbing in a string will select the "
+"last nick, not the next"
+msgstr ""
+"该命令改变输入区域中的文本,补全未输入完毕的用户昵称或命令。如果数据 1 被设"
+"置,那么,按两次 Tab 键会选择上一次使用的昵称,而非下一个昵称"
 
 #: 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 中设置了任何值,光标会上移,否则下移"
+"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 中设置了任何值,光标会上移,否则下移"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
@@ -3987,7 +4088,9 @@ msgstr "已选择 %d 个昵称。"
 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 "菜单栏当前已隐藏。您可以通过按下 Control+F9 组合键或以鼠标右键点选主要文本区域的空白部分重新显示它。"
+msgstr ""
+"菜单栏当前已隐藏。您可以通过按下 Control+F9 组合键或以鼠标右键点选主要文本区"
+"域的空白部分重新显示它。"
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4083,7 +4186,25 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-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”。"
+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:1486
 msgid ""
@@ -4098,7 +4219,18 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\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 = 选取的用户账号"
+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:1497
 msgid ""
@@ -4113,7 +4245,18 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\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 = 选取的用户账号"
+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:1508
 msgid ""
@@ -4129,7 +4272,19 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\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"
+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:1519
 #, c-format
@@ -4141,7 +4296,14 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr "URL 处理程序 - 特殊代码:\n\n%s  =  URL 字符串\n\n在命令前加一个 “!” 表示\n该命令应被发送到 shell 而\n非 HexChat"
+msgstr ""
+"URL 处理程序 - 特殊代码:\n"
+"\n"
+"%s  =  URL 字符串\n"
+"\n"
+"在命令前加一个 “!” 表示\n"
+"该命令应被发送到 shell 而\n"
+"非 HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4214,7 +4376,7 @@ msgstr ""
 msgid "_Load Plugin or Script"
 msgstr ""
 
-#: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:576
+#: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
 msgstr "离开(_Q)"
 
@@ -4304,7 +4466,7 @@ msgstr "用户菜单(_U)"
 msgid "S_ettings"
 msgstr "设置(_E)"
 
-#: src/fe-gtk/menu.c:1813 src/fe-gtk/plugin-tray.c:574
+#: src/fe-gtk/menu.c:1813 src/fe-gtk/plugin-tray.c:577
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
@@ -4525,79 +4687,79 @@ msgstr "私聊消息来自于:%s (%s)"
 msgid "Connected to %u networks and %u channels - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:546
+#: src/fe-gtk/plugin-tray.c:549
 msgid "_Restore Window"
 msgstr "还原窗口 (_R)"
 
-#: src/fe-gtk/plugin-tray.c:548
+#: src/fe-gtk/plugin-tray.c:551
 msgid "_Hide Window"
 msgstr "隐藏窗口 (_H)"
 
-#: src/fe-gtk/plugin-tray.c:552
+#: src/fe-gtk/plugin-tray.c:555
 msgid "_Blink on"
 msgstr "闪烁于(_B)"
 
-#: src/fe-gtk/plugin-tray.c:553 src/fe-gtk/setup.c:705
+#: src/fe-gtk/plugin-tray.c:556 src/fe-gtk/setup.c:705
 msgid "Channel Message"
 msgstr "频道消息"
 
-#: src/fe-gtk/plugin-tray.c:554 src/fe-gtk/setup.c:706
+#: src/fe-gtk/plugin-tray.c:557 src/fe-gtk/setup.c:706
 msgid "Private Message"
 msgstr "私聊消息"
 
-#: src/fe-gtk/plugin-tray.c:555 src/fe-gtk/setup.c:707
+#: src/fe-gtk/plugin-tray.c:558 src/fe-gtk/setup.c:707
 msgid "Highlighted Message"
 msgstr "高亮显示的消息"
 
 #. blink_item (BIT_FILEOFFER, submenu, _("File Offer"));
-#: src/fe-gtk/plugin-tray.c:558
+#: src/fe-gtk/plugin-tray.c:561
 msgid "_Change status"
 msgstr "更改状态(_C)"
 
-#: src/fe-gtk/plugin-tray.c:564
+#: src/fe-gtk/plugin-tray.c:567
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/fe-gtk/plugin-tray.c:567
+#: src/fe-gtk/plugin-tray.c:570
 msgid "_Back"
 msgstr "返回(_B)"
 
-#: src/fe-gtk/plugin-tray.c:631
+#: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:634
+#: src/fe-gtk/plugin-tray.c:637
 #, c-format
 msgid "%u highlighted messages, latest from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:654
+#: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:657
+#: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:681
+#: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:684
+#: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:724
+#: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
 msgstr ""
 
-#: src/fe-gtk/plugin-tray.c:727
+#: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
 msgstr ""
@@ -4670,7 +4832,8 @@ msgstr "您必须拥有两个昵称."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr "您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
+msgstr ""
+"您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4695,7 +4858,11 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr "%n=昵称\n%p=密码\n%r=真实姓名\n%u=用户名"
+msgstr ""
+"%n=昵称\n"
+"%p=密码\n"
+"%r=真实姓名\n"
+"%u=用户名"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5152,7 +5319,9 @@ msgstr "要使用的字典:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr "要使用的语言代码 (位于 \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" 中).\n以英文逗号分隔每一项。"
+msgstr ""
+"要使用的语言代码 (位于 \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" 中).\n"
+"以英文逗号分隔每一项。"
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5466,7 +5635,7 @@ msgid "Chat window"
 msgstr "聊天窗口"
 
 #: src/fe-gtk/setup.c:363
-msgid "Maximum File Transfer Speeds (Bytes per Second)"
+msgid "Maximum File Transfer Speeds (Byte per Second)"
 msgstr ""
 
 #: src/fe-gtk/setup.c:364
@@ -5527,7 +5696,8 @@ msgstr "在选择的事件上播放系统 \"即时消息提醒\" 声音"
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr "在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
+msgstr ""
+"在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5602,7 +5772,9 @@ msgstr "总是高亮显示的昵称:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr "请用逗号分隔多个词组。\n可以使用通配符。"
+msgstr ""
+"请用逗号分隔多个词组。\n"
+"可以使用通配符。"
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5708,8 +5880,8 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:562
 msgid ""
-"Automatically include timestamps in copied lines of text. Otherwise, include"
-" timestamps if the Shift key is held down while selecting."
+"Automatically include timestamps in copied lines of text. Otherwise, include "
+"timestamps if the Shift key is held down while selecting."
 msgstr ""
 
 #: src/fe-gtk/setup.c:564
@@ -5718,8 +5890,8 @@ msgstr "自动加上颜色信息"
 
 #: src/fe-gtk/setup.c:565
 msgid ""
-"Automatically include color information in copied lines of text.  Otherwise,"
-" include color information if the Ctrl key is held down while selecting."
+"Automatically include color information in copied lines of text.  Otherwise, "
+"include color information if the Ctrl key is held down while selecting."
 msgstr ""
 
 #: src/fe-gtk/setup.c:570
@@ -5770,8 +5942,7 @@ msgstr "屏蔽类型:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires "
-"irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
 msgstr "尝试在屏蔽或者设置静默时使用该屏蔽掩码 (需要 irc_who_join)。"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
@@ -5832,12 +6003,12 @@ msgid "Wingate"
 msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
-msgid "Socks4"
-msgstr "Socks4"
+msgid "SOCKS4"
+msgstr ""
 
 #: src/fe-gtk/setup.c:615
-msgid "Socks5"
-msgstr "Socks5"
+msgid "SOCKS5"
+msgstr ""
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -5881,9 +6052,11 @@ msgstr "从 IRC 服务器获取我的地址"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a "
-"192.168.*.* address!"
-msgstr "向 IRC 服务器查询您的真实地址。如果您有 192.168.*.* 这样的地址时,请使用此命令。"
+"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:640
 msgid "DCC IP address:"
@@ -5930,7 +6103,7 @@ msgid "Proxy Authentication"
 msgstr "代理服务器验证"
 
 #: src/fe-gtk/setup.c:653
-msgid "Use authentication (HTTP or Socks5 only)"
+msgid "Use authentication (HTTP or SOCKS5 only)"
 msgstr ""
 
 #: src/fe-gtk/setup.c:654
@@ -5953,7 +6126,8 @@ msgstr "服务器会返回网络用户名"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr "你必须有监听此端口的权限。若不是 113 (0 默认是这个) 你必须配置端口转发。"
+msgstr ""
+"你必须有监听此端口的权限。若不是 113 (0 默认是这个) 你必须配置端口转发。"
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6115,10 +6289,13 @@ msgstr "类别"
 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> 样式中进行调整。"
+msgstr ""
+"您不能把树状图放置于顶部或底部!\n"
+"请在 <b>视图</b> 菜单中的 <b>标签页</b> 样式中进行调整。"
 
 #: src/fe-gtk/setup.c:2254
-msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgid ""
+"The Real name option cannot be left blank. Falling back to \"realname\"."
 msgstr "真实姓名选项不能留空。回落到 “realname”。"
 
 #: src/fe-gtk/setup.c:2261
@@ -6131,37 +6308,41 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr "*警告*\n自动接收 DCC 到您的主目录中是危险之举,\n且有被盗用的可能性。例如:\n某人可能会给您发送一份 .bash_profile 文件"
+msgstr ""
+"*警告*\n"
+"自动接收 DCC 到您的主目录中是危险之举,\n"
+"且有被盗用的可能性。例如:\n"
+"某人可能会给您发送一份 .bash_profile 文件"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
 msgid "Preferences - %s"
 msgstr ""
 
-#: src/fe-gtk/sexy-spell-entry.c:554
+#: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
 msgstr "<i>(无拼写建议)</i>"
 
-#: src/fe-gtk/sexy-spell-entry.c:568
+#: src/fe-gtk/sexy-spell-entry.c:585
 msgid "More..."
 msgstr "更多..."
 
 #. + Add to Dictionary
-#: src/fe-gtk/sexy-spell-entry.c:640
+#: src/fe-gtk/sexy-spell-entry.c:657
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "将 \"%s\" 添加到字典"
 
 #. - Ignore All
-#: src/fe-gtk/sexy-spell-entry.c:685
+#: src/fe-gtk/sexy-spell-entry.c:702
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: src/fe-gtk/sexy-spell-entry.c:720
+#: src/fe-gtk/sexy-spell-entry.c:737
 msgid "Spelling Suggestions"
 msgstr "拼写建议"
 
-#: src/fe-gtk/sexy-spell-entry.c:1293
+#: src/fe-gtk/sexy-spell-entry.c:1310
 #, c-format
 msgid "enchant error for language: %s"
 msgstr "enchant 在以下语言中出错:%s"
@@ -6245,9 +6426,11 @@ msgstr "系统信息:%s 被设置为:%d\n"
 #: plugins/sysinfo/sysinfo.c:168
 msgid ""
 "Sysinfo: Valid settings are: announce and hide_* for each piece of "
-"information. e.g. hide_os. Without a value it will show current (or default)"
-" setting.\n"
-msgstr "系统信息:有效的信息是:通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没有值的话将会显示当前 (或默认) 设置。\n"
+"information. e.g. hide_os. Without a value it will show current (or default) "
+"setting.\n"
+msgstr ""
+"系统信息:有效的信息是:通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没"
+"有值的话将会显示当前 (或默认) 设置。\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6262,3 +6445,9 @@ msgstr "插件 %s 已载入\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "插件 %s 以卸载\n"
+
+#~ msgid "Socks4"
+#~ msgstr "Socks4"
+
+#~ msgid "Socks5"
+#~ msgstr "Socks5"