diff po/zh_CN.po @ 10697:9b50ea54f3bb

[gaim-migrate @ 12251] some i18n love for cvs HEAD also committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 15 Mar 2005 02:04:53 +0000
parents 70bf2351156b
children 364a2ef907ae
line wrap: on
line diff
--- a/po/zh_CN.po	Mon Mar 14 15:48:34 2005 +0000
+++ b/po/zh_CN.po	Tue Mar 15 02:04:53 2005 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-14 12:35+0800\n"
-"PO-Revision-Date: 2005-02-14 12:43+0800\n"
+"POT-Creation-Date: 2005-03-14 16:54+0800\n"
+"PO-Revision-Date: 2005-03-14 17:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -161,16 +161,16 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:179 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:994
-#: src/protocols/msn/msn.c:539 src/protocols/novell/novell.c:2811
-#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
-#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5742
-#: src/protocols/oscar/oscar.c:6803 src/protocols/oscar/oscar.c:7024
-#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:2927 src/protocols/zephyr/zephyr.c:2225
-#: src/status.c:160
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/gtkstatusbox.c:248
+#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:179
+#: src/protocols/irc/msgs.c:212 src/protocols/jabber/buddy.c:1080
+#: src/protocols/jabber/jabber.c:994 src/protocols/msn/msn.c:539
+#: src/protocols/novell/novell.c:2811 src/protocols/novell/novell.c:2928
+#: src/protocols/novell/novell.c:2980 src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:5760 src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:7047 src/protocols/silc/buddy.c:1393
+#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/zephyr/zephyr.c:2225 src/status.c:160
 msgid "Away"
 msgstr "离开"
 
@@ -186,7 +186,7 @@
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2298
 msgid "Accounts"
 msgstr "账户"
 
@@ -194,19 +194,15 @@
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:224
-msgid "Log Out"
-msgstr "登出"
-
-#: plugins/docklet/docklet.c:228
+#: plugins/docklet/docklet.c:219
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:550
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:563
+#: plugins/docklet/docklet.c:554
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -216,19 +212,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:589
+#: plugins/docklet/docklet.c:580
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:592
+#: plugins/docklet/docklet.c:583
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:594
+#: plugins/docklet/docklet.c:585
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -313,7 +309,7 @@
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
-#: plugins/gaim-remote/remote.c:749
+#: plugins/gaim-remote/remote.c:751
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -322,7 +318,7 @@
 "将 %s 指派给套接字失败:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:773
+#: plugins/gaim-remote/remote.c:775
 msgid "Unable to open socket"
 msgstr "无法打开套接字"
 
@@ -332,19 +328,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:823
+#: plugins/gaim-remote/remote.c:825
 msgid "Remote Control"
 msgstr "远程控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:826
+#: plugins/gaim-remote/remote.c:828
 msgid "Provides remote control for gaim applications."
 msgstr "提供 gaim 程序的远程控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:828
+#: plugins/gaim-remote/remote.c:830
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -505,7 +501,7 @@
 #: plugins/gevolution/add_buddy_dialog.c:132
 #: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
-#: src/protocols/msn/msn.c:1455 src/protocols/trepia/trepia.c:399
+#: src/protocols/msn/msn.c:1486 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "名称"
 
@@ -520,13 +516,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7388
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7411
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4281
-#: src/gtkblist.c:4659
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4325
+#: src/gtkblist.c:4703
 msgid "Group:"
 msgstr "组:"
 
@@ -563,7 +559,7 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4101
+#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4145
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -573,16 +569,16 @@
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:344
+#: plugins/gevolution/gevolution.c:345
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:348
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:416
+#: plugins/gevolution/gevolution.c:378 plugins/idle.c:52 src/gtkconn.c:426
 msgid "Account"
 msgstr "账户"
 
@@ -592,7 +588,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:460
+#: plugins/gevolution/gevolution.c:461
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -600,7 +596,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
@@ -626,8 +622,8 @@
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:377
-#: src/gtkaccount.c:407 src/protocols/oscar/oscar.c:597
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:393
+#: src/gtkaccount.c:415 src/protocols/oscar/oscar.c:597
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -758,68 +754,73 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:618
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:642
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:629
+#: plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:636
+#: plugins/notify.c:656
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:644
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:654
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:673
+#: plugins/notify.c:690
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:681
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
+#. Raise window method button
+#: plugins/notify.c:706
+msgid "R_aise conversation window"
+msgstr "升起对话窗口(_A)"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:689
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:694
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:701
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:709
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:717
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:726
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -829,7 +830,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:816
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -837,7 +838,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:819 plugins/notify.c:821
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读消息。"
 
@@ -931,7 +932,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:585
+#: plugins/signals-test.c:608
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -939,7 +940,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:588 plugins/signals-test.c:590
+#: plugins/signals-test.c:611 plugins/signals-test.c:613
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1230,7 +1231,7 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3377
+#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3424
 #: src/gtkprefs.c:2111
 msgid "Buddy List"
 msgstr "好友列表"
@@ -1303,48 +1304,48 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2605
-#: src/gtkdialogs.c:472 src/gtkdialogs.c:615 src/gtkdialogs.c:671
+#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2654
+#: src/gtkdialogs.c:472 src/gtkdialogs.c:614 src/gtkdialogs.c:669
 #: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097
 #: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
 #: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
 #: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2398
-#: src/protocols/oscar/oscar.c:3650 src/protocols/oscar/oscar.c:3744
-#: src/protocols/oscar/oscar.c:7117 src/protocols/oscar/oscar.c:7242
-#: src/protocols/oscar/oscar.c:7267 src/protocols/oscar/oscar.c:7319
+#: src/protocols/oscar/oscar.c:3661 src/protocols/oscar/oscar.c:3755
+#: src/protocols/oscar/oscar.c:7140 src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:7290 src/protocols/oscar/oscar.c:7342
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
 #: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
 #: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:706
-#: src/protocols/yahoo/yahoo.c:2650 src/protocols/yahoo/yahoo.c:2659
+#: src/protocols/yahoo/yahoo.c:2682 src/protocols/yahoo/yahoo.c:2691
 #: src/request.h:1244
 msgid "OK"
 msgstr "确定"
 
 #: src/account.c:798 src/account.c:836 src/connection.c:188
-#: src/gtkaccount.c:1989 src/gtkaccount.c:2404 src/gtkblist.c:2606
-#: src/gtkblist.c:4697 src/gtkdialogs.c:473 src/gtkdialogs.c:616
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:770 src/gtkdialogs.c:792
-#: src/gtkdialogs.c:812 src/gtkdialogs.c:856 src/gtkdialogs.c:918
-#: src/gtkdialogs.c:960 src/gtkdialogs.c:998 src/gtkimhtmltoolbar.c:443
+#: src/gtkaccount.c:2004 src/gtkaccount.c:2458 src/gtkblist.c:2655
+#: src/gtkblist.c:4741 src/gtkdialogs.c:473 src/gtkdialogs.c:615
+#: src/gtkdialogs.c:670 src/gtkdialogs.c:768 src/gtkdialogs.c:790
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:854 src/gtkdialogs.c:916
+#: src/gtkdialogs.c:958 src/gtkdialogs.c:996 src/gtkimhtmltoolbar.c:443
 #: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623
 #: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:774
+#: src/protocols/jabber/buddy.c:568 src/protocols/jabber/chat.c:777
 #: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
 #: src/protocols/oscar/oscar.c:1580 src/protocols/oscar/oscar.c:2399
-#: src/protocols/oscar/oscar.c:3608 src/protocols/oscar/oscar.c:3651
-#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3745
-#: src/protocols/oscar/oscar.c:7118 src/protocols/oscar/oscar.c:7243
-#: src/protocols/oscar/oscar.c:7268 src/protocols/oscar/oscar.c:7320
-#: src/protocols/oscar/oscar.c:7389 src/protocols/silc/buddy.c:461
+#: src/protocols/oscar/oscar.c:3619 src/protocols/oscar/oscar.c:3662
+#: src/protocols/oscar/oscar.c:3699 src/protocols/oscar/oscar.c:3756
+#: src/protocols/oscar/oscar.c:7141 src/protocols/oscar/oscar.c:7266
+#: src/protocols/oscar/oscar.c:7291 src/protocols/oscar/oscar.c:7343
+#: src/protocols/oscar/oscar.c:7412 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
 #: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
 #: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:707
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2651
-#: src/protocols/yahoo/yahoo.c:2660 src/request.h:1244 src/request.h:1254
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2683
+#: src/protocols/yahoo/yahoo.c:2692 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "取消"
 
@@ -1353,13 +1354,13 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:567
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:623
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/buddy.c:1083
+#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/buddy.c:1087
 #: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "未知"
