Change windows from starting with "Hexchat: " to ending with " - Hexchat"

1 files changed, 202 insertions, 202 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 617bcc5b..3a9fdd98 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -236,7 +236,7 @@ msgstr "进入频道..."
 
 #: ../src/common/hexchat.c:918 ../src/fe-gtk/menu.c:1410
 msgid "Enter Channel to Join:"
-msgstr "输入要进入的频道："
+msgstr "输入要进入的频道:"
 
 #: ../src/common/hexchat.c:919
 msgid "Server Links"
@@ -344,7 +344,7 @@ msgstr "找不到"
 
 #: ../src/common/inbound.c:1302
 msgid "Resolved to:"
-msgstr "解析到："
+msgstr "解析到:"
 
 #: ../src/common/inbound.c:1332
 #, c-format
@@ -382,7 +382,7 @@ msgstr "已将服务器 %s 添加到网络 %s 中。\n"
 #: ../src/common/outbound.c:368
 #, c-format
 msgid "Already marked away: %s\n"
-msgstr "已标记为离开：%s\n"
+msgstr "已标记为离开:%s\n"
 
 #: ../src/common/outbound.c:405
 msgid "Already marked back.\n"
@@ -394,15 +394,15 @@ msgstr "使用 /bin/sh 才能执行本程序！\n"
 
 #: ../src/common/outbound.c:2195
 msgid "Commands Available:"
-msgstr "可用命令："
+msgstr "可用命令:"
 
 #: ../src/common/outbound.c:2209
 msgid "User defined commands:"
-msgstr "用户自定义命令："
+msgstr "用户自定义命令:"
 
 #: ../src/common/outbound.c:2225
 msgid "Plugin defined commands:"
-msgstr "可用插件命令："
+msgstr "可用插件命令:"
 
 #: ../src/common/outbound.c:2236
 msgid "Type /HELP <command> for more information, or /HELP -l"
@@ -603,7 +603,7 @@ msgid ""
 "    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:3947
 msgid ""
@@ -860,12 +860,12 @@ msgstr "WALLCHOP <消息>，给当前频道中所有管理员发送消息"
 #: ../src/common/outbound.c:4093
 #, c-format
 msgid "User Command for: %s\n"
-msgstr "用户命令：%s\n"
+msgstr "用户命令:%s\n"
 
 #: ../src/common/outbound.c:4120
 #, c-format
 msgid "Usage: %s\n"
-msgstr "用法：%s\n"
+msgstr "用法:%s\n"
 
 #: ../src/common/outbound.c:4125
 msgid ""
@@ -902,7 +902,7 @@ msgstr "*\t服务器识别需要从 %s 作为 %s"
 #: ../src/common/plugin-identd.c:238
 #, c-format
 msgid "*\tError starting identd server: %s"
-msgstr "*\t开始 identd 服务器错误： %s"
+msgstr "*\t开始 identd 服务器错误: %s"
 
 #: ../src/common/plugin-identd.c:262
 msgid "IDENTD <port> <username>"
@@ -972,7 +972,7 @@ msgstr "%C22*%O$t 不能加入 %C22$1 %O(%C20您已被拦截%O)。"
 
 #: ../src/common/textevents.h:18
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
-msgstr "%C29*%O$t 已知能力： %C29$2%O"
+msgstr "%C29*%O$t 已知能力: %C29$2%O"
 
 #: ../src/common/textevents.h:21
 msgid "%C29*%O$tCapabilities removed: %C29$2%O"
@@ -980,11 +980,11 @@ msgstr "%C29*%O$t能力移除: %C29$2%O"
 
 #: ../src/common/textevents.h:24
 msgid "%C23*%O$tCapabilities supported: %C29$2%O"
-msgstr "%C23*%O$t 支持能力： %C29$2%O"
+msgstr "%C23*%O$t 支持能力: %C29$2%O"
 
 #: ../src/common/textevents.h:27
 msgid "%C23*%O$tCapabilities requested: %C29$1%O"
-msgstr "%C23*%O$t 请求能力：%C29$1%O"
+msgstr "%C23*%O$t 请求能力:%C29$1%O"
 
 #: ../src/common/textevents.h:30
 msgid "%C24*%O$t%C28$1%O is now known as %C18$2%O"
@@ -1032,7 +1032,7 @@ msgstr "%C22*%O$t%C26$1%O 在上 %C22$4%O 设置了 %C24$2$3%O 模式"
 
 #: ../src/common/textevents.h:72
 msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
-msgstr "%C22*%O$t 频道 %C22$1%O 模式： %C24$2"
+msgstr "%C22*%O$t 频道 %C22$1%O 模式: %C24$2"
 
 #: ../src/common/textevents.h:81
 msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
@@ -1182,7 +1182,7 @@ msgstr "%C20*%O$t 来自于 %C18$3%O 的 DCC RECV 连接 '%C23$1%O' 失败 (%C20
 
 #: ../src/common/textevents.h:189
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr "%C20*%O$t DCC RECV：无法打开 %C23$1%C 进行写入(%C20$2%O)。 "
+msgstr "%C20*%O$t DCC RECV:无法打开 %C23$1%C 进行写入(%C20$2%O)。 "
 
 #: ../src/common/textevents.h:192
 msgid ""
@@ -1335,7 +1335,7 @@ msgstr "通知列表中有 %C23*%O$t%C23$1%O 位用户。"
 
 #: ../src/common/textevents.h:312
 msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
-msgstr "%C23*%O$t 通知：%C18$1%C 下线了(%C29$3%O)。"
+msgstr "%C23*%O$t 通知:%C18$1%C 下线了(%C29$3%O)。"
 
 #: ../src/common/textevents.h:315
 msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
@@ -1353,7 +1353,7 @@ msgstr "%C24*$t$1 ($2%C24) 已离开 ($4)"
 
 #: ../src/common/textevents.h:327
 msgid "%C24*%O$tPing reply from %C18$1%C: %C24$2%O second(s)"