@@ -1432,67 +1433,67 @@
 msgid "Unable to send messge to %s."
 msgstr "无法给 %s 发送消息。"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2083
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:2055
+#: src/conversation.c:2086
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2151
+#: src/conversation.c:2182
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2154
+#: src/conversation.c:2185
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2226
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2197
+#: src/conversation.c:2228
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2270
+#: src/conversation.c:2301
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2272
+#: src/conversation.c:2303
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2677
+#: src/conversation.c:2708
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2679
+#: src/conversation.c:2710
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2681 src/gtkprefs.c:1221
+#: src/conversation.c:2712 src/gtkprefs.c:1221
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2683
+#: src/conversation.c:2714
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2685
+#: src/conversation.c:2716
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:368
+#: src/ft.c:149 src/protocols/msn/msn.c:368
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1501,7 +1502,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:152
+#: src/ft.c:153
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1510,7 +1511,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:156
+#: src/ft.c:157
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1519,35 +1520,35 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:188
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:198
+#: src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:205
+#: src/ft.c:206
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:261
+#: src/ft.c:264
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:269
+#: src/ft.c:272
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:308
+#: src/ft.c:313
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:312
+#: src/ft.c:317
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1558,53 +1559,58 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:365
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:383
+#: src/ft.c:392
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:877
+#: src/ft.c:401
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "开始来自 %2$s 的 %1$s 传送"
+
+#: src/ft.c:555
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:880
+#: src/ft.c:558
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:929
+#: src/ft.c:943
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:935
+#: src/ft.c:949
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:988
+#: src/ft.c:1007
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:994
+#: src/ft.c:1013
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1043
-#, c-format
-msgid "File transfer to %s aborted.\n"
-msgstr "您中止了给 %s 的文件传送。\n"
-
-#: src/ft.c:1045
-#, c-format
-msgid "File transfer from %s aborted.\n"
-msgstr "%s 中止了给您的文件传送。\n"
+#: src/ft.c:1070
+#, c-format
+msgid "File transfer to %s failed.\n"
+msgstr "给 %s 传送文件失败。\n"
+
+#: src/ft.c:1072
+#, c-format
+msgid "File transfer from %s failed.\n"
+msgstr "来自 %s 的文件传送失败。\n"
 
 #: src/gaim-remote.c:104
 #, c-format
@@ -1742,7 +1748,7 @@
 "\n"
 "发送即时消息\n"
 
-#: src/gtkaccount.c:329
+#: src/gtkaccount.c:343
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1754,161 +1760,161 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:652
+#: src/gtkaccount.c:663
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:669 src/gtkft.c:554
+#: src/gtkaccount.c:680 src/gtkft.c:554
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:674 src/gtkblist.c:4253
+#: src/gtkaccount.c:685 src/gtkblist.c:4297
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:758
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4267 src/gtkblist.c:4644
+#: src/gtkaccount.c:763 src/gtkblist.c:4311 src/gtkblist.c:4688
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:756
+#: src/gtkaccount.c:767
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:812
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:825
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:823
+#: src/gtkaccount.c:834
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:912
+#: src/gtkaccount.c:923
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
+#: src/gtkaccount.c:1061 src/gtkaccount.c:1108
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
+#: src/gtkaccount.c:1067 src/gtkaccount.c:1115
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
+#: src/gtkaccount.c:1073 src/gtkaccount.c:1122
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
+#: src/gtkaccount.c:1079 src/gtkaccount.c:1129
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
+#: src/gtkaccount.c:1085 src/gtkaccount.c:1136
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1024
+#: src/gtkaccount.c:1091 src/gtkaccount.c:1143 src/gtkprefs.c:1024
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1182
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1186
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1189
+#: src/gtkaccount.c:1202
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1207 src/gtkprefs.c:1018
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1018
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1045
+#: src/gtkaccount.c:1229 src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1220 src/gtkprefs.c:1063
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1228
+#: src/gtkaccount.c:1241
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1233 src/gtkprefs.c:1100
+#: src/gtkaccount.c:1246 src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1602
+#: src/gtkaccount.c:1617
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1619
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1628
+#: src/gtkaccount.c:1643
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1629
+#: src/gtkaccount.c:1644
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1651 src/protocols/jabber/jabber.c:675
+#: src/gtkaccount.c:1666 src/protocols/jabber/jabber.c:675
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1983 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:1998 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1988 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2003 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2045 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4297
+#: src/gtkaccount.c:2068 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4308
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2068
+#: src/gtkaccount.c:2091
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/gtkaccount.c:2076
+#: src/gtkaccount.c:2099
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2379
+#: src/gtkaccount.c:2433
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2393
+#: src/gtkaccount.c:2447
 msgid ""
 "\n"
 "\n"
@@ -1918,251 +1924,248 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2397
+#: src/gtkaccount.c:2451
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2401
+#: src/gtkaccount.c:2455
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2403 src/gtkblist.c:4696 src/gtkconv.c:1454
-#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3922
+#: src/gtkaccount.c:2457 src/gtkblist.c:4740 src/gtkconv.c:1453
+#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3933
 #: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:840
+#: src/gtkblist.c:844
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:861
+#: src/gtkblist.c:865
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:876 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1177
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1180
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1186
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1192
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1258
+#: src/gtkblist.c:1196 src/gtkblist.c:1200 src/gtkblist.c:1298
+#: src/gtkblist.c:1321
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1171
+#: src/gtkblist.c:1211
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1173
+#: src/gtkblist.c:1213
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1175
+#: src/gtkblist.c:1215
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855
+#: src/gtkblist.c:1218 src/gtkdialogs.c:852 src/gtkdialogs.c:853
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280
+#: src/gtkblist.c:1222 src/gtkblist.c:1306 src/gtkblist.c:1327
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285
-#: src/gtkconn.c:156
+#: src/gtkblist.c:1224 src/gtkblist.c:1308 src/gtkblist.c:1329
+#: src/gtkconn.c:166
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1230
+#: src/gtkblist.c:1270
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1272
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1274
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1276
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:89
+#: src/gtkblist.c:1294 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:101
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1296
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1282 src/gtkblist.c:1307
+#: src/gtkblist.c:1334 src/gtkblist.c:1357
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1312
+#: src/gtkblist.c:1362
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509
-#: src/gtkblist.c:3512
+#: src/gtkblist.c:1579 src/gtkblist.c:1589 src/gtkblist.c:3557
+#: src/gtkblist.c:3560
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:1980 src/gtkconv.c:4145 src/gtkpounce.c:314
+#: src/gtkblist.c:2030 src/gtkconv.c:4143 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:2599
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2550
+#: src/gtkblist.c:2600
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2551
+#: src/gtkblist.c:2601
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2552
+#: src/gtkblist.c:2602
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2553
+#: src/gtkblist.c:2603
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2555
+#: src/gtkblist.c:2605
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2556
+#: src/gtkblist.c:2606
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:2607
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2558
+#: src/gtkblist.c:2608
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2559
+#: src/gtkblist.c:2609
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2561
-msgid "/Buddies/_Log Out"
-msgstr "/好友(B)/登出(_L)"
-
-#: src/gtkblist.c:2562
+#: src/gtkblist.c:2611
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2565
+#: src/gtkblist.c:2614
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2566
+#: src/gtkblist.c:2615
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2567
+#: src/gtkblist.c:2616
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2568
+#: src/gtkblist.c:2617
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2570
+#: src/gtkblist.c:2619
 msgid "/Tools/_Statuses"
 msgstr "/工具(T)/状态(_S)"
 
-#: src/gtkblist.c:2571
+#: src/gtkblist.c:2620
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2572
+#: src/gtkblist.c:2621
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2573
+#: src/gtkblist.c:2622
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2574
+#: src/gtkblist.c:2623
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2575
+#: src/gtkblist.c:2624
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2626
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2578
+#: src/gtkblist.c:2627
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2630
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2582
+#: src/gtkblist.c:2631
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2583
+#: src/gtkblist.c:2632
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2584
+#: src/gtkblist.c:2633
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2651
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2651
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2652
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2634 src/gtkblist.c:2701
+#: src/gtkblist.c:2683 src/gtkblist.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -2171,7 +2174,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2710
+#: src/gtkblist.c:2759
 #, c-format
 msgid ""
 "\n"
@@ -2180,7 +2183,7 @@
 "\n"
 "<b>联系人别名:</b> %s"
 
-#: src/gtkblist.c:2718
+#: src/gtkblist.c:2767
 #, c-format
 msgid ""
 "\n"
@@ -2189,7 +2192,7 @@
 "\n"
 "<b>别名:</b> %s"
 
-#: src/gtkblist.c:2726
+#: src/gtkblist.c:2775
 #, c-format
 msgid ""
 "\n"
@@ -2198,7 +2201,7 @@
 "\n"
 "<b>昵称:</b> %s"
 
-#: src/gtkblist.c:2735
+#: src/gtkblist.c:2784
 #, c-format
 msgid ""
 "\n"
@@ -2207,7 +2210,7 @@
 "\n"
 "<b>登入:</b> %s"
 
-#: src/gtkblist.c:2747
+#: src/gtkblist.c:2796
 #, c-format
 msgid ""
 "\n"
@@ -2216,7 +2219,7 @@
 "\n"
 "<b>瞌睡:</b> %s"
 
-#: src/gtkblist.c:2751
+#: src/gtkblist.c:2800
 msgid ""
 "\n"
 "<b>Idle</b>"
@@ -2224,7 +2227,7 @@
 "\n"
 "<b>瞌睡</b>"
 
-#: src/gtkblist.c:2762
+#: src/gtkblist.c:2811
 #, c-format
 msgid ""
 "\n"
@@ -2233,12 +2236,12 @@
 "\n"
 "<b>上次看见:</b> %s 以前"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2820
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2772
+#: src/gtkblist.c:2821
 #, c-format
 msgid ""
 "\n"
@@ -2247,7 +2250,7 @@
 "\n"
 "<b>警告:</b> %s"
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2827
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2255,7 +2258,7 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2799
+#: src/gtkblist.c:2848
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2263,7 +2266,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2801
+#: src/gtkblist.c:2850
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2271,7 +2274,7 @@
 "\n"
 "<b>状态:</b> 可怕"
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2852
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2279,111 +2282,107 @@
 "\n"
 "<b>状态:</b> 混乱"
 