-msgstr "%C24*%O$t 从 %C18$1%C 处得到 Ping 回应时间：%C24$2%O 秒"
+msgstr "%C24*%O$t 从 %C18$1%C 处得到 Ping 回应时间:%C24$2%O 秒"
 
 #: ../src/common/textevents.h:330
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
@@ -1398,11 +1398,11 @@ msgstr "%C23*%O$t 前次连接尝试停止(%C24$1%O)"
 
 #: ../src/common/textevents.h:387
 msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
-msgstr "%C22*%O$t %C22$1%C的主题是：$2%O"
+msgstr "%C22*%O$t %C22$1%C的主题是:$2%O"
 
 #: ../src/common/textevents.h:390
 msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
-msgstr "%C22*%O$t%C26$1%C 已将主题更改为：$2%O"
+msgstr "%C22*%O$t%C26$1%C 已将主题更改为:$2%O"
 
 #: ../src/common/textevents.h:393
 msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
@@ -1434,7 +1434,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O"
 
 #: ../src/common/textevents.h:423
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
-msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O，登录时间：%C23$3%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O，登录时间:%C23$3%O"
 
 #: ../src/common/textevents.h:429
 msgid ""
@@ -2009,7 +2009,7 @@ msgstr "解析事件 %s 出错。\n正在载入默认值。"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr "无法读取声音文件：\n%s"
+msgstr "无法读取声音文件:\n%s"
 
 #: ../src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3162,12 +3162,12 @@ msgstr "用 DBUS 远程访问的插件"
 #: ../src/common/dbus/dbus-plugin.c:900
 #, c-format
 msgid "Couldn't connect to session bus: %s\n"
-msgstr "无法连接到会话 bus：%s\n"
+msgstr "无法连接到会话 bus:%s\n"
 
 #: ../src/common/dbus/dbus-plugin.c:917
 #, c-format
 msgid "Failed to acquire %s: %s\n"
-msgstr "获取 %s 失败：%s\n"
+msgstr "获取 %s 失败:%s\n"
 
 #: ../src/fe-gtk/ascii.c:126
 msgid "Character Chart"
@@ -3251,8 +3251,8 @@ msgstr "您只能在一个频道的标签页下打开屏蔽列表窗口。"
 
 #: ../src/fe-gtk/banlist.c:808
 #, c-format
-msgid ": Ban List (%s)"
-msgstr "：屏蔽列表(%s)"
+msgid "Ban List (%s) - "
+msgstr ":屏蔽列表(%s)"
 
 #: ../src/fe-gtk/banlist.c:843 ../src/fe-gtk/notifygui.c:427
 msgid "Remove"
@@ -3290,8 +3290,8 @@ msgstr "复制频道主题(_T)"
 
 #: ../src/fe-gtk/chanlist.c:720
 #, c-format
-msgid ": Channel List (%s)"
-msgstr "：频道列表(%s)"
+msgid "Channel List (%s) - "
+msgstr "频道列表(%s) - "
 
 #: ../src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3308,7 +3308,7 @@ msgstr "保存列表(_L)..."
 #. =============================================================
 #: ../src/fe-gtk/chanlist.c:819
 msgid "Show only:"
-msgstr "只显示："
+msgstr "只显示:"
 
 #: ../src/fe-gtk/chanlist.c:831
 msgid "channels with"
@@ -3325,7 +3325,7 @@ msgstr "位用户。"
 #. =============================================================
 #: ../src/fe-gtk/chanlist.c:862
 msgid "Look in:"
-msgstr "按照："
+msgstr "按照:"
 
 #: ../src/fe-gtk/chanlist.c:874
 msgid "Channel name"
@@ -3334,7 +3334,7 @@ msgstr "频道名称"
 #. =============================================================
 #: ../src/fe-gtk/chanlist.c:894
 msgid "Search type:"
-msgstr "搜索类型："
+msgstr "搜索类型:"
 
 #: ../src/fe-gtk/chanlist.c:901
 msgid "Simple Search"
@@ -3351,7 +3351,7 @@ msgstr "正则表达式"
 #. =============================================================
 #: ../src/fe-gtk/chanlist.c:913 ../src/fe-gtk/maingui.c:2902
 msgid "Find:"
-msgstr "查找："
+msgstr "查找:"
 
 #: ../src/fe-gtk/dccgui.c:141
 #, c-format
@@ -3369,7 +3369,7 @@ 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 ""
@@ -3382,8 +3382,8 @@ msgid "Cannot resume the same file from two people."
 msgstr "不能续传来自两个人的同一文件"
 
 #: ../src/fe-gtk/dccgui.c:802
-msgid ": Uploads and Downloads"
-msgstr "：文件传输列表"
+msgid "Uploads and Downloads - "
+msgstr "文件传输列表 - "
 
 #: ../src/fe-gtk/dccgui.c:819 ../src/fe-gtk/dccgui.c:1060
 #: ../src/fe-gtk/notifygui.c:124
@@ -3417,11 +3417,11 @@ msgstr "详细信息"
 
 #: ../src/fe-gtk/dccgui.c:878
 msgid "File:"
-msgstr "文件："
+msgstr "文件:"
 
 #: ../src/fe-gtk/dccgui.c:879
 msgid "Address:"
-msgstr "地址："
+msgstr "地址:"
 
 #: ../src/fe-gtk/dccgui.c:885 ../src/fe-gtk/dccgui.c:1084
 msgid "Abort"
@@ -3440,8 +3440,8 @@ msgid "Open Folder..."
 msgstr "打开目录..."
 
 #: ../src/fe-gtk/dccgui.c:1049
-msgid ": DCC Chat List"
-msgstr "：DCC 直连聊天列表"
+msgid "DCC Chat List - "
+msgstr "DCC 直连聊天列表 - "
 
 #: ../src/fe-gtk/dccgui.c:1062
 msgid "Recv"
@@ -3499,7 +3499,7 @@ msgstr "打开一个 irc://server:port/channel?key URL"
 
 #: ../src/fe-gtk/fe-gtk.c:87 ../src/fe-gtk/setup.c:268
 msgid "Execute command:"
-msgstr "执行命令："
+msgstr "执行命令:"
 
 #: ../src/fe-gtk/fe-gtk.c:89
 msgid "Open URL or execute command in an existing HexChat"
@@ -3523,7 +3523,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr "打开字体失败：\n\n%s"
+msgstr "打开字体失败:\n\n%s"
 
 #: ../src/fe-gtk/fe-gtk.c:714
 msgid "Search buffer is empty.\n"
@@ -3537,7 +3537,7 @@ msgstr "%d 字节"
 #: ../src/fe-gtk/fe-gtk.c:826
 #, c-format
 msgid "Network send queue: %d bytes"
-msgstr "网络发送队列：%d 字节"
+msgstr "网络发送队列:%d 字节"
 
 #: ../src/fe-gtk/fkeys.c:141
 msgid ""
@@ -3637,8 +3637,8 @@ msgid "Select a row to get help information on its Action."
 msgstr "选择一行查看对应动作的信息。"
 
 #: ../src/fe-gtk/fkeys.c:811
-msgid ": Keyboard Shortcuts"
-msgstr "：键盘快捷键"
+msgid "Keyboard Shortcuts - "
+msgstr "键盘快捷键 - "
 
 #: ../src/fe-gtk/gtkutil.c:126
 msgid "Cannot write to that file."
@@ -3679,35 +3679,35 @@ msgstr "您确定要删除 %s 中的全部忽略项吗？"
 
 #: ../src/fe-gtk/ignoregui.c:303
 msgid "Enter mask to ignore:"
-msgstr "输入要忽略的掩码："
+msgstr "输入要忽略的掩码:"
 
 #: ../src/fe-gtk/ignoregui.c:350
-msgid ": Ignore list"
-msgstr "：忽略列表"
+msgid "Ignore list - "
+msgstr "忽略列表 - "
 
 #: ../src/fe-gtk/ignoregui.c:358
 msgid "Ignore Stats:"
-msgstr "忽略统计："
+msgstr "忽略统计:"
 
 #: ../src/fe-gtk/ignoregui.c:366
 msgid "Channel:"
-msgstr "频道："
+msgstr "频道:"
 
 #: ../src/fe-gtk/ignoregui.c:367
 msgid "Private:"
-msgstr "私聊："
+msgstr "私聊:"
 
 #: ../src/fe-gtk/ignoregui.c:368
 msgid "Notice:"
-msgstr "通知："
+msgstr "通知:"
 
 #: ../src/fe-gtk/ignoregui.c:369
 msgid "CTCP:"
-msgstr "CTCP："
+msgstr "CTCP:"
 
 #: ../src/fe-gtk/ignoregui.c:370
 msgid "Invite:"
-msgstr "邀请："
+msgstr "邀请:"
 
 #: ../src/fe-gtk/ignoregui.c:381 ../src/fe-gtk/notifygui.c:423
 msgid "Add..."
@@ -3718,8 +3718,8 @@ msgid "Channel name too short, try again."
 msgstr "频道名称过短，请重新尝试。"
 
 #: ../src/fe-gtk/joind.c:133
-msgid ": Connection Complete"
-msgstr "：连接完毕"
+msgid "Connection Complete - "
+msgstr "连接完毕 - "
 
 #: ../src/fe-gtk/joind.c:161
 #, c-format
@@ -3742,7 +3742,7 @@ msgstr "我稍后自行进入频道。(_N)"
 
 #: ../src/fe-gtk/joind.c:190
 msgid "_Join this channel:"
-msgstr "进入以下频道(_J)："
+msgstr "进入以下频道(_J):"
 
 #: ../src/fe-gtk/joind.c:202
 msgid "If you know the name of the channel you want to join, enter it here."
@@ -3750,7 +3750,7 @@ msgstr "如果您知道想要进入的频道的名称，请在此输入。"
 
 #: ../src/fe-gtk/joind.c:209
 msgid "O_pen the Channel-List window."
-msgstr "打开频道列表窗口(_P)："
+msgstr "打开频道列表窗口(_P):"
 
 #: ../src/fe-gtk/joind.c:215
 msgid "Retrieving the Channel-List may take a minute or two."
@@ -3767,7 +3767,7 @@ msgstr "与以下用户对话"
 #: ../src/fe-gtk/maingui.c:696
 #, c-format
 msgid "Topic for %s is: %s"
-msgstr "%s 的主题：%s"
+msgstr "%s 的主题:%s"
 
 #: ../src/fe-gtk/maingui.c:701
 msgid "No topic is set"
@@ -3916,7 +3916,7 @@ msgstr "用户限制"
 
 #: ../src/fe-gtk/maingui.c:2593
 msgid "Enter new nickname:"
-msgstr "输入新昵称："
+msgstr "输入新昵称:"
 
 #: ../src/fe-gtk/maingui.c:2816
 msgid "No results found."
@@ -3970,23 +3970,23 @@ msgstr "未知"
 
 #: ../src/fe-gtk/menu.c:620 ../src/fe-gtk/menu.c:624
 msgid "Real Name:"
-msgstr "真实姓名："
+msgstr "真实姓名:"
 
 #: ../src/fe-gtk/menu.c:631
 msgid "User:"
-msgstr "用户："
+msgstr "用户:"
 
 #: ../src/fe-gtk/menu.c:638
 msgid "Account:"
-msgstr "账户："
+msgstr "账户:"
 
 #: ../src/fe-gtk/menu.c:648
 msgid "Country:"
-msgstr "国家："
+msgstr "国家:"
 
 #: ../src/fe-gtk/menu.c:654
 msgid "Server:"
-msgstr "服务器："
+msgstr "服务器:"
 
 #: ../src/fe-gtk/menu.c:665
 #, c-format
@@ -3995,11 +3995,11 @@ msgstr "%u 分钟之前"
 
 #: ../src/fe-gtk/menu.c:667 ../src/fe-gtk/menu.c:670
 msgid "Last Msg:"
-msgstr "最后发言："
+msgstr "最后发言:"
 
 #: ../src/fe-gtk/menu.c:680
 msgid "Away Msg:"
-msgstr "离开信息："
+msgstr "离开信息:"
 
 #: ../src/fe-gtk/menu.c:737
 #, c-format
@@ -4045,8 +4045,8 @@ msgid "_Auto-Connect"
 msgstr "自动连接(_A)"
 
 #: ../src/fe-gtk/menu.c:1137