-#: src/gtkblist.c:3045
+#: src/gtkblist.c:3094
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:3047
+#: src/gtkblist.c:3096
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3099
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3105
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:3060
+#: src/gtkblist.c:3109
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3179
+#: src/gtkblist.c:3228
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: src/gtkblist.c:3180 src/gtkblist.c:3215
+#: src/gtkblist.c:3229 src/gtkblist.c:3263
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3181
+#: src/gtkblist.c:3230
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: src/gtkblist.c:3182
+#: src/gtkblist.c:3231
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3232
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: src/gtkblist.c:3184
+#: src/gtkblist.c:3233
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: src/gtkblist.c:3185
-msgid "/Buddies/Log Out"
-msgstr "/好友(B)/登出"
-
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3266
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3269
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
+#: src/gtkblist.c:3337 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:3291
+#: src/gtkblist.c:3339
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3292
+#: src/gtkblist.c:3340
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3293
+#: src/gtkblist.c:3341
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3405
+#: src/gtkblist.c:3452
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3406
+#: src/gtkblist.c:3453
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3407
+#: src/gtkblist.c:3454
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3505
+#: src/gtkblist.c:3553
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3555
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4207 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4251 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2613
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4231
+#: src/gtkblist.c:4275
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2393,47 +2392,47 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4291 src/gtkblist.c:4624
+#: src/gtkblist.c:4335 src/gtkblist.c:4668
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4557
+#: src/gtkblist.c:4601
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4573
+#: src/gtkblist.c:4617
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4590
+#: src/gtkblist.c:4634
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4614
+#: src/gtkblist.c:4658
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/gtkblist.c:4693
+#: src/gtkblist.c:4737
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4694
+#: src/gtkblist.c:4738
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5239 src/gtkblist.c:5335
+#: src/gtkblist.c:5288 src/gtkblist.c:5384
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:156 src/gtkconn.c:389
+#: src/gtkconn.c:166 src/gtkconn.c:399
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:353
+#: src/gtkconn.c:363
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2446,36 +2445,36 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:355
+#: src/gtkconn.c:365
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:363
+#: src/gtkconn.c:373
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:394
+#: src/gtkconn.c:404
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:424
+#: src/gtkconn.c:434
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:310
+#: src/gtkconv.c:309
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:318
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:343
+#: src/gtkconv.c:342
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:346
+#: src/gtkconv.c:345
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2483,354 +2482,354 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:418
+#: src/gtkconv.c:417
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:425
+#: src/gtkconv.c:424
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:430
+#: src/gtkconv.c:429
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:437
+#: src/gtkconv.c:436
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:440
+#: src/gtkconv.c:439
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:444
+#: src/gtkconv.c:443
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:672 src/gtkconv.c:698
+#: src/gtkconv.c:671 src/gtkconv.c:697
 msgid "That buddy is not on the same protocol as this chat"
 msgstr "该好友不在此聊天的协议中"
 
-#: src/gtkconv.c:692
+#: src/gtkconv.c:691
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:746
+#: src/gtkconv.c:745
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:776
+#: src/gtkconv.c:775
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:797
+#: src/gtkconv.c:796
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:817 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:816 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:873 src/gtkconv.c:2524 src/gtkdebug.c:177
+#: src/gtkconv.c:872 src/gtkconv.c:2521 src/gtkdebug.c:177
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:877
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:892
+#: src/gtkconv.c:891
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:977 src/gtkdebug.c:126
+#: src/gtkconv.c:976 src/gtkdebug.c:126
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1003 src/gtkdebug.c:154
+#: src/gtkconv.c:1002 src/gtkdebug.c:154
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1415
+#: src/gtkconv.c:1414
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612
+#: src/gtkconv.c:1420 src/protocols/oscar/oscar.c:612
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1428
+#: src/gtkconv.c:1427
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1431 src/gtkprefs.c:762
+#: src/gtkconv.c:1430 src/gtkprefs.c:762
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1436
+#: src/gtkconv.c:1435
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1442
+#: src/gtkconv.c:1441
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1451 src/gtkrequest.c:265
+#: src/gtkconv.c:1450 src/gtkrequest.c:265
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2532
+#: src/gtkconv.c:2529
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2553
+#: src/gtkconv.c:2550
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2583
+#: src/gtkconv.c:2580
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2585
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2594
+#: src/gtkconv.c:2591
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2952
+#: src/gtkconv.c:2950
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2957
+#: src/gtkconv.c:2955
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3056
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3510
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3514
+#: src/gtkconv.c:3512
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3517
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3519
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
+#: src/gtkconv.c:3520
+msgid "/Conversation/_Save As..."
+msgstr "/对话(C)/另存为(_S)..."
+
 #: src/gtkconv.c:3522
-msgid "/Conversation/_Save As..."
-msgstr "/对话(C)/另存为(_S)..."
-
-#: src/gtkconv.c:3524
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3526
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
+#: src/gtkconv.c:3527
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/对话(C)/添加好友千里眼(_P)..."
+
 #: src/gtkconv.c:3529
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话(C)/添加好友千里眼(_P)..."
-
-#: src/gtkconv.c:3531
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3531
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3535
+#: src/gtkconv.c:3533
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3538
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3540
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
+#: src/gtkconv.c:3542
+msgid "/Conversation/_Add..."
+msgstr "/对话(C)/添加(_A)..."
+
 #: src/gtkconv.c:3544
-msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
-
-#: src/gtkconv.c:3546
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
+#: src/gtkconv.c:3549
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/对话(C)/插入链接(_K)..."
+
 #: src/gtkconv.c:3551
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
-
-#: src/gtkconv.c:3553
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3558
+#: src/gtkconv.c:3556
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3560
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3563
+#: src/gtkconv.c:3561
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3562
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3563
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3564
 msgid "/Options/Show T_imestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3565
 msgid "/Options/Show Buddy _Icon"
 msgstr "/选项(O)/显示好友图标(_I)"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3609
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3614
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3618
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3624
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3628
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3632
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3638
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3642
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3646
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3650
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3656
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3660
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3668
+#: src/gtkconv.c:3666
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3669
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3674
+#: src/gtkconv.c:3672
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:3675
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: src/gtkconv.c:3680
+#: src/gtkconv.c:3678
 msgid "/Options/Show Buddy Icon"
 msgstr "/选项(O)/显示好友图标(I)"
 
-#: src/gtkconv.c:3795
+#: src/gtkconv.c:3793
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3843
+#: src/gtkconv.c:3841
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3905
+#: src/gtkconv.c:3903
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3918
+#: src/gtkconv.c:3916
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3930
+#: src/gtkconv.c:3928
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4431
+#: src/gtkconv.c:4429
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4933 src/gtkconv.c:4962 src/gtkconv.c:5058 src/gtkconv.c:5116
+#: src/gtkconv.c:4931 src/gtkconv.c:4960 src/gtkconv.c:5056 src/gtkconv.c:5114
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6021
+#: src/gtkconv.c:6023
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6024
+#: src/gtkconv.c:6026
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6027
+#: src/gtkconv.c:6029
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6031
+#: src/gtkconv.c:6033
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
@@ -2851,204 +2850,204 @@
 msgstr "时间戳"
 
 #: src/gtkdialogs.c:66
-msgid "maintainer"
-msgstr "维护者"
-
-#: src/gtkdialogs.c:67
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:68 src/gtkdialogs.c:71 src/gtkdialogs.c:72
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
-#: src/gtkdialogs.c:77
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:72 src/gtkdialogs.c:73 src/gtkdialogs.c:74
+#: src/gtkdialogs.c:76
 msgid "developer"
 msgstr "开发者"
 
+#: src/gtkdialogs.c:68
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
 #: src/gtkdialogs.c:69
-msgid "developer & webmaster"
-msgstr "开发者和网管"
-
-#: src/gtkdialogs.c:70
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/gtkdialogs.c:76
+#: src/gtkdialogs.c:75
 msgid "support"
 msgstr "支持"
 
 #: src/gtkdialogs.c:93
+msgid "maintainer"
+msgstr "维护者"
+
+#: src/gtkdialogs.c:94
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/gtkdialogs.c:94
-msgid "former lead developer"
-msgstr "先前领导开发者"
-
 #: src/gtkdialogs.c:95
-msgid "former maintainer"
-msgstr "先前维护者"
+msgid "former lead developer"
+msgstr "先前领导开发者"
 
 #: src/gtkdialogs.c:96
+msgid "former maintainer"
+msgstr "先前维护者"
+
+#: src/gtkdialogs.c:97
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/gtkdialogs.c:97
-msgid "original author"
-msgstr "原作者"
-
 #: src/gtkdialogs.c:98
+msgid "original author"
+msgstr "原作者"
+
+#: src/gtkdialogs.c:99
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:142
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:143 src/gtkdialogs.c:144
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:145
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:107
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:108
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:109
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:110
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:145
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
-msgid "Finnish"
-msgstr "芬兰语"
-
 #: src/gtkdialogs.c:113 src/gtkdialogs.c:148
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:149
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:116
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:117
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:151
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:120
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:120 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:152
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:122
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:124
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:124 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:125 src/gtkdialogs.c:153
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:126
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:127
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:128
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:154 src/gtkdialogs.c:155
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:130
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:130
+#: src/gtkdialogs.c:131
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:131 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:133
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/gtkdialogs.c:134
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/gtkdialogs.c:135
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:141
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:156
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:157
+#: src/gtkdialogs.c:158
 msgid "Chinese"
 msgstr "中文"
 
-#: src/gtkdialogs.c:198
+#: src/gtkdialogs.c:199
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:223
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3058,39 +3057,39 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
 "成,并以 GPL 许可协议发行。<BR><BR>"
 