-msgid ": User menu"
-msgstr "：用户菜单"
+msgid "User menu - "
+msgstr "用户菜单 - "
 
 #. sep
 #: ../src/fe-gtk/menu.c:1146
@@ -4105,7 +4105,7 @@ 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:1485
 msgid ""
@@ -4120,7 +4120,7 @@ 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:1496
 msgid ""
@@ -4166,36 +4166,36 @@ msgid ""
 msgstr "URL 处理程序 - 特殊代码:\n\n%s  =  URL 字符串\n\n在命令前加一个 “!” 表示\n该命令应被发送到 shell 而\n非 HexChat"
 
 #: ../src/fe-gtk/menu.c:1527
-msgid ": User Defined Commands"
-msgstr "：用户自定义命令"
+msgid "User Defined Commands - "
+msgstr "用户自定义命令 - "
 
 #: ../src/fe-gtk/menu.c:1534
-msgid ": Userlist Popup menu"
-msgstr "：用户列表弹出菜单"
+msgid "Userlist Popup menu - "
+msgstr "用户列表弹出菜单 - "
 
 #: ../src/fe-gtk/menu.c:1541
 msgid "Replace with"
 msgstr "使用以下替换"
 
 #: ../src/fe-gtk/menu.c:1541
-msgid ": Replace"
-msgstr "：替换"
+msgid "Replace - "
+msgstr "替换 - "
 
 #: ../src/fe-gtk/menu.c:1548
-msgid ": URL Handlers"
-msgstr "：URL 处理程序"
+msgid "URL Handlers - "
+msgstr "URL 处理程序 - "
 
 #: ../src/fe-gtk/menu.c:1567
-msgid ": Userlist buttons"
-msgstr "：用户列表按钮"
+msgid "Userlist buttons - "
+msgstr "用户列表按钮 - "
 
 #: ../src/fe-gtk/menu.c:1574
-msgid ": Dialog buttons"
-msgstr "：对话按钮"
+msgid "Dialog buttons - "
+msgstr "对话按钮 - "
 
 #: ../src/fe-gtk/menu.c:1581
-msgid ": CTCP Replies"
-msgstr "：CTCP 回应"
+msgid "CTCP Replies - "
+msgstr "CTCP 回应 - "
 
 #: ../src/fe-gtk/menu.c:1747
 msgid "He_xChat"
@@ -4491,19 +4491,19 @@ msgstr "上线"
 
 #: ../src/fe-gtk/notifygui.c:343
 msgid "Enter nickname to add:"
-msgstr "输入要添加的昵称："
+msgstr "输入要添加的昵称:"
 
 #: ../src/fe-gtk/notifygui.c:372
 msgid "Notify on these networks:"
-msgstr "在这些网络中进行通知："
+msgstr "在这些网络中进行通知:"
 
 #: ../src/fe-gtk/notifygui.c:383
 msgid "Comma separated list of networks is accepted."
 msgstr "此处允许使用逗号分隔多个网络。"
 
 #: ../src/fe-gtk/notifygui.c:409
-msgid ": Friends List"
-msgstr "：好友列表"
+msgid "Friends List - "
+msgstr "好友列表 - "
 
 #: ../src/fe-gtk/notifygui.c:431
 msgid "Open Dialog"
@@ -4512,7 +4512,7 @@ msgstr "打开对话框"
 #: ../src/fe-gtk/plugin-notification.c:111
 #, c-format
 msgid "Highlighted message from: %s (%s)"
-msgstr "高亮消息来自于：%s (%s)"
+msgstr "高亮消息来自于:%s (%s)"
 
 #: ../src/fe-gtk/plugin-notification.c:123
 #, c-format
@@ -4537,12 +4537,12 @@ msgstr "%s  (%s) 发的通知"
 #: ../src/fe-gtk/plugin-notification.c:158
 #, c-format
 msgid "Private message from: %s (%s)"
-msgstr "私聊消息来自于：%s (%s)"
+msgstr "私聊消息来自于:%s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:176
 #, c-format
-msgid ": Connected to %u networks and %u channels"
-msgstr "：已连接到 %u 个网络和 %u 个频道"
+msgid "Connected to %u networks and %u channels - "
+msgstr ":已连接到 %u 个网络和 %u 个频道"
 
 #: ../src/fe-gtk/plugin-tray.c:545
 msgid "_Restore Window"
@@ -4583,43 +4583,43 @@ msgstr "返回(_B)"
 
 #: ../src/fe-gtk/plugin-tray.c:630
 #, c-format
-msgid ": Highlighted message from: %s (%s)"
-msgstr "：高亮消息来自于：%s (%s)"
+msgid "Highlighted message from: %s (%s) - "
+msgstr ":高亮消息来自于:%s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:633
 #, c-format
-msgid ": %u highlighted messages, latest from: %s (%s)"
-msgstr "：%u 条高亮消息，最近一条来自于：%s (%s)"
+msgid "%u highlighted messages, latest from: %s (%s) - "
+msgstr ":%u 条高亮消息，最近一条来自于:%s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:652
 #, c-format
-msgid ": Channel message from: %s (%s)"
-msgstr ": 频道消息来自于: %s (%s)"
+msgid "Channel message from: %s (%s) - "
+msgstr "频道消息来自于: %s (%s) - "
 
 #: ../src/fe-gtk/plugin-tray.c:655
 #, c-format
-msgid ": %u channel messages."
-msgstr ": %u 频道消息。"
+msgid "%u channel messages. - "
+msgstr "%u 频道消息。 - "
 
 #: ../src/fe-gtk/plugin-tray.c:679
 #, c-format
-msgid ": Private message from: %s (%s)"
-msgstr "：私聊消息来自于：%s (%s)"
+msgid "Private message from: %s (%s) - "
+msgstr ":私聊消息来自于:%s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:682
 #, c-format
-msgid ": %u private messages, latest from: %s (%s)"
-msgstr "：%u 条私聊消息，最近的一个来自于: %s (%s)"
+msgid "%u private messages, latest from: %s (%s) - "
+msgstr ":%u 条私聊消息，最近的一个来自于: %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:722
 #, c-format
-msgid ": File offer from: %s (%s)"
-msgstr "XChat: 文件传输来自于: %s (%s)"
+msgid "File offer from: %s (%s) - "
+msgstr "文件传输来自于: %s (%s) - "
 
 #: ../src/fe-gtk/plugin-tray.c:725
 #, c-format
-msgid ": %u file offers, latest from: %s (%s)"
-msgstr "Xchat: %u 个文件传输,最近的一个来自于：%s (%s)"
+msgid "%u file offers, latest from: %s (%s) - "
+msgstr "%u 个文件传输,最近的一个来自于:%s (%s) - "
 
 #: ../src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4634,8 +4634,8 @@ msgid "Select a Plugin or Script to load"
 msgstr "选择要载入的插件或脚本"
 
 #: ../src/fe-gtk/plugingui.c:240
-msgid ": Plugins and Scripts"
-msgstr "：插件和脚本"
+msgid "Plugins and Scripts - "
+msgstr "插件和脚本 - "
 
 #: ../src/fe-gtk/plugingui.c:255
 msgid "_Load..."
@@ -4656,8 +4656,8 @@ msgstr "另存为..."
 
 #: ../src/fe-gtk/rawlog.c:112
 #, c-format
-msgid ": Raw Log (%s)"
-msgstr "：原始聊天记录 (%s)"
+msgid "Raw Log (%s) - "
+msgstr ":原始聊天记录 (%s)"
 
 #: ../src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4692,8 +4692,8 @@ msgstr "您向服务器发送的个人身份识别信息。如果需要自定义
 
 #: ../src/fe-gtk/servlistgui.c:1710
 #, c-format
-msgid ": Edit %s"
-msgstr "：编辑 %s"
+msgid "Edit %s - "
+msgstr "编辑 %s - "
 
 #: ../src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4753,27 +4753,27 @@ msgstr "使用全局用户信息"
 
 #: ../src/fe-gtk/servlistgui.c:1880 ../src/fe-gtk/servlistgui.c:1997
 msgid "_Nick name:"
-msgstr "昵称(_N)："
+msgstr "昵称(_N):"
 
 #: ../src/fe-gtk/servlistgui.c:1881 ../src/fe-gtk/servlistgui.c:2004
 msgid "Second choice:"
-msgstr "第二选择："
+msgstr "第二选择:"
 
 #: ../src/fe-gtk/servlistgui.c:1882
 msgid "Rea_l name:"
-msgstr "真实姓名(_L)："
+msgstr "真实姓名(_L):"
 
 #: ../src/fe-gtk/servlistgui.c:1883 ../src/fe-gtk/servlistgui.c:2018
 msgid "_User name:"
-msgstr "用户名(_U)："
+msgstr "用户名(_U):"
 
 #: ../src/fe-gtk/servlistgui.c:1885
 msgid "Login method:"
-msgstr "登录方法："
+msgstr "登录方法:"
 
 #: ../src/fe-gtk/servlistgui.c:1891 ../src/fe-gtk/setup.c:655
 msgid "Password:"
-msgstr "密码："
+msgstr "密码:"
 
 #: ../src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
@@ -4781,11 +4781,11 @@ msgstr "登录时使用的密码。如果不确定请留空。"
 
 #: ../src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
-msgstr "字符集："
+msgstr "字符集:"
 
 #: ../src/fe-gtk/servlistgui.c:1976
-msgid ": Network List"
-msgstr "：网络列表"
+msgid "Network List - "
+msgstr ":网络列表"
 
 #: ../src/fe-gtk/servlistgui.c:1987
 msgid "User Information"
@@ -4793,7 +4793,7 @@ msgstr "用户信息"
 
 #: ../src/fe-gtk/servlistgui.c:2011
 msgid "Third choice:"
-msgstr "第三选择："
+msgstr "第三选择:"
 
 #: ../src/fe-gtk/servlistgui.c:2071
 msgid "Networks"
@@ -5047,15 +5047,15 @@ msgstr "一般"
 
 #: ../src/fe-gtk/setup.c:151
 msgid "Language:"
-msgstr "语言："
+msgstr "语言:"
 
 #: ../src/fe-gtk/setup.c:152
 msgid "Main font:"
-msgstr "主要字体："
+msgstr "主要字体:"
 
 #: ../src/fe-gtk/setup.c:154
 msgid "Font:"
-msgstr "字体："
+msgstr "字体:"
 
 #: ../src/fe-gtk/setup.c:157
 msgid "Text Box"
@@ -5087,7 +5087,7 @@ msgstr "在最后读取的文本后添加一条红线。"
 
 #: ../src/fe-gtk/setup.c:161
 msgid "Background image:"
-msgstr "背景图像："
+msgstr "背景图像:"
 
 #: ../src/fe-gtk/setup.c:163
 msgid "Transparency Settings"
@@ -5095,7 +5095,7 @@ msgstr "透明度设置"
 
 #: ../src/fe-gtk/setup.c:164
 msgid "Window Opacity:"
-msgstr "窗口透明度："
+msgstr "窗口透明度:"
 
 #: ../src/fe-gtk/setup.c:166 ../src/fe-gtk/setup.c:593
 msgid "Time Stamps"
@@ -5107,7 +5107,7 @@ msgstr "启用时间戳"
 
 #: ../src/fe-gtk/setup.c:168
 msgid "Time stamp format:"
-msgstr "时间戳格式："
+msgstr "时间戳格式:"
 
 #: ../src/fe-gtk/setup.c:170 ../src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5163,7 +5163,7 @@ msgstr "拼写检查"
 
 #: ../src/fe-gtk/setup.c:197
 msgid "Dictionaries to use:"
-msgstr "要使用的字典："
+msgstr "要使用的字典:"
 
 #: ../src/fe-gtk/setup.c:199
 msgid ""
@@ -5181,15 +5181,15 @@ msgstr "昵称自动补全"
 
 #: ../src/fe-gtk/setup.c:205
 msgid "Nick completion suffix:"
-msgstr "昵称自动补全后缀："
+msgstr "昵称自动补全后缀:"
 
 #: ../src/fe-gtk/setup.c:206
 msgid "Nick completion sorted:"