-#: src/gtkdialogs.c:231
+#: src/gtkdialogs.c:232
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
 
-#: src/gtkdialogs.c:234
+#: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/gtkdialogs.c:240
+#: src/gtkdialogs.c:241
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:255
+#: src/gtkdialogs.c:256
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:270
+#: src/gtkdialogs.c:271
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:285
+#: src/gtkdialogs.c:286
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:305
+#: src/gtkdialogs.c:306
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652
-msgid "_Screen name"
-msgstr "用户名(_S)"
-
-#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:597 src/gtkdialogs.c:651
+msgid "_Name"
+msgstr "名称(_N)"
+
+#: src/gtkdialogs.c:460 src/gtkdialogs.c:602 src/gtkdialogs.c:656
 msgid "_Account"
 msgstr "账户(_A)"
 
@@ -3099,32 +3098,35 @@
 msgstr "新即时消息"
 
 #: src/gtkdialogs.c:469
-msgid "Please enter the screen name of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:610
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:609
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:612
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr "您想要查看谁的信息?请输入他/她的用户名。"
+#: src/gtkdialogs.c:611
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:664
+msgid "Get User Log"
+msgstr "获取用户日志"
 
 #: src/gtkdialogs.c:666
-msgid "Get User Log"
-msgstr "获取用户日志"
-
-#: src/gtkdialogs.c:668
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:708
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
+
+#: src/gtkdialogs.c:706
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:729
+#: src/gtkdialogs.c:727
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3136,45 +3138,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:738
+#: src/gtkdialogs.c:736
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:745
+#: src/gtkdialogs.c:743
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:766
+#: src/gtkdialogs.c:764
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:767
+#: src/gtkdialogs.c:765
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkdialogs.c:767 src/gtkdialogs.c:789 src/gtkdialogs.c:809
 #: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:787
+#: src/gtkdialogs.c:785
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:789
+#: src/gtkdialogs.c:787
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:808
+#: src/gtkdialogs.c:806
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:809
+#: src/gtkdialogs.c:807
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:846
+#: src/gtkdialogs.c:844
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3186,35 +3188,35 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:913
+#: src/gtkdialogs.c:911
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
+#: src/gtkdialogs.c:914 src/gtkdialogs.c:915
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:955
+#: src/gtkdialogs.c:953
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
+#: src/gtkdialogs.c:956 src/gtkdialogs.c:957
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:992
+#: src/gtkdialogs.c:990
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:996 src/gtkdialogs.c:997
+#: src/gtkdialogs.c:994 src/gtkdialogs.c:995
 msgid "Remove Chat"
 msgstr "删除聊天"
 
@@ -3313,7 +3315,7 @@
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:702 src/gtkstock.c:93
+#: src/gtkft.c:702 src/gtkstock.c:105
 msgid "_Pause"
 msgstr "暂停(_P)"
 
@@ -3338,42 +3340,42 @@
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1021
+#: src/gtkimhtml.c:1023
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1022
+#: src/gtkimhtml.c:1024
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1236
+#: src/gtkimhtml.c:1238
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1248
+#: src/gtkimhtml.c:1250
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1258
+#: src/gtkimhtml.c:1260
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2848
+#: src/gtkimhtml.c:2847
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2856
+#: src/gtkimhtml.c:2855
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945
+#: src/gtkimhtml.c:2932 src/gtkimhtml.c:2944
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2973
+#: src/gtkimhtml.c:2972
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3477,13 +3479,52 @@
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:308
+#: src/gtklog.c:200
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "在 %2$s 的 %1$s 中的对话"
+
+#: src/gtklog.c:202
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "与 %s 在 %s 的对话"
+
+#: src/gtklog.c:396
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Enable "
+"system log preference</span> is set."
+msgstr ""
+"仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日志。"
+
+#: src/gtklog.c:400
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+"仅当选择了<span style=\"italic\">记录所有即时消息</span>时才会记录即时消息。"
+
+#: src/gtklog.c:403
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+"仅当选择了<span style=\"italic\">记录所有聊天</span>首选项时才会记录聊天。"
+
+#: src/gtklog.c:408
+msgid "No logs were found."
+msgstr "未找到日志。"
+
+#: src/gtklog.c:454
+#, c-format
+msgid "Conversations in %s"
+msgstr "与 %s 的对话"
+
+#: src/gtklog.c:462 src/gtklog.c:512
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#. Window **********
-#: src/gtklog.c:396 src/gtklog.c:412
+#: src/gtklog.c:537
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3757,8 +3798,8 @@
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:801 src/protocols/jabber/chat.c:763
+#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:804 src/protocols/jabber/chat.c:766
 msgid "Description"
 msgstr "描述"
 
@@ -3862,7 +3903,7 @@
 msgstr "新对话放置(_P):"
 
 #: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:5185
+#: src/protocols/oscar/oscar.c:5203
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -4105,12 +4146,12 @@
 msgstr "离开时"
 
 #: src/gtkprefs.c:1702
-msgid "When away and idle"
-msgstr "离开和瞌睡时"
+msgid "if (away && idle)"
+msgstr "如果离开且瞌睡"
 
 #: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504
 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817
-#: src/protocols/oscar/oscar.c:4312 src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/oscar/oscar.c:4323 src/protocols/yahoo/yahoo.c:2442
 #: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
@@ -4309,7 +4350,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1027
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1026
 #: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511
 #: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
@@ -4317,7 +4358,7 @@
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1027
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1026
 #: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511
 #: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
@@ -4334,19 +4375,19 @@
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1492
+#: src/gtkrequest.c:1629
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1493
+#: src/gtkrequest.c:1630
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1531 src/gtkrequest.c:1556
+#: src/gtkrequest.c:1672 src/gtkrequest.c:1713
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1532 src/gtkrequest.c:1557
+#: src/gtkrequest.c:1673 src/gtkrequest.c:1714
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4359,8 +4400,8 @@
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:795 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:798 src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "标题"
 
@@ -4376,9 +4417,9 @@
 #: src/protocols/jabber/jabber.c:977 src/protocols/jabber/jabber.c:983
 #: src/protocols/jabber/jabber.c:989 src/protocols/jabber/jabber.c:995
 #: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jabber.c:1007
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7018
-#: src/protocols/oscar/oscar.c:7025 src/protocols/yahoo/yahoo.c:2894
-#: src/protocols/yahoo/yahoo.c:2928 src/protocols/zephyr/zephyr.c:2226
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:7048 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/zephyr/zephyr.c:2226
 msgid "Message"
 msgstr "消息"
 
@@ -4394,12 +4435,12 @@
 msgid "Custom status"
 msgstr "自定义状态"
 
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:616
-#: src/protocols/jabber/buddy.c:623 src/protocols/jabber/buddy.c:634
+#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:619
+#: src/protocols/jabber/buddy.c:626 src/protocols/jabber/buddy.c:637
 #: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502
 #: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
 #: src/protocols/oscar/oscar.c:747 src/protocols/oscar/oscar.c:753
-#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2565
 msgid "Status"
 msgstr "状态"
 
@@ -4478,28 +4519,70 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
+#: src/gtkstatusbox.c:133
+msgid "Typing"
+msgstr "正打字"
+
+#. connect to the server
+#: src/gtkstatusbox.c:138 src/protocols/irc/irc.c:259
+#: src/protocols/jabber/jabber.c:801 src/protocols/msn/session.c:359
+#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
+#: src/protocols/oscar/oscar.c:1818 src/protocols/trepia/trepia.c:1068
+#: src/protocols/yahoo/yahoo.c:2262 src/protocols/zephyr/zephyr.c:1492
+msgid "Connecting"
+msgstr "正连接"
+
+#. hacks
+#: src/gtkstatusbox.c:247 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
+#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
+#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:7040 src/protocols/yahoo/yahoo.c:2920
+#: src/status.c:157
+msgid "Available"
+msgstr "可用"
+
+#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:54
+#: src/protocols/oscar/oscar.c:695 src/protocols/oscar/oscar.c:7054
+#: src/protocols/yahoo/yahoo.c:2440 src/protocols/yahoo/yahoo.c:2964
+msgid "Invisible"
+msgstr "隐身"
+
+#: src/gtkstatusbox.c:250 src/protocols/gg/gg.c:282
+#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1074
+#: src/protocols/jabber/jabber.c:971 src/protocols/msn/msn.c:527
+#: src/protocols/napster/napster.c:556 src/protocols/novell/novell.c:2820
+#: src/protocols/oscar/oscar.c:755 src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7030 src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2444 src/protocols/yahoo/yahoo.c:2914
+#: src/status.c:155
+msgid "Offline"
+msgstr "离线"
+
 #. TODO: Add saved statuses here?
 #: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
 msgid "New Status"
 msgstr "新建状态"
 
-#: src/gtkstock.c:88
+#: src/gtkstock.c:100
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkstock.c:90
+#: src/gtkstock.c:102
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#: src/gtkstock.c:91
+#: src/gtkstock.c:103
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/gtkstock.c:92
+#: src/gtkstock.c:104
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/gtkstock.c:94
+#: src/gtkstock.c:106
 msgid "_Warn"
 msgstr "警告(_W)"
 