-msgstr "昵称排序："
+msgstr "昵称排序:"
 
 #: ../src/fe-gtk/setup.c:207
 msgid "Nick completion amount:"
-msgstr "昵称自动补全量："
+msgstr "昵称自动补全量:"
 
 #: ../src/fe-gtk/setup.c:207
 msgid "Threshold of nicks to start listing instead of completing"
@@ -5277,11 +5277,11 @@ msgstr "显示当前频道用户数"
 
 #: ../src/fe-gtk/setup.c:260
 msgid "User list sorted by:"
-msgstr "用户列表排列方式："
+msgstr "用户列表排列方式:"
 
 #: ../src/fe-gtk/setup.c:261
 msgid "Show user list at:"
-msgstr "显示用户列表于："
+msgstr "显示用户列表于:"
 
 #: ../src/fe-gtk/setup.c:263
 msgid "Away Tracking"
@@ -5293,7 +5293,7 @@ msgstr "追踪用户的离开状态并且以不同颜色标记"
 
 #: ../src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
-msgstr "在小于此值的频道里："
+msgstr "在小于此值的频道里:"
 
 #: ../src/fe-gtk/setup.c:267
 msgid "Action Upon Double Click"
@@ -5305,7 +5305,7 @@ msgstr "附加小程序"
 
 #: ../src/fe-gtk/setup.c:271
 msgid "Lag meter:"
-msgstr "延时表："
+msgstr "延时表:"
 
 #: ../src/fe-gtk/setup.c:272
 msgid "Throttle meter:"
@@ -5348,7 +5348,7 @@ msgstr "树状图"
 #. {ST_HEADER,	N_("Channel Switcher"),0,0,0},
 #: ../src/fe-gtk/setup.c:311
 msgid "Switcher type:"
-msgstr "转换器类型："
+msgstr "转换器类型:"
 
 #: ../src/fe-gtk/setup.c:312
 msgid "Open an extra tab for server messages"
@@ -5384,19 +5384,19 @@ msgstr "小字"
 
 #: ../src/fe-gtk/setup.c:320
 msgid "Focus new tabs:"
-msgstr "聚焦到新标签页："
+msgstr "聚焦到新标签页:"
 
 #: ../src/fe-gtk/setup.c:321
 msgid "Placement of notices:"
-msgstr "放置通知："
+msgstr "放置通知:"
 
 #: ../src/fe-gtk/setup.c:322
 msgid "Show channel switcher at:"
-msgstr "显示频道转换器于："
+msgstr "显示频道转换器于:"
 
 #: ../src/fe-gtk/setup.c:323
 msgid "Shorten tab labels to:"
-msgstr "缩短标签页标签页至："
+msgstr "缩短标签页标签页至:"
 
 #: ../src/fe-gtk/setup.c:323
 msgid "letters."
@@ -5408,15 +5408,15 @@ msgstr "标签页或窗口"
 
 #: ../src/fe-gtk/setup.c:326
 msgid "Open channels in:"
-msgstr "打开频道于："
+msgstr "打开频道于:"
 
 #: ../src/fe-gtk/setup.c:327
 msgid "Open dialogs in:"
-msgstr "打开对话框于："
+msgstr "打开对话框于:"
 
 #: ../src/fe-gtk/setup.c:328
 msgid "Open utilities in:"
-msgstr "打开工具于："
+msgstr "打开工具于:"
 
 #: ../src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
@@ -5448,15 +5448,15 @@ msgstr "文件和目录"
 
 #: ../src/fe-gtk/setup.c:353
 msgid "Auto accept file offers:"
-msgstr "自动接受文件传输："
+msgstr "自动接受文件传输:"
 
 #: ../src/fe-gtk/setup.c:354
 msgid "Download files to:"
-msgstr "把文件下载到："
+msgstr "把文件下载到:"
 
 #: ../src/fe-gtk/setup.c:355
 msgid "Move completed files to:"
-msgstr "将完成下载的文件移动到："
+msgstr "将完成下载的文件移动到:"
 
 #: ../src/fe-gtk/setup.c:356
 msgid "Save nick name in filenames"
@@ -5484,7 +5484,7 @@ msgstr "最大文件传输速度(字节每秒)"
 
 #: ../src/fe-gtk/setup.c:364
 msgid "One upload:"
-msgstr "每个上传任务："
+msgstr "每个上传任务:"
 
 #: ../src/fe-gtk/setup.c:365 ../src/fe-gtk/setup.c:367
 msgid "Maximum speed for one transfer"
@@ -5492,11 +5492,11 @@ msgstr "一个传送进程的最大速度"
 
 #: ../src/fe-gtk/setup.c:366
 msgid "One download:"
-msgstr "每个下载任务："
+msgstr "每个下载任务:"
 
 #: ../src/fe-gtk/setup.c:368
 msgid "All uploads combined:"
-msgstr "所有上传："
+msgstr "所有上传:"
 
 #: ../src/fe-gtk/setup.c:369 ../src/fe-gtk/setup.c:371
 msgid "Maximum speed for all files"
@@ -5514,23 +5514,23 @@ msgstr "提示"
 
 #: ../src/fe-gtk/setup.c:403 ../src/fe-gtk/setup.c:485
 msgid "Show notifications on:"
-msgstr "显示通知于："
+msgstr "显示通知于:"
 
 #: ../src/fe-gtk/setup.c:404 ../src/fe-gtk/setup.c:442
 msgid "Blink tray icon on:"
-msgstr "托盘图标闪烁于："
+msgstr "托盘图标闪烁于:"
 
 #: ../src/fe-gtk/setup.c:405 ../src/fe-gtk/setup.c:447
 #: ../src/fe-gtk/setup.c:486 ../src/fe-gtk/setup.c:508
 msgid "Blink task bar on:"
-msgstr "任务栏图标闪烁于："
+msgstr "任务栏图标闪烁于:"
 
 #: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:410
 #: ../src/fe-gtk/setup.c:412 ../src/fe-gtk/setup.c:451
 #: ../src/fe-gtk/setup.c:454 ../src/fe-gtk/setup.c:456
 #: ../src/fe-gtk/setup.c:487 ../src/fe-gtk/setup.c:509
 msgid "Make a beep sound on:"