@@ -4588,7 +4671,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:608
+#: src/log.c:607
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4597,7 +4680,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:610
+#: src/log.c:609
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4606,40 +4689,40 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:661 src/log.c:791
+#: src/log.c:660 src/log.c:790
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:671 src/log.c:803
+#: src/log.c:670 src/log.c:802
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:675
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:736
+#: src/log.c:735
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:807
+#: src/log.c:806
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/plugin.c:287
+#: src/plugin.c:320
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:292 src/plugin.c:320
+#: src/plugin.c:325 src/plugin.c:353
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:316
+#: src/plugin.c:349
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4648,17 +4731,6 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
-#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
-#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2808 src/protocols/novell/novell.c:2927
-#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
-#: src/protocols/oscar/oscar.c:7017 src/protocols/yahoo/yahoo.c:2888
-#: src/status.c:157
-msgid "Available"
-msgstr "可用"
-
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "只对好友可用"
@@ -4667,12 +4739,6 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:695
-#: src/protocols/oscar/oscar.c:7031 src/protocols/yahoo/yahoo.c:2408
-#: src/protocols/yahoo/yahoo.c:2932
-msgid "Invisible"
-msgstr "隐身"
-
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
@@ -4689,9 +4755,9 @@
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:134
-#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
-#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
 #: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
@@ -4712,30 +4778,20 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4111
+#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4122
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1089
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4115
-#: src/protocols/oscar/oscar.c:4341 src/protocols/silc/ops.c:1088
+#: src/protocols/gg/gg.c:248 src/protocols/gg/gg.c:1088
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4352 src/protocols/silc/ops.c:1088
 #: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
 #: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/protocols/gg/gg.c:282 src/protocols/irc/irc.c:167
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:971
-#: src/protocols/msn/msn.c:527 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:755
-#: src/protocols/oscar/oscar.c:6813 src/protocols/oscar/oscar.c:7007
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2412
-#: src/protocols/yahoo/yahoo.c:2882 src/status.c:155
-msgid "Offline"
-msgstr "离线"
-
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
 #. OPSTAFF "hidden"
@@ -4750,11 +4806,11 @@
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
 #: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:976
 #: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7012
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2414
-#: src/protocols/yahoo/yahoo.c:2885 src/protocols/zephyr/zephyr.c:2218
+#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7035
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2446
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/zephyr/zephyr.c:2218
 #: src/status.c:156
 msgid "Online"
 msgstr "在线"
@@ -4773,148 +4829,148 @@
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:752 src/protocols/napster/napster.c:486
+#: src/protocols/gg/gg.c:751 src/protocols/napster/napster.c:486
 #: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2009 src/protocols/yahoo/yahoo.c:2036
-#: src/protocols/yahoo/yahoo.c:2099 src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:112 src/protocols/yahoo/ycht.c:483
+#: src/protocols/yahoo/yahoo.c:2032 src/protocols/yahoo/yahoo.c:2059
+#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:771
+#: src/protocols/gg/gg.c:770
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:774
+#: src/protocols/gg/gg.c:773
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:777
+#: src/protocols/gg/gg.c:776
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:787
+#: src/protocols/gg/gg.c:786
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:805 src/protocols/gg/gg.c:896
+#: src/protocols/gg/gg.c:804 src/protocols/gg/gg.c:895
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:852
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:864
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:870
+#: src/protocols/gg/gg.c:869
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:873
+#: src/protocols/gg/gg.c:872
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:920
+#: src/protocols/gg/gg.c:919
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:995
+#: src/protocols/gg/gg.c:994
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:999
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1026
+#: src/protocols/gg/gg.c:1025
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1031 src/protocols/oscar/oscar.c:5177
+#: src/protocols/gg/gg.c:1030 src/protocols/oscar/oscar.c:5195
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1035 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:5188 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1034 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:5206 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1040 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:5189 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1039 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:5207 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1044 src/protocols/gg/gg.c:1789
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5178
+#: src/protocols/gg/gg.c:1043 src/protocols/gg/gg.c:1788
+#: src/protocols/irc/msgs.c:204 src/protocols/oscar/oscar.c:5196
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1051 src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1050 src/protocols/gg/gg.c:1053
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1062
-#: src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1059 src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1063
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1068 src/protocols/jabber/jabber.c:637
-#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5240
+#: src/protocols/gg/gg.c:1067 src/protocols/jabber/jabber.c:637
+#: src/protocols/oscar/oscar.c:5250 src/protocols/oscar/oscar.c:5258
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1111
+#: src/protocols/gg/gg.c:1110
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1119
+#: src/protocols/gg/gg.c:1118
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1180
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1189
+#: src/protocols/gg/gg.c:1188
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1197
+#: src/protocols/gg/gg.c:1196
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1204
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:1213
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1220
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
+#: src/protocols/gg/gg.c:1339
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "与 Gadu-Gadu 服务器通讯出错"
+
 #: src/protocols/gg/gg.c:1340
-msgid "Error communicating with Gadu-Gadu server"
-msgstr "与 Gadu-Gadu 服务器通讯出错"
-
-#: src/protocols/gg/gg.c:1341
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4922,77 +4978,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1370
+#: src/protocols/gg/gg.c:1369
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1370
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1444
+#: src/protocols/gg/gg.c:1443
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1445 src/protocols/gg/gg.c:1468
+#: src/protocols/gg/gg.c:1444 src/protocols/gg/gg.c:1467
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1467
+#: src/protocols/gg/gg.c:1466
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
+#: src/protocols/gg/gg.c:1517
+msgid "Unable to access directory"
+msgstr "无法访问目录"
+
 #: src/protocols/gg/gg.c:1518
-msgid "Unable to access directory"
-msgstr "无法访问目录"
-
-#: src/protocols/gg/gg.c:1519
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1553
+#: src/protocols/gg/gg.c:1552
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1554
+#: src/protocols/gg/gg.c:1553
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1570
+#: src/protocols/gg/gg.c:1569
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1575 src/protocols/jabber/jabber.c:1111
+#: src/protocols/gg/gg.c:1574 src/protocols/jabber/jabber.c:1111
 #: src/protocols/toc/toc.c:1577
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1579
+#: src/protocols/gg/gg.c:1578
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1583
+#: src/protocols/gg/gg.c:1582
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1587
+#: src/protocols/gg/gg.c:1586
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
+#: src/protocols/gg/gg.c:1619
+msgid "Unable to access user profile."
+msgstr "无法访问用户配置文件。"
+
 #: src/protocols/gg/gg.c:1620
-msgid "Unable to access user profile."
-msgstr "无法访问用户配置文件。"
-
-#: src/protocols/gg/gg.c:1621
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5009,7 +5065,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1768 src/protocols/gg/gg.c:1770
+#: src/protocols/gg/gg.c:1767 src/protocols/gg/gg.c:1769
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -5018,23 +5074,23 @@
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:586
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:589
 #: src/protocols/silc/silc.c:1007
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:590
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:593
 #: src/protocols/silc/silc.c:1011
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:168
-#: src/protocols/yahoo/yahoo_filexfer.c:178
-#: src/protocols/yahoo/yahoo_filexfer.c:187
-#: src/protocols/yahoo/yahoo_filexfer.c:197
-msgid "File Transfer Aborted"
-msgstr "文件传送中止"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:170
+#: src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/yahoo/yahoo_filexfer.c:189
+#: src/protocols/yahoo/yahoo_filexfer.c:199
+msgid "File Transfer Failed"
+msgstr "文件传送失败"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
@@ -5057,8 +5113,8 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:516
-#: src/protocols/irc/irc.c:538
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -5078,15 +5134,6 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#. connect to the server
-#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:801
-#: src/protocols/msn/session.c:338 src/protocols/napster/napster.c:510
-#: src/protocols/novell/novell.c:2163 src/protocols/oscar/oscar.c:1818
-#: src/protocols/trepia/trepia.c:1067 src/protocols/yahoo/yahoo.c:2230
-#: src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "正在连接"
-
 #: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407
 #: src/protocols/jabber/jabber.c:739
 msgid "SSL support unavailable"
@@ -5109,17 +5156,17 @@
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:535
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/trepia/trepia.c:930
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1374
+#: src/protocols/irc/irc.c:680 src/protocols/silc/chat.c:1388
 #: src/protocols/yahoo/yahoochat.c:1355
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:677 src/protocols/silc/chat.c:1377
+#: src/protocols/irc/irc.c:683 src/protocols/silc/chat.c:1391
 #: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
 msgid "Topic"
 msgstr "话题"
@@ -5132,43 +5179,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:784
+#: src/protocols/irc/irc.c:790
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:785
+#: src/protocols/irc/irc.c:791
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:804 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/irc.c:810 src/protocols/irc/msgs.c:224
 #: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:807 src/protocols/jabber/jabber.c:1628
-#: src/protocols/msn/msn.c:1887 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:813 src/protocols/jabber/jabber.c:1628
+#: src/protocols/msn/msn.c:1918 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:810
+#: src/protocols/irc/irc.c:816
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:813 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:218
 #: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:816
+#: src/protocols/irc/irc.c:822
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:819
+#: src/protocols/irc/irc.c:825
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -5185,189 +5232,201 @@
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:126
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "无法屏蔽 %s:屏蔽列表已满"
+
+#: src/protocols/irc/msgs.c:204 src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:237
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:184
+#: src/protocols/irc/msgs.c:207
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:185
+#: src/protocols/irc/msgs.c:208
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
-#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212 src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:230
 #: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
+#: src/protocols/irc/msgs.c:219 src/protocols/silc/ops.c:969
 #: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:230 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:235
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>瞌睡了:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:237
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:240
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:287
+#: src/protocols/irc/msgs.c:310
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:292
+#: src/protocols/irc/msgs.c:315
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:310
+#: src/protocols/irc/msgs.c:333
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:310
+#: src/protocols/irc/msgs.c:333
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:333
+#: src/protocols/irc/msgs.c:356
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:428
+#: src/protocols/irc/msgs.c:451
 msgid "Time Response"
 msgstr "时间响应"
 
-#: src/protocols/irc/msgs.c:429
+#: src/protocols/irc/msgs.c:452
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:463
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:451
+#: src/protocols/irc/msgs.c:475
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:478
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:459
+#: src/protocols/irc/msgs.c:484
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:479
+#: src/protocols/irc/msgs.c:505
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:535
+#: src/protocols/irc/msgs.c:561
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:536
+#: src/protocols/irc/msgs.c:562
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:637
+#: src/protocols/irc/msgs.c:663
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:642
+#: src/protocols/irc/msgs.c:668
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:663
+#: src/protocols/irc/msgs.c:689
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:772
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
+
+#: src/protocols/irc/msgs.c:812
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:774
+#: src/protocols/irc/msgs.c:813
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:795
+#: src/protocols/irc/msgs.c:834
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:875
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:838
+#: src/protocols/irc/msgs.c:877
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:913
+#: src/protocols/irc/msgs.c:952
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:914 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:953 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:950
+#: src/protocols/irc/msgs.c:989
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5376,13 +5435,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5390,7 +5449,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5398,342 +5457,341 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:121
-msgid ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+#: src/protocols/irc/parse.c:123
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;昵称|频道&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消频道或用户模式。"
-
-#: src/protocols/irc/parse.c:122
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
+
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1459
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1459
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:138
-msgid "whois &lt;nick&gt;:  Get information on a user."
-msgstr "whois &lt;昵称&gt;: 获得用户信息。"
-
-#: src/protocols/irc/parse.c:419
+#: src/protocols/irc/parse.c:140
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
+
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:420
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:420
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
 #: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189
 #: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
 #: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
-msgstr ""
-"服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
-
-#: src/protocols/jabber/auth.c:54
+msgstr "服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
+
+#: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: src/protocols/jabber/auth.c:115
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
-#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:390
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:660
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:673
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:677
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:688
-#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1309
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1340
 #: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
 #: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:657
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:719
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:715
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:723
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:727
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:731
 #: src/protocols/jabber/jabber.c:647
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:736
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:747
+#: src/protocols/jabber/buddy.c:754
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:762
-#: src/protocols/jabber/buddy.c:770 src/protocols/silc/silc.c:651
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:765
+#: src/protocols/jabber/buddy.c:773 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:788
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:792
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:801
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691
-#: src/protocols/oscar/oscar.c:5213
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:694
+#: src/protocols/oscar/oscar.c:5231
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:563
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:561
+#: src/protocols/jabber/buddy.c:564
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:606
+#: src/protocols/jabber/buddy.c:609
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610
+#: src/protocols/jabber/buddy.c:635 src/protocols/jabber/jabber.c:1610
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:681 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:696 src/protocols/jabber/jabber.c:632
-#: src/protocols/oscar/oscar.c:5231 src/protocols/oscar/oscar.c:5239
+#: src/protocols/jabber/buddy.c:699 src/protocols/jabber/jabber.c:632
+#: src/protocols/oscar/oscar.c:5249 src/protocols/oscar/oscar.c:5257
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:708
+#: src/protocols/jabber/buddy.c:711
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:817
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:814
+#: src/protocols/jabber/buddy.c:817
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:836
+#: src/protocols/jabber/buddy.c:840
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1018
+#: src/protocols/jabber/buddy.c:1022
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1021
+#: src/protocols/jabber/buddy.c:1025
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1028
+#: src/protocols/jabber/buddy.c:1032
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:1038
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1042
+#: src/protocols/jabber/buddy.c:1046
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/chat.c:671
-#: src/protocols/jabber/chat.c:682 src/protocols/jabber/jabber.c:958
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/chat.c:674
+#: src/protocols/jabber/chat.c:685 src/protocols/jabber/jabber.c:958
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:988
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/buddy.c:1082 src/protocols/jabber/jabber.c:1000
 #: src/status.c:161
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1080 src/protocols/jabber/jabber.c:1006
-#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7051
+#: src/protocols/jabber/buddy.c:1084 src/protocols/jabber/jabber.c:1006
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7074
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6532
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6555
 #: src/protocols/yahoo/yahoochat.c:958
 msgid "_Room:"
 msgstr "房间(_R):"
@@ -5746,75 +5804,75 @@
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:217
+#: src/protocols/jabber/chat.c:220
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:221
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
+#: src/protocols/jabber/chat.c:227 src/protocols/jabber/chat.c:228
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:233 src/protocols/jabber/chat.c:234
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:389
+#: src/protocols/jabber/chat.c:392
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:398 src/protocols/jabber/chat.c:543
+#: src/protocols/jabber/chat.c:401 src/protocols/jabber/chat.c:546
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:414
+#: src/protocols/jabber/chat.c:417
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:415
+#: src/protocols/jabber/chat.c:418
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:465 src/protocols/jabber/chat.c:534
+#: src/protocols/jabber/chat.c:468 src/protocols/jabber/chat.c:537
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:622
+#: src/protocols/jabber/chat.c:625
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:672 src/protocols/jabber/chat.c:683
+#: src/protocols/jabber/chat.c:675 src/protocols/jabber/chat.c:686
 #: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:731
+#: src/protocols/jabber/chat.c:734
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:769
+#: src/protocols/jabber/chat.c:772
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:770
+#: src/protocols/jabber/chat.c:773
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:773
+#: src/protocols/jabber/chat.c:776
 msgid "Find Rooms"
 msgstr "查找房间"
 
@@ -5823,9 +5881,9 @@
 msgstr "初始化会话出错"
 
 #: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:990
-#: src/protocols/trepia/trepia.c:1034 src/protocols/trepia/trepia.c:1133
-#: src/protocols/trepia/trepia.c:1179
+#: src/protocols/trepia/trepia.c:700 src/protocols/trepia/trepia.c:991
+#: src/protocols/trepia/trepia.c:1035 src/protocols/trepia/trepia.c:1134
+#: src/protocols/trepia/trepia.c:1180
 msgid "Write error"
 msgstr "写错误"
 
@@ -5838,7 +5896,7 @@
 msgstr "无效的 Jabber ID"
 
 #: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1074
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
@@ -5872,8 +5930,8 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5241 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5251
+#: src/protocols/oscar/oscar.c:5259 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
@@ -5899,7 +5957,7 @@
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:344
+#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:365
 msgid "Authenticating"
 msgstr "正在认证"
 
@@ -5909,7 +5967,7 @@
 
 #: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208
 #: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282
-#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6811
+#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6834
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -6282,59 +6340,59 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:264
+#: src/protocols/jabber/presence.c:268
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:267
+#: src/protocols/jabber/presence.c:271
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6461
+#: src/protocols/jabber/presence.c:277 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3861 src/protocols/oscar/oscar.c:6484
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3852 src/protocols/oscar/oscar.c:6462
+#: src/protocols/jabber/presence.c:278 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3863 src/protocols/oscar/oscar.c:6485
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322
+#: src/protocols/jabber/presence.c:325 src/protocols/jabber/presence.c:326
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:323
+#: src/protocols/jabber/presence.c:327
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:325
+#: src/protocols/jabber/presence.c:329
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:327
+#: src/protocols/jabber/presence.c:331
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:364
+#: src/protocols/jabber/presence.c:368
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:367
+#: src/protocols/jabber/presence.c:371
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:582
+#: src/protocols/jabber/si.c:585
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
+#: src/protocols/jabber/si.c:586 src/protocols/jabber/si.c:587
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
@@ -6635,7 +6693,7 @@
 msgstr "寻呼"
 
 #: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
-#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -6653,25 +6711,25 @@
 msgstr "被屏蔽"
 
 #: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2390 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/yahoo/yahoo.c:2931
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31
 #: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
 #: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2392
-#: src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2424
+#: src/protocols/yahoo/yahoo.c:2934
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2914
+#: src/protocols/yahoo/yahoo.c:2432 src/protocols/yahoo/yahoo.c:2946
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2952
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
@@ -6724,91 +6782,91 @@
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/msn/msn.c:1333 src/protocols/yahoo/yahoo_profile.c:659
 #: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1309 src/protocols/msn/msn.c:1656
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:783
+#: src/protocols/msn/msn.c:1340 src/protocols/msn/msn.c:1687
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:787
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1386
+#: src/protocols/msn/msn.c:1417
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1674
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1462 src/protocols/oscar/oscar.c:5218
+#: src/protocols/msn/msn.c:1493 src/protocols/oscar/oscar.c:5236
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1469 src/protocols/oscar/oscar.c:5205
+#: src/protocols/msn/msn.c:1500 src/protocols/oscar/oscar.c:5223
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1478 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1509 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1516 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
-#: src/protocols/msn/msn.c:1523 src/protocols/msn/msn.c:1531
-#: src/protocols/msn/msn.c:1538
+#: src/protocols/msn/msn.c:1541 src/protocols/msn/msn.c:1547
+#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1562
+#: src/protocols/msn/msn.c:1569
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553
-#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1567
+#: src/protocols/msn/msn.c:1578 src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1598
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
-#: src/protocols/msn/msn.c:1589
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1620
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1598 src/protocols/msn/msn.c:1604
+#: src/protocols/msn/msn.c:1629 src/protocols/msn/msn.c:1635
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1643 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1623 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1654 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1676
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1646
+#: src/protocols/msn/msn.c:1677
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6817,13 +6875,13 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1681
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1687 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -6837,15 +6895,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1861 src/protocols/msn/msn.c:1863
+#: src/protocols/msn/msn.c:1892 src/protocols/msn/msn.c:1894
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1882 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1913 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1891
+#: src/protocols/msn/msn.c:1922
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6859,8 +6917,8 @@
 msgid "%s is not a valid group."
 msgstr "%s 不是有效的组名。"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522