-msgstr "响铃于："
+msgstr "响铃于:"
 
 #: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:451
 msgid ""
@@ -5595,22 +5595,22 @@ msgstr "高亮显示消息"
 #: ../src/fe-gtk/setup.c:493 ../src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr "高亮消息是当您的昵称被提到时所显示的消息，同时还显示："
+msgstr "高亮消息是当您的昵称被提到时所显示的消息，同时还显示:"
 
 #: ../src/fe-gtk/setup.c:429 ../src/fe-gtk/setup.c:472
 #: ../src/fe-gtk/setup.c:495 ../src/fe-gtk/setup.c:517
 msgid "Extra words to highlight:"
-msgstr "需要高亮显示的其他单词："
+msgstr "需要高亮显示的其他单词:"
 
 #: ../src/fe-gtk/setup.c:430 ../src/fe-gtk/setup.c:473
 #: ../src/fe-gtk/setup.c:496 ../src/fe-gtk/setup.c:518
 msgid "Nick names not to highlight:"
-msgstr "不高亮显示的昵称："
+msgstr "不高亮显示的昵称:"
 
 #: ../src/fe-gtk/setup.c:431 ../src/fe-gtk/setup.c:474
 #: ../src/fe-gtk/setup.c:497 ../src/fe-gtk/setup.c:519
 msgid "Nick names to always highlight:"
-msgstr "总是高亮显示的昵称："
+msgstr "总是高亮显示的昵称:"
 
 #: ../src/fe-gtk/setup.c:432 ../src/fe-gtk/setup.c:475
 #: ../src/fe-gtk/setup.c:498 ../src/fe-gtk/setup.c:520
@@ -5629,15 +5629,15 @@ msgstr "默认信息"
 
 #: ../src/fe-gtk/setup.c:528
 msgid "Quit:"
-msgstr "退出："
+msgstr "退出:"
 
 #: ../src/fe-gtk/setup.c:529
 msgid "Leave channel:"
-msgstr "离开频道："
+msgstr "离开频道:"
 
 #: ../src/fe-gtk/setup.c:530
 msgid "Away:"
-msgstr "离开："
+msgstr "离开:"
 
 #: ../src/fe-gtk/setup.c:532
 msgid "Away"
@@ -5739,11 +5739,11 @@ msgstr "自动在复制的每行文本中加上颜色信息，否则，在选择
 
 #: ../src/fe-gtk/setup.c:570
 msgid "Real name:"
-msgstr "真实姓名："
+msgstr "真实姓名:"
 
 #: ../src/fe-gtk/setup.c:572
 msgid "Alternative fonts:"
-msgstr "备用字体："
+msgstr "备用字体:"
 
 #: ../src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
@@ -5773,15 +5773,15 @@ msgstr "断线重连"
 
 #: ../src/fe-gtk/setup.c:577
 msgid "Auto reconnect delay:"
-msgstr "自动重连间隔："
+msgstr "自动重连间隔:"
 
 #: ../src/fe-gtk/setup.c:578
 msgid "Auto join delay:"
-msgstr "自动重连间隔："
+msgstr "自动重连间隔:"
 
 #: ../src/fe-gtk/setup.c:579
 msgid "Ban Type:"
-msgstr "屏蔽类型："
+msgstr "屏蔽类型:"
 
 #: ../src/fe-gtk/setup.c:579
 msgid ""
@@ -5799,7 +5799,7 @@ msgstr "显示上一会话时的信息回滚"
 
 #: ../src/fe-gtk/setup.c:588
 msgid "Scrollback lines:"
-msgstr "往回滚动的行数："
+msgstr "往回滚动的行数:"
 
 #: ../src/fe-gtk/setup.c:589
 msgid "Enable logging of conversations to disk"
@@ -5807,7 +5807,7 @@ msgstr "允许对话记录写入磁盘"
 
 #: ../src/fe-gtk/setup.c:590
 msgid "Log filename:"
-msgstr "聊天记录文件名称："
+msgstr "聊天记录文件名称:"
 
 #: ../src/fe-gtk/setup.c:591
 #, c-format
@@ -5820,7 +5820,7 @@ msgstr "在聊天记录中插入时间戳"
 
 #: ../src/fe-gtk/setup.c:595
 msgid "Log timestamp format:"
-msgstr "聊天记录时间戳格式："
+msgstr "聊天记录时间戳格式:"
 
 #: ../src/fe-gtk/setup.c:602
 msgid "URLs"
@@ -5836,7 +5836,7 @@ msgstr "开启 URL 抓取程序"
 
 #: ../src/fe-gtk/setup.c:605
 msgid "Maximum number of URLs to grab:"
-msgstr "抓取最多的 URL 条目数："
+msgstr "抓取最多的 URL 条目数:"
 
 #: ../src/fe-gtk/setup.c:612
 msgid "(Disabled)"
@@ -5880,7 +5880,7 @@ msgstr "您的地址"
 
 #: ../src/fe-gtk/setup.c:634
 msgid "Bind to:"
-msgstr "绑定到："
+msgstr "绑定到:"
 
 #: ../src/fe-gtk/setup.c:635
 msgid "Only useful for computers with multiple addresses."
@@ -5902,7 +5902,7 @@ msgstr "向 IRC 服务器查询您的真实地址。如果您有 192.168.*.* 这
 
 #: ../src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
-msgstr "DCC IP 地址："
+msgstr "DCC IP 地址:"
 
 #: ../src/fe-gtk/setup.c:641
 msgid "Claim you are at this address when offering files."
@@ -5910,11 +5910,11 @@ msgstr "发送文件时声称您使用此地址。"
 
 #: ../src/fe-gtk/setup.c:642
 msgid "First DCC send port:"
-msgstr "第一个 DCC 文件发送端口："
+msgstr "第一个 DCC 文件发送端口:"
 
 #: ../src/fe-gtk/setup.c:643
 msgid "Last DCC send port:"
-msgstr "最后一个 DCC 文件传送端口："
+msgstr "最后一个 DCC 文件传送端口:"
 
 #: ../src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -5926,19 +5926,19 @@ msgstr "代理服务器"
 
 #: ../src/fe-gtk/setup.c:647
 msgid "Hostname:"
-msgstr "主机名："
+msgstr "主机名:"
 
 #: ../src/fe-gtk/setup.c:648 ../src/fe-gtk/setup.c:664
 msgid "Port:"
-msgstr "端口号："
+msgstr "端口号:"
 
 #: ../src/fe-gtk/setup.c:649
 msgid "Type:"
-msgstr "类型："
+msgstr "类型:"
 
 #: ../src/fe-gtk/setup.c:650
 msgid "Use proxy for:"
-msgstr "应用代理于："
+msgstr "应用代理于:"
 
 #: ../src/fe-gtk/setup.c:652
 msgid "Proxy Authentication"
@@ -5950,7 +5950,7 @@ msgstr "使用验证(仅支持 HTTP 或 Socks5 代理服务器)"
 
 #: ../src/fe-gtk/setup.c:654
 msgid "Username:"
-msgstr "用户名："
+msgstr "用户名:"
 
 #: ../src/fe-gtk/setup.c:662
 msgid "Identd Server"
@@ -6000,19 +6000,19 @@ msgstr "文本颜色"
 
 #: ../src/fe-gtk/setup.c:1536
 msgid "mIRC colors:"
-msgstr "mIRC 颜色："
+msgstr "mIRC 颜色:"
 
 #: ../src/fe-gtk/setup.c:1544
 msgid "Local colors:"
-msgstr "本地颜色："
+msgstr "本地颜色:"
 
 #: ../src/fe-gtk/setup.c:1552 ../src/fe-gtk/setup.c:1557
 msgid "Foreground:"
-msgstr "前景："
+msgstr "前景:"
 
 #: ../src/fe-gtk/setup.c:1553 ../src/fe-gtk/setup.c:1558
 msgid "Background:"
-msgstr "背景："
+msgstr "背景:"
 
 #: ../src/fe-gtk/setup.c:1555
 msgid "Selected Text"
@@ -6024,27 +6024,27 @@ msgstr "界面颜色"
 
 #: ../src/fe-gtk/setup.c:1562
 msgid "New data:"
-msgstr "新数据："
+msgstr "新数据:"
 
 #: ../src/fe-gtk/setup.c:1563
 msgid "Marker line:"
-msgstr "标记线："
+msgstr "标记线:"
 
 #: ../src/fe-gtk/setup.c:1564
 msgid "New message:"
-msgstr "新信息："
+msgstr "新信息:"
 
 #: ../src/fe-gtk/setup.c:1565
 msgid "Away user:"
-msgstr "离开的用户："
+msgstr "离开的用户:"
 
 #: ../src/fe-gtk/setup.c:1566
 msgid "Highlight:"
-msgstr "高亮显示："
+msgstr "高亮显示:"
 
 #: ../src/fe-gtk/setup.c:1567
 msgid "Spell checker:"
-msgstr "拼写检查程序："
+msgstr "拼写检查程序:"
 
 #: ../src/fe-gtk/setup.c:1569
 msgid "Color Stripping"
@@ -6146,11 +6146,11 @@ 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:2282
-msgid ": Preferences"
-msgstr "：首选项"
+msgid "Preferences - "
+msgstr ":首选项"
 
 #: ../src/fe-gtk/sexy-spell-entry.c:554
 msgid "<i>(no suggestions)</i>"
@@ -6178,7 +6178,7 @@ msgstr "拼写建议"
 #: ../src/fe-gtk/sexy-spell-entry.c:1293
 #, c-format
 msgid "enchant error for language: %s"
-msgstr "enchant 在以下语言中出错：%s"
+msgstr "enchant 在以下语言中出错:%s"
 
 #: ../src/fe-gtk/textgui.c:171
 msgid "There was an error parsing the string"
@@ -6214,8 +6214,8 @@ msgid "OK"
 msgstr "确认"
 
 #: ../src/fe-gtk/urlgrab.c:198
-msgid ": URL Grabber"
-msgstr "：URL 抓取程序"
+msgid "URL Grabber - "
+msgstr ":URL 抓取程序"
 
 #: ../src/fe-gtk/urlgrab.c:212
 msgid "Clear list"
@@ -6244,32 +6244,32 @@ msgstr "打开一个 irc://server:port/channel URL"
 
 #: ../plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr "系统信息：获取信息失败。可能是不支持也可能是错误。"
+msgstr "系统信息:获取信息失败。可能是不支持也可能是错误。"
 
 #: ../plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
-msgstr "系统信息：没有以此名字的信息\n"
+msgstr "系统信息:没有以此名字的信息\n"
 
 #: ../plugins/sysinfo/sysinfo.c:164 ../plugins/sysinfo/sysinfo.c:168
 #, c-format
 msgid "Sysinfo: %s is set to: %d\n"
-msgstr "系统信息：%s 被设置为：%d\n"
+msgstr "系统信息:%s 被设置为:%d\n"
 
 #: ../plugins/sysinfo/sysinfo.c:178
 msgid ""
 "Sysinfo: Valid settings are: announce and hide_* for each piece of "
 "information. e.g. hide_os. Without a value it will show current (or default)"
 " setting.\n"
-msgstr "系统信息：有效的信息是：通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没有值的话将会显示当前 (或默认) 设置。\n"
+msgstr "系统信息:有效的信息是:通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没有值的话将会显示当前 (或默认) 设置。\n"
 
 #: ../plugins/sysinfo/sysinfo.c:193 ../plugins/sysinfo/sysinfo.c:200
 #, c-format
 msgid "Sysinfo: pciids is set to: %s\n"
-msgstr "系统信息：pciids 被设置为：%s\n"
+msgstr "系统信息:pciids 被设置为:%s\n"
 
 #: ../plugins/sysinfo/sysinfo.c:218
 msgid "Sysinfo: Invalid variable name\n"
-msgstr "系统信息：无效的变量名\n"
+msgstr "系统信息:无效的变量名\n"
 
 #: ../plugins/sysinfo/sysinfo.c:267
 #, c-format