-#: src/protocols/msn/session.c:323
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
+#: src/protocols/msn/session.c:344
 msgid "Unknown error."
 msgstr "未知错误。"
 
@@ -6869,40 +6927,40 @@
 msgid "%s on %s (%s)"
 msgstr "%2$s(%3$s) 上的 %1$s"
 
-#: src/protocols/msn/notification.c:492
+#: src/protocols/msn/notification.c:496
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "无法在 %s(%s) 上添加用户"
 
-#: src/protocols/msn/notification.c:496
+#: src/protocols/msn/notification.c:500
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "无法在 %s(%s) 上屏蔽用户"
 
-#: src/protocols/msn/notification.c:500
+#: src/protocols/msn/notification.c:504
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "无法允许 %s(%s) 上的拥护"
 
-#: src/protocols/msn/notification.c:508
+#: src/protocols/msn/notification.c:512
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "无法添加 %s,原因是您的好友列表已满。"
 
-#: src/protocols/msn/notification.c:517
+#: src/protocols/msn/notification.c:521
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是有效的通行证账户。"
 
-#: src/protocols/msn/notification.c:774
+#: src/protocols/msn/notification.c:778
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: src/protocols/msn/notification.c:829
+#: src/protocols/msn/notification.c:833
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1232
+#: src/protocols/msn/notification.c:1264
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6932,8 +6990,8 @@
 msgid "Reading error"
 msgstr "读取错误"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:315
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:336
+#: src/protocols/oscar/oscar.c:4184
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -6942,59 +7000,61 @@
 msgid ""
 "Connection error from %s server (%s):\n"
 "%s"
-msgstr "%s 服务器(%s)的连接错误:\n%s"
-
-#: src/protocols/msn/session.c:293
+msgstr ""
+"%s 服务器(%s)的连接错误:\n"
+"%s"
+
+#: src/protocols/msn/session.c:314
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: src/protocols/msn/session.c:297
+#: src/protocols/msn/session.c:318
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
-#: src/protocols/msn/session.c:301
+#: src/protocols/msn/session.c:322
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/session.c:304
+#: src/protocols/msn/session.c:325
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:309
+#: src/protocols/msn/session.c:330
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: src/protocols/msn/session.c:313
+#: src/protocols/msn/session.c:334
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "无法通过身份验证: %s"
 
-#: src/protocols/msn/session.c:318
+#: src/protocols/msn/session.c:339
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:339 src/protocols/msn/session.c:341
+#: src/protocols/msn/session.c:360 src/protocols/msn/session.c:362
 msgid "Handshaking"
 msgstr "握手"
 
-#: src/protocols/msn/session.c:340
+#: src/protocols/msn/session.c:361
 msgid "Transferring"
 msgstr "文件传送"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:363
 msgid "Starting authentication"
 msgstr "开始身份验证"
 
-#: src/protocols/msn/session.c:343
+#: src/protocols/msn/session.c:364
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: src/protocols/msn/session.c:345
+#: src/protocols/msn/session.c:366
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: src/protocols/msn/session.c:346 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:367 src/protocols/trepia/trepia.c:637
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -7332,8 +7392,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5191
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5209
+#: src/protocols/oscar/oscar.c:5216
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -7571,7 +7631,7 @@
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7158
+#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7181
 msgid "Get File"
 msgstr "获取文件"
 
@@ -7643,15 +7703,15 @@
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7064
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7079
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7069
 msgid "Occupied"
 msgstr "琐事缠身"
 
@@ -7712,7 +7772,7 @@
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3618
 msgid "Connect"
 msgstr "连接"
 
@@ -7751,9 +7811,9 @@
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
+#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:181
+#: src/protocols/yahoo/yahoo_filexfer.c:190
+#: src/protocols/yahoo/yahoo_filexfer.c:200
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -7832,12 +7892,12 @@
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:3598
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3612
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7846,41 +7906,41 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:3651
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3648
+#: src/protocols/oscar/oscar.c:3659
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3649
+#: src/protocols/oscar/oscar.c:3660
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3679
+#: src/protocols/oscar/oscar.c:3690
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
 
-#: src/protocols/oscar/oscar.c:3684 src/protocols/oscar/oscar.c:3686
+#: src/protocols/oscar/oscar.c:3695 src/protocols/oscar/oscar.c:3697
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3734 src/protocols/oscar/oscar.c:3736
-#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:3840
-#: src/protocols/oscar/oscar.c:3860 src/protocols/oscar/oscar.c:6453
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:3745 src/protocols/oscar/oscar.c:3747
+#: src/protocols/oscar/oscar.c:3754 src/protocols/oscar/oscar.c:3851
+#: src/protocols/oscar/oscar.c:3871 src/protocols/oscar/oscar.c:6476
+#: src/protocols/oscar/oscar.c:6522
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3742
+#: src/protocols/oscar/oscar.c:3753
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3851
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7889,11 +7949,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6459
+#: src/protocols/oscar/oscar.c:3859 src/protocols/oscar/oscar.c:6482
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3871
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7903,17 +7963,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3872
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3868
+#: src/protocols/oscar/oscar.c:3879
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3876
+#: src/protocols/oscar/oscar.c:3887
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7926,7 +7986,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3884
+#: src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7939,7 +7999,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3892
+#: src/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7952,32 +8012,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3913
+#: src/protocols/oscar/oscar.c:3924
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3919
+#: src/protocols/oscar/oscar.c:3930
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:3934
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:4016
+#: src/protocols/oscar/oscar.c:4027
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:4036
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7985,89 +8045,89 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4034
+#: src/protocols/oscar/oscar.c:4045
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4054
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4106 src/protocols/oscar/oscar.c:4340
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4351
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4183
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4220
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4214
-#: src/protocols/oscar/oscar.c:4272 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4220 src/protocols/oscar/oscar.c:4225
+#: src/protocols/oscar/oscar.c:4283 src/protocols/oscar/oscar.c:4287
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4223
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4283
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4286
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4298
+#: src/protocols/oscar/oscar.c:4309
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4302
+#: src/protocols/oscar/oscar.c:4313
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4307 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4318 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4391
+#: src/protocols/oscar/oscar.c:4402
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4577
+#: src/protocols/oscar/oscar.c:4588
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4797
+#: src/protocols/oscar/oscar.c:4808
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4798
+#: src/protocols/oscar/oscar.c:4809
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8075,160 +8135,160 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4878
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4869
+#: src/protocols/oscar/oscar.c:4880
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4882 src/protocols/toc/toc.c:881
+#: src/protocols/oscar/oscar.c:4893 src/protocols/toc/toc.c:881
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4927
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5203 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5221 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5221
+#: src/protocols/oscar/oscar.c:5239
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5225
+#: src/protocols/oscar/oscar.c:5243
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5230
+#: src/protocols/oscar/oscar.c:5248
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5234 src/protocols/oscar/oscar.c:5242
+#: src/protocols/oscar/oscar.c:5252 src/protocols/oscar/oscar.c:5260
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5238
+#: src/protocols/oscar/oscar.c:5256
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5264
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5247
+#: src/protocols/oscar/oscar.c:5265
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5266
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5249
+#: src/protocols/oscar/oscar.c:5267
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5251
+#: src/protocols/oscar/oscar.c:5269
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5261
+#: src/protocols/oscar/oscar.c:5279
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5328
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5332
+#: src/protocols/oscar/oscar.c:5350
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5357
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5396
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5380
+#: src/protocols/oscar/oscar.c:5398
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5411
+#: src/protocols/oscar/oscar.c:5429
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: src/protocols/oscar/oscar.c:5417
+#: src/protocols/oscar/oscar.c:5435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:5420
+#: src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
 
-#: src/protocols/oscar/oscar.c:5423
+#: src/protocols/oscar/oscar.c:5441
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:5426
+#: src/protocols/oscar/oscar.c:5444
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5447
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5442
+#: src/protocols/oscar/oscar.c:5460
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8237,25 +8297,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5443 src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5461 src/protocols/oscar/oscar.c:5468
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5448
+#: src/protocols/oscar/oscar.c:5466
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5515
+#: src/protocols/oscar/oscar.c:5533
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5650
+#: src/protocols/oscar/oscar.c:5668
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5651
+#: src/protocols/oscar/oscar.c:5669
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8264,7 +8324,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5696
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8274,15 +8334,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5683
+#: src/protocols/oscar/oscar.c:5701
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:5735
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5718
+#: src/protocols/oscar/oscar.c:5736
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8291,7 +8351,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5765
+#: src/protocols/oscar/oscar.c:5783
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8303,11 +8363,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5770
+#: src/protocols/oscar/oscar.c:5788
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5861
+#: src/protocols/oscar/oscar.c:5884
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8317,16 +8377,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5863 src/protocols/oscar/oscar.c:6319
-#: src/protocols/oscar/oscar.c:6333
+#: src/protocols/oscar/oscar.c:5886 src/protocols/oscar/oscar.c:6342
+#: src/protocols/oscar/oscar.c:6356
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6048
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6049
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -8335,13 +8395,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6210 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6216 src/protocols/oscar/oscar.c:6377
-#: src/protocols/oscar/oscar.c:6378 src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6233 src/protocols/oscar/oscar.c:6234
+#: src/protocols/oscar/oscar.c:6239 src/protocols/oscar/oscar.c:6400
+#: src/protocols/oscar/oscar.c:6401 src/protocols/oscar/oscar.c:6406
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6317
+#: src/protocols/oscar/oscar.c:6340
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8349,11 +8409,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6317 src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6340 src/protocols/oscar/oscar.c:6354
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6354
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8363,18 +8423,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6437
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6443
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6453
+#: src/protocols/oscar/oscar.c:6476
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8384,17 +8444,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6518
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6496
+#: src/protocols/oscar/oscar.c:6519
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6522
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8404,92 +8464,92 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6523
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6538 src/protocols/toc/toc.c:1282
+#: src/protocols/oscar/oscar.c:6561 src/protocols/toc/toc.c:1282
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6577
+#: src/protocols/oscar/oscar.c:6600
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6644
+#: src/protocols/oscar/oscar.c:6667
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6779
+#: src/protocols/oscar/oscar.c:6802
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7137
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7115
+#: src/protocols/oscar/oscar.c:7138
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7134
+#: src/protocols/oscar/oscar.c:7157
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7140
+#: src/protocols/oscar/oscar.c:7163
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7152
+#: src/protocols/oscar/oscar.c:7175
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7169
+#: src/protocols/oscar/oscar.c:7192
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7229
+#: src/protocols/oscar/oscar.c:7252
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:7232
+#: src/protocols/oscar/oscar.c:7255
 msgid "Hide IP address"
 msgstr "隐藏 IP 地址"
 
-#: src/protocols/oscar/oscar.c:7235
+#: src/protocols/oscar/oscar.c:7258
 msgid "Web aware"
 msgstr "Web 状态"
 
-#: src/protocols/oscar/oscar.c:7240
+#: src/protocols/oscar/oscar.c:7263
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: src/protocols/oscar/oscar.c:7257
+#: src/protocols/oscar/oscar.c:7280
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7258
+#: src/protocols/oscar/oscar.c:7281
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:7288
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7317
+#: src/protocols/oscar/oscar.c:7340
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7362
+#: src/protocols/oscar/oscar.c:7385
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7365
+#: src/protocols/oscar/oscar.c:7388
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7366
+#: src/protocols/oscar/oscar.c:7389
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8497,77 +8557,77 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7383
+#: src/protocols/oscar/oscar.c:7406
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7384
+#: src/protocols/oscar/oscar.c:7407
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7385
+#: src/protocols/oscar/oscar.c:7408
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7466 src/protocols/silc/silc.c:803
+#: src/protocols/oscar/oscar.c:7489 src/protocols/silc/silc.c:803
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7472
+#: src/protocols/oscar/oscar.c:7495
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7477 src/protocols/silc/silc.c:799
+#: src/protocols/oscar/oscar.c:7500 src/protocols/silc/silc.c:799
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7483
+#: src/protocols/oscar/oscar.c:7506
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7487
+#: src/protocols/oscar/oscar.c:7510
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:7497
+#: src/protocols/oscar/oscar.c:7520
 msgid "Show privacy options..."
 msgstr "显示隐藏选项..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:7504
+#: src/protocols/oscar/oscar.c:7527
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7508
+#: src/protocols/oscar/oscar.c:7531
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7512
+#: src/protocols/oscar/oscar.c:7535
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7516
+#: src/protocols/oscar/oscar.c:7539
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7523
+#: src/protocols/oscar/oscar.c:7546
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7529
+#: src/protocols/oscar/oscar.c:7552
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7534
+#: src/protocols/oscar/oscar.c:7557
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7603
+#: src/protocols/oscar/oscar.c:7627
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7606
+#: src/protocols/oscar/oscar.c:7630
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8581,19 +8641,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7699 src/protocols/oscar/oscar.c:7701
+#: src/protocols/oscar/oscar.c:7727 src/protocols/oscar/oscar.c:7729
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7720
+#: src/protocols/oscar/oscar.c:7752
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7723
+#: src/protocols/oscar/oscar.c:7755
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7726 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7758 src/protocols/zephyr/zephyr.c:2859
 msgid "Encoding"
 msgstr "编码"
 
@@ -8689,7 +8749,7 @@
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1558
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1559
 msgid "Show Public Key"
 msgstr "显示公钥"
 
@@ -8880,11 +8940,11 @@
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1563
+#: src/protocols/silc/buddy.c:1564
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1569 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1571 src/protocols/silc/ops.c:1407
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8980,7 +9040,7 @@
 
 #: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
 #: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "频道认证"
 
@@ -9017,83 +9077,83 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:870
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:881
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:903
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:922
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:932
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:994
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:998
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1057
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1060
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:903
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:904
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -10158,11 +10218,11 @@
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+#: src/protocols/trepia/trepia.c:823 src/protocols/trepia/trepia.c:826
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1030
+#: src/protocols/trepia/trepia.c:1031
 msgid "Logging in"
 msgstr "登入"
 
@@ -10176,46 +10236,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:141
+#: src/protocols/yahoo/yahoo.c:140
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:626
+#: src/protocols/yahoo/yahoo.c:625
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3169
+#: src/protocols/yahoo/yahoo.c:644 src/protocols/yahoo/yahoo.c:3201
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:690
+#: src/protocols/yahoo/yahoo.c:689
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:757
+#: src/protocols/yahoo/yahoo.c:756
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:759
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:762
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1511
+#: src/protocols/yahoo/yahoo.c:1514
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10225,11 +10285,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1514
+#: src/protocols/yahoo/yahoo.c:1517
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1587
+#: src/protocols/yahoo/yahoo.c:1590
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10237,19 +10297,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1590
+#: src/protocols/yahoo/yahoo.c:1593
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1624
+#: src/protocols/yahoo/yahoo.c:1627
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1635
+#: src/protocols/yahoo/yahoo.c:1638
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1636
+#: src/protocols/yahoo/yahoo.c:1639
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10260,93 +10320,93 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1644
+#: src/protocols/yahoo/yahoo.c:1647
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1647
+#: src/protocols/yahoo/yahoo.c:1650
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1650
+#: src/protocols/yahoo/yahoo.c:1653
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1704
+#: src/protocols/yahoo/yahoo.c:1707
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1710
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2067
+#: src/protocols/yahoo/yahoo.c:1944 src/protocols/yahoo/yahoo.c:2090
 #: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2089 src/protocols/yahoo/yahoo.c:2199
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2229
+#: src/protocols/yahoo/yahoo.c:2313 src/protocols/yahoo/yahoo.c:2323
 #: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
 #: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2426 src/protocols/yahoo/yahoo.c:2937
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:2428 src/protocols/yahoo/yahoo.c:2940
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2911
+#: src/protocols/yahoo/yahoo.c:2430 src/protocols/yahoo/yahoo.c:2943
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2917
+#: src/protocols/yahoo/yahoo.c:2434 src/protocols/yahoo/yahoo.c:2949
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2406 src/protocols/yahoo/yahoo.c:2923
+#: src/protocols/yahoo/yahoo.c:2438 src/protocols/yahoo/yahoo.c:2955
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2487 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/yahoo/yahoo.c:2519 src/protocols/yahoo/yahoo.c:2545
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2592
+#: src/protocols/yahoo/yahoo.c:2624
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2597
+#: src/protocols/yahoo/yahoo.c:2629
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2648
+#: src/protocols/yahoo/yahoo.c:2680
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:2689
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2667
+#: src/protocols/yahoo/yahoo.c:2699
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2671
+#: src/protocols/yahoo/yahoo.c:2703
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3213
+#: src/protocols/yahoo/yahoo.c:3245
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3217
+#: src/protocols/yahoo/yahoo.c:3249
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10360,51 +10420,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3297 src/protocols/yahoo/yahoo.c:3299
+#: src/protocols/yahoo/yahoo.c:3329 src/protocols/yahoo/yahoo.c:3331
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3318
+#: src/protocols/yahoo/yahoo.c:3350
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3321
+#: src/protocols/yahoo/yahoo.c:3353
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3324
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3327
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3330
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3333
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3336
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3339
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3342
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3345
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:171
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -10558,7 +10618,7 @@
 
 #: src/protocols/zephyr/zephyr.c:677
 #, c-format
-msgid "Unable send to chat %s,%s,%s"
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
 #: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
@@ -10700,21 +10760,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:959
+#: src/proxy.c:988
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:963
+#: src/proxy.c:992
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1784
+#: src/proxy.c:1820
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1784
+#: src/proxy.c:1820
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10788,53 +10848,65 @@
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/util.c:2121
+#: src/util.c:2128
 #, c-format
 msgid "Error Reading %s"
-msgstr ""
-"读取 %s 出错"
-
-#: src/util.c:2122
+msgstr "读取 %s 出错"
+
+#: src/util.c:2129
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file been renamed to %s~."
-msgstr ""
-"阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中"
-"了。"
-
-#: src/util.c:2557
+msgstr "阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
+
+#: src/util.c:2566
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2560
+#: src/util.c:2569
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2590
+#: src/util.c:2599
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2604
+#: src/util.c:2613
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2612
+#: src/util.c:2621
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2620
+#: src/util.c:2629
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:3037
+#: src/util.c:3049
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
+#~ msgid "Log Out"
+#~ msgstr "登出"
+
+#~ msgid "/Buddies/_Log Out"
+#~ msgstr "/好友(B)/登出(_L)"
+
+#~ msgid "/Buddies/Log Out"
+#~ msgstr "/好友(B)/登出"
+
+#~ msgid "_Screen name"
+#~ msgstr "用户名(_S)"
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "文件传送中止"
+
 #~ msgid ""
 #~ "An error was encountered parsing the file containing your buddy list (%"
 #~ "s).  It has not been loaded, and the old file has been renamed to blist."