changeset 10598:70bf2351156b

[gaim-migrate @ 12017] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 15 Feb 2005 01:26:07 +0000
parents 0e886a234d92
children c08097a4b97b
files po/zh_CN.po
diffstat 1 files changed, 2208 insertions(+), 1932 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Mon Feb 14 03:11:23 2005 +0000
+++ b/po/zh_CN.po	Tue Feb 15 01:26:07 2005 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim\n"
+"Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-20 14:13+0800\n"
-"PO-Revision-Date: 2004-12-20 14:24+0800\n"
+"POT-Creation-Date: 2005-02-14 12:35+0800\n"
+"PO-Revision-Date: 2005-02-14 12:43+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"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:281
 msgid "Error Message Suppression"
 msgstr "错误消息屏蔽"
 
-#: plugins/autorecon.c:280
+#: plugins/autorecon.c:285
 msgid "Hide Disconnect Errors"
 msgstr "隐藏断开连接错误"
 
-#: plugins/autorecon.c:284
+#: plugins/autorecon.c:289
 msgid "Hide Login Errors"
 msgstr "隐藏登录错误"
 
-#: plugins/autorecon.c:288
+#: plugins/autorecon.c:293
 msgid "Hide Reconnecting Dialog"
 msgstr "隐藏重新连接错误"
 
@@ -38,7 +38,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:312
+#: plugins/autorecon.c:317
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
@@ -46,7 +46,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:315 plugins/autorecon.c:317
+#: plugins/autorecon.c:320 plugins/autorecon.c:322
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
@@ -161,17 +161,16 @@
 msgid "New..."
 msgstr "新建..."
 
-#. GAIM_STATUS_AWAY
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1712 src/gtkstatus.c:118
-#: src/gtkstatusselector.c:600 src/protocols/gg/gg.c:52
+#: 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:1074 src/protocols/jabber/jabber.c:987
-#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
+#: 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:677 src/protocols/oscar/oscar.c:5611
-#: src/protocols/oscar/oscar.c:6688 src/protocols/oscar/oscar.c:6909
+#: 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:2919 src/protocols/zephyr/zephyr.c:2225
+#: src/protocols/yahoo/yahoo.c:2927 src/protocols/zephyr/zephyr.c:2225
+#: src/status.c:160
 msgid "Away"
 msgstr "离开"
 
@@ -183,15 +182,15 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:213 src/gtkft.c:628
+#: plugins/docklet/docklet.c:213 src/gtkft.c:621
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2253
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2244
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2214
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2195
 msgid "Preferences"
 msgstr "首选项"
 
@@ -203,11 +202,11 @@
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:553
+#: plugins/docklet/docklet.c:559
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:557
+#: plugins/docklet/docklet.c:563
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -217,19 +216,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:583
+#: plugins/docklet/docklet.c:589
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:586
+#: plugins/docklet/docklet.c:592
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:588
+#: plugins/docklet/docklet.c:594
 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, "
@@ -314,7 +313,7 @@
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
-#: plugins/gaim-remote/remote.c:747
+#: plugins/gaim-remote/remote.c:749
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -323,7 +322,7 @@
 "将 %s 指派给套接字失败:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:770
+#: plugins/gaim-remote/remote.c:773
 msgid "Unable to open socket"
 msgstr "无法打开套接字"
 
@@ -333,19 +332,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:820
+#: plugins/gaim-remote/remote.c:823
 msgid "Remote Control"
 msgstr "远程控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:823
+#: plugins/gaim-remote/remote.c:826
 msgid "Provides remote control for gaim applications."
 msgstr "提供 gaim 程序的远程控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:825
+#: plugins/gaim-remote/remote.c:828
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -381,6 +380,76 @@
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
 
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr "光标颜色"
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr "次要光标颜色"
+
+#: plugins/gaimrc.c:42
+msgid "Hyperlink Color"
+msgstr "超级链接颜色"
+
+#: plugins/gaimrc.c:53
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView 扩展柄大小"
+
+#: plugins/gaimrc.c:72
+msgid "Conversation Entry"
+msgstr "对话项"
+
+#: plugins/gaimrc.c:73
+msgid "Conversation History"
+msgstr "对话历史"
+
+#: plugins/gaimrc.c:74
+msgid "Log Viewer"
+msgstr "日志查看器"
+
+#: plugins/gaimrc.c:75
+msgid "Request Dialog"
+msgstr "请求对话框"
+
+#: plugins/gaimrc.c:76
+msgid "Notify Dialog"
+msgstr "提醒对话框"
+
+#: plugins/gaimrc.c:209
+#, c-format
+msgid "Select Color for %s"
+msgstr "选择 %s 的颜色"
+
+#: plugins/gaimrc.c:211
+msgid "Select Color"
+msgstr "选择颜色"
+
+#: plugins/gaimrc.c:246
+#, c-format
+msgid "Select Font for %s"
+msgstr "选择 %s 的字体"
+
+#: plugins/gaimrc.c:284
+msgid "Select Interface Font"
+msgstr "选择界面字体"
+
+#: plugins/gaimrc.c:343
+msgid "Gtk interface font"
+msgstr "Gtk 界面字体"
+
+#: plugins/gaimrc.c:362
+msgid "Gtk text shortcut theme"
+msgstr "Gtk 文字快捷方式主题"
+
+#: plugins/gaimrc.c:460
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim GTK+ 主题控制"
+
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "提供对常用 gtkrc 设置的访问。"
+
 #. Configuration frame
 #: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
@@ -434,9 +503,9 @@
 "向上再向右可切换到下个对话。"
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2032
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: 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
 msgid "Name"
 msgstr "名称"
 
@@ -451,13 +520,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7215
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7388
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4075
-#: src/gtkblist.c:4425
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4281
+#: src/gtkblist.c:4659
 msgid "Group:"
 msgstr "组:"
 
@@ -494,7 +563,7 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:752 src/blist.c:959 src/blist.c:1929 src/gtkblist.c:3895
+#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4101
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -513,7 +582,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:415
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:416
 msgid "Account"
 msgstr "账户"
 
@@ -557,8 +626,8 @@
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:370
-#: src/gtkaccount.c:400 src/protocols/oscar/oscar.c:583
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:377
+#: src/gtkaccount.c:407 src/protocols/oscar/oscar.c:597
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -689,68 +758,68 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:602
+#: plugins/notify.c:618
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:606
+#: plugins/notify.c:622
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:613
+#: plugins/notify.c:629
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:620
+#: plugins/notify.c:636
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:628
+#: plugins/notify.c:644
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:635
+#: plugins/notify.c:654
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:654
+#: plugins/notify.c:673
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:662
+#: plugins/notify.c:681
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:670
+#: plugins/notify.c:689
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:675
+#: plugins/notify.c:694
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:682
+#: plugins/notify.c:701
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:690
+#: plugins/notify.c:709
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:698
+#: plugins/notify.c:717
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:707
+#: plugins/notify.c:726
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -760,17 +829,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:797
+#: plugins/notify.c:816
 msgid "Message Notification"
-msgstr "邮件通知"
+msgstr "消息通知"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:800 plugins/notify.c:802
+#: plugins/notify.c:819 plugins/notify.c:821
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有未读邮件。"
+msgstr "提供各种方法通知您有未读消息。"
 
 #. *< type
 #. *< ui_requirement
@@ -892,35 +961,35 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:415
+#: plugins/spellchk.c:417
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:441
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:451
+#: plugins/spellchk.c:453
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:477
+#: plugins/spellchk.c:479
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:484
+#: plugins/spellchk.c:486
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:498
+#: plugins/spellchk.c:500
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:540
+#: plugins/spellchk.c:542
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:542 plugins/spellchk.c:543
+#: plugins/spellchk.c:544 plugins/spellchk.c:545
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -1030,11 +1099,11 @@
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: plugins/tcl/tcl.c:364
+#: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:366 plugins/tcl/tcl.c:367
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -1056,19 +1125,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/timestamp.c:203
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:210
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:217
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/timestamp.c:223
+#: plugins/timestamp.c:222
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -1078,7 +1147,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:296
+#: plugins/timestamp.c:295
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1086,7 +1155,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:299 plugins/timestamp.c:301
+#: plugins/timestamp.c:298 plugins/timestamp.c:300
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
@@ -1147,153 +1216,163 @@
 "\n"
 "* 注意: 此插件需要 Win2000 或 WinXP。"
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:320
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:328
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:329
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3188
-#: src/gtkprefs.c:2129
+#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3377
+#: src/gtkprefs.c:2111
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:339
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:343
 msgid "Docked _Buddy List is always on top"
 msgstr "停靠的好友列表常居顶端(_B)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Keep Buddy List window on top"
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:885
-#: src/gtkprefs.c:2130 src/protocols/msn/msn.c:1831
+#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:867
+#: src/gtkprefs.c:2112
 msgid "Conversations"
 msgstr "对话"
 
+#: plugins/win32/winprefs/winprefs.c:359
+msgid "_Flash Window when messages are received"
+msgstr "收到信息时闪烁窗口(_F)"
+
 #: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
-msgstr "收到信息时闪烁窗口(_F)"
-
-#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:385 plugins/win32/winprefs/winprefs.c:386
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/account.c:296 src/protocols/jabber/jabber.c:1043
+#: src/account.c:532
+msgid "accounts"
+msgstr "账户"
+
+#: src/account.c:732 src/protocols/jabber/jabber.c:1050
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:305
+#: src/account.c:741
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:330
+#: src/account.c:766
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:337
+#: src/account.c:773
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:344
+#: src/account.c:780
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:350
+#: src/account.c:786
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:358
+#: src/account.c:794
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:361 src/connection.c:189 src/gtkblist.c:2462
-#: src/gtkdialogs.c:388 src/gtkdialogs.c:531 src/gtkdialogs.c:587
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
-#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
-#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:3640 src/protocols/oscar/oscar.c:7002
-#: src/protocols/oscar/oscar.c:7094 src/protocols/oscar/oscar.c:7146
+#: 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/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/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:2657
+#: 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/request.h:1244
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:362 src/account.c:400 src/connection.c:190
-#: src/gtkaccount.c:1995 src/gtkaccount.c:2418 src/gtkblist.c:2463
-#: src/gtkblist.c:4463 src/gtkdialogs.c:389 src/gtkdialogs.c:532
-#: src/gtkdialogs.c:588 src/gtkdialogs.c:686 src/gtkdialogs.c:708
-#: src/gtkdialogs.c:728 src/gtkdialogs.c:772 src/gtkdialogs.c:834
-#: src/gtkdialogs.c:876 src/gtkdialogs.c:914 src/gtkimhtmltoolbar.c:440
-#: src/gtkprivacy.c:590 src/gtkprivacy.c:603 src/gtkprivacy.c:628
-#: src/gtkprivacy.c:639 src/gtkrequest.c:260 src/protocols/jabber/buddy.c:565
-#: src/protocols/jabber/chat.c:772 src/protocols/jabber/jabber.c:675
-#: src/protocols/jabber/jabber.c:1091 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:229 src/protocols/msn/msn.c:244
-#: src/protocols/msn/msn.c:259 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:291 src/protocols/oscar/oscar.c:1539
-#: src/protocols/oscar/oscar.c:3504 src/protocols/oscar/oscar.c:3547
-#: src/protocols/oscar/oscar.c:3584 src/protocols/oscar/oscar.c:3641
-#: src/protocols/oscar/oscar.c:7003 src/protocols/oscar/oscar.c:7095
-#: src/protocols/oscar/oscar.c:7147 src/protocols/oscar/oscar.c:7216
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
-#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1690
-#: src/protocols/silc/silc.c:718 src/protocols/trepia/trepia.c:348
-#: src/protocols/yahoo/yahoo.c:2649 src/protocols/yahoo/yahoo.c:2658
-#: src/request.h:1244 src/request.h:1254
+#: 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/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/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/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
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:391
+#: src/account.c:827
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:399 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:804 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
+#: 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/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:658
+#: src/blist.c:544
+msgid "buddy list"
+msgstr "好友列表"
+
+#: src/blist.c:1132
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1329
+#: src/blist.c:1813
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1305,23 +1384,11 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1338
+#: src/blist.c:1822
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:2057
-#, c-format
-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.xml~."
-msgstr ""
-"分析包含您好友列表的文件时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
-
-#: src/blist.c:2061
-msgid "Buddy List Error"
-msgstr "好友列表出错"
-
-#: src/connection.c:113 src/connection.c:162
+#: src/connection.c:113 src/connection.c:159
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
@@ -1330,15 +1397,19 @@
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/connection.c:166
+#: src/connection.c:163
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/connection.c:186
+#: src/connection.c:183
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
+#: src/connection.c:185
+msgid "Enter Password"
+msgstr "输入密码"
+
 #: src/conversation.c:236
 msgid "Unable to send message: The message is too large."
 msgstr "无法发送消息: 消息太大。"
@@ -1361,67 +1432,67 @@
 msgid "Unable to send messge to %s."
 msgstr "无法给 %s 发送消息。"
 
-#: src/conversation.c:2004
+#: src/conversation.c:2052
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:2007
+#: src/conversation.c:2055
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2151
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2106
+#: src/conversation.c:2154
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2147
+#: src/conversation.c:2195
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2149
+#: src/conversation.c:2197
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2270
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2224
+#: src/conversation.c:2272
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2629
+#: src/conversation.c:2677
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2631
+#: src/conversation.c:2679
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2633 src/gtkprefs.c:1239
+#: src/conversation.c:2681 src/gtkprefs.c:1221
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2635
+#: src/conversation.c:2683
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2637
+#: src/conversation.c:2685
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:370
+#: src/ft.c:148 src/protocols/msn/msn.c:368
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1461,17 +1532,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:260
+#: src/ft.c:261
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:302
+#: src/ft.c:269
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s 想要给您发送文件"
+
+#: src/ft.c:308
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:306
+#: src/ft.c:312
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1482,37 +1558,50 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:359
+#: src/ft.c:365
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:377
+#: src/ft.c:383
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:870
-#, c-format
-msgid "Transfer of %s complete"
-msgstr "%s 传送完成"
-
-#: src/ft.c:918
+#: src/ft.c:877
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "文件 %s 传送完成"
+
+#: src/ft.c:880
+msgid "File transfer complete"
+msgstr "文件传送完成"
+
+#: src/ft.c:929
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:970
+#: src/ft.c:935
+msgid "File transfer cancelled"
+msgstr "文件传送已取消"
+
+#: src/ft.c:988
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1020
+#: src/ft.c:994
+#, 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:1022
+#: src/ft.c:1045
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1617,7 +1706,9 @@
 msgid ""
 "\n"
 "Log out all accounts\n"
-msgstr "\n登出全部账户\n"
+msgstr ""
+"\n"
+"登出全部账户\n"
 
 #: src/gaim-remote.c:317
 msgid ""
@@ -1651,7 +1742,7 @@
 "\n"
 "发送即时消息\n"
 
-#: src/gtkaccount.c:323
+#: src/gtkaccount.c:329
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1663,160 +1754,161 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:623
+#: src/gtkaccount.c:652
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:640 src/gtkft.c:555
+#: src/gtkaccount.c:669 src/gtkft.c:554
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:645 src/gtkblist.c:4047
+#: src/gtkaccount.c:674 src/gtkblist.c:4253
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:747
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:723 src/gtkblist.c:4061 src/gtkblist.c:4410
+#: src/gtkaccount.c:752 src/gtkblist.c:4267 src/gtkblist.c:4644
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:756
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:772
+#: src/gtkaccount.c:801
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:785
+#: src/gtkaccount.c:814
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:794
+#: src/gtkaccount.c:823
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:883
+#: src/gtkaccount.c:912
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1019 src/gtkaccount.c:1066
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1025 src/gtkaccount.c:1073
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1031 src/gtkaccount.c:1080
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1037 src/gtkaccount.c:1087
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1043 src/gtkaccount.c:1094
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1049 src/gtkaccount.c:1101 src/gtkprefs.c:1042
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1024
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1140
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1144
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1160
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1178 src/gtkprefs.c:1036
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1018
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1187 src/gtkprefs.c:1063
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1081
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1199
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1118
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1571
+#: src/gtkaccount.c:1602
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1573
+#: src/gtkaccount.c:1604
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1597
+#: src/gtkaccount.c:1628
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1598
+#: src/gtkaccount.c:1629
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1625 src/protocols/jabber/jabber.c:674
+#: src/gtkaccount.c:1651 src/protocols/jabber/jabber.c:675
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1989
+#: src/gtkaccount.c:1983 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1994 src/gtkrequest.c:263
+#: src/gtkaccount.c:1988 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2051 src/gtkstatus.c:161 src/protocols/oscar/oscar.c:4192
+#: src/gtkaccount.c:2045 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4297
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2068
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/gtkaccount.c:2082
+#: src/gtkaccount.c:2076
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2393
+#: src/gtkaccount.c:2379
 #, 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:2407
+#: src/gtkaccount.c:2393
 msgid ""
 "\n"
 "\n"
@@ -1826,251 +1918,251 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2411
+#: src/gtkaccount.c:2397
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2415
+#: src/gtkaccount.c:2401
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2417 src/gtkblist.c:4462 src/gtkconv.c:1456
-#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3818
-#: src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2403 src/gtkblist.c:4696 src/gtkconv.c:1454
+#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3922
+#: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:812
+#: src/gtkblist.c:840
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:833
+#: src/gtkblist.c:861
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:844 src/gtkpounce.c:418 src/gtkroomlist.c:354
+#: src/gtkblist.c:872 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1116
+#: src/gtkblist.c:1144
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1119
+#: src/gtkblist.c:1147
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1125
+#: src/gtkblist.c:1153
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1131
+#: src/gtkblist.c:1159
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:1230
+#: src/gtkblist.c:1161 src/gtkblist.c:1258
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1143
+#: src/gtkblist.c:1171
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1173
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1175
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1150 src/gtkdialogs.c:770 src/gtkdialogs.c:771
+#: src/gtkblist.c:1178 src/gtkdialogs.c:854 src/gtkdialogs.c:855
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1154 src/gtkblist.c:1238 src/gtkblist.c:1252
+#: src/gtkblist.c:1182 src/gtkblist.c:1266 src/gtkblist.c:1280
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1156 src/gtkblist.c:1240 src/gtkblist.c:1257
+#: src/gtkblist.c:1184 src/gtkblist.c:1268 src/gtkblist.c:1285
 #: src/gtkconn.c:156
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1202
+#: src/gtkblist.c:1230
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:1232
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1234
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1236
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1226 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1254 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/gtkstock.c:89
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1256
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1254 src/gtkblist.c:1279
+#: src/gtkblist.c:1282 src/gtkblist.c:1307
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1284
+#: src/gtkblist.c:1312
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1501 src/gtkblist.c:1511 src/gtkblist.c:3321
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:1529 src/gtkblist.c:1539 src/gtkblist.c:3509
+#: src/gtkblist.c:3512
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:1952 src/gtkconv.c:4104 src/gtkpounce.c:316
+#: src/gtkblist.c:1980 src/gtkconv.c:4145 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:2406
+#: src/gtkblist.c:2549
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2550
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:2551
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:2552
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2410
+#: src/gtkblist.c:2553
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2412
+#: src/gtkblist.c:2555
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2413
+#: src/gtkblist.c:2556
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2414
+#: src/gtkblist.c:2557
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2415
+#: src/gtkblist.c:2558
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2416
+#: src/gtkblist.c:2559
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2418
+#: src/gtkblist.c:2561
 msgid "/Buddies/_Log Out"
 msgstr "/好友(B)/登出(_L)"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2562
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2422
+#: src/gtkblist.c:2565
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2423
+#: src/gtkblist.c:2566
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2424
+#: src/gtkblist.c:2567
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2425
+#: src/gtkblist.c:2568
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2427
+#: src/gtkblist.c:2570
 msgid "/Tools/_Statuses"
 msgstr "/工具(T)/状态(_S)"
 
-#: src/gtkblist.c:2428
+#: src/gtkblist.c:2571
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2429
+#: src/gtkblist.c:2572
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2430
+#: src/gtkblist.c:2573
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2574
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2432
+#: src/gtkblist.c:2575
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2434
+#: src/gtkblist.c:2577
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2435
+#: src/gtkblist.c:2578
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2438
+#: src/gtkblist.c:2581
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2439
+#: src/gtkblist.c:2582
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2440
+#: src/gtkblist.c:2583
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2441
+#: src/gtkblist.c:2584
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2459
+#: src/gtkblist.c:2602
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2459
+#: src/gtkblist.c:2602
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2460
+#: src/gtkblist.c:2603
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2634 src/gtkblist.c:2701
 #, c-format
 msgid ""
 "\n"
@@ -2079,7 +2171,83 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2563
+#: src/gtkblist.c:2710
+#, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>联系人别名:</b> %s"
+
+#: src/gtkblist.c:2718
+#, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>别名:</b> %s"
+
+#: src/gtkblist.c:2726
+#, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>昵称:</b> %s"
+
+#: src/gtkblist.c:2735
+#, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>登入:</b> %s"
+
+#: src/gtkblist.c:2747
+#, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>瞌睡:</b> %s"
+
+#: src/gtkblist.c:2751
+msgid ""
+"\n"
+"<b>Idle</b>"
+msgstr ""
+"\n"
+"<b>瞌睡</b>"
+
+#: src/gtkblist.c:2762
+#, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>上次看见:</b> %s 以前"
+
+#: src/gtkblist.c:2771
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2772
+#, c-format
+msgid ""
+"\n"
+"<b>Warned:</b> %s"
+msgstr ""
+"\n"
+"<b>警告:</b> %s"
+
+#: src/gtkblist.c:2778
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2087,76 +2255,7 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2578
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2594
-msgid ""
-"\n"
-"<b>Account:</b>"
-msgstr ""
-"\n"
-"<b>账户:</b>"
-
-#: src/gtkblist.c:2595
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>联系人别名:</b>"
-
-#: src/gtkblist.c:2596
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>别名:</b>"
-
-#: src/gtkblist.c:2597
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>昵称:</b>"
-
-#: src/gtkblist.c:2598
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>登入:</b>"
-
-#: src/gtkblist.c:2599
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>瞌睡:</b>"
-
-#: src/gtkblist.c:2599
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>瞌睡</b>"
-
-#: src/gtkblist.c:2601
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>警告:</b>"
-
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2799
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2164,127 +2263,127 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2604
+#: src/gtkblist.c:2801
 msgid ""
 "\n"
-"<b>Status</b>: Awesome"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>状态</b>: 可怕"
-
-#: src/gtkblist.c:2605
+"<b>状态:</b> 可怕"
+
+#: src/gtkblist.c:2803
 msgid ""
 "\n"
-"<b>Status</b>: Rockin'"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>状态</b>: 混乱"
-
-#: src/gtkblist.c:2904
+"<b>状态:</b> 混乱"
+
+#: src/gtkblist.c:3045
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2906
+#: src/gtkblist.c:3047
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2909
+#: src/gtkblist.c:3050
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:2915
+#: src/gtkblist.c:3056
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2919
+#: src/gtkblist.c:3060
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3038
+#: src/gtkblist.c:3179
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: src/gtkblist.c:3039 src/gtkblist.c:3074
+#: src/gtkblist.c:3180 src/gtkblist.c:3215
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3040
+#: src/gtkblist.c:3181
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: src/gtkblist.c:3041
+#: src/gtkblist.c:3182
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: src/gtkblist.c:3042
+#: src/gtkblist.c:3183
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:3184
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: src/gtkblist.c:3044
+#: src/gtkblist.c:3185
 msgid "/Buddies/Log Out"
 msgstr "/好友(B)/登出"
 
-#: src/gtkblist.c:3077
+#: src/gtkblist.c:3218
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3080
+#: src/gtkblist.c:3221
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3141 src/gtkprefs.c:1726 src/protocols/jabber/jabber.c:935
+#: src/gtkblist.c:3289 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:3143
+#: src/gtkblist.c:3291
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3144
+#: src/gtkblist.c:3292
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3145
+#: src/gtkblist.c:3293
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3216
+#: src/gtkblist.c:3405
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3217
+#: src/gtkblist.c:3406
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3407
 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:3317
+#: src/gtkblist.c:3505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3319
+#: src/gtkblist.c:3507
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4001 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4207 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:2579
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2581
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4025
+#: src/gtkblist.c:4231
 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. "
@@ -2294,47 +2393,47 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4085 src/gtkblist.c:4390
+#: src/gtkblist.c:4291 src/gtkblist.c:4624
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4323
+#: src/gtkblist.c:4557
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4339
+#: src/gtkblist.c:4573
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4356
+#: src/gtkblist.c:4590
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4380
+#: src/gtkblist.c:4614
 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:4459
+#: src/gtkblist.c:4693
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4460
+#: src/gtkblist.c:4694
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5005 src/gtkblist.c:5101
+#: src/gtkblist.c:5239 src/gtkblist.c:5335
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:156 src/gtkconn.c:388
+#: src/gtkconn.c:156 src/gtkconn.c:389
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:352
+#: src/gtkconn.c:353
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2347,19 +2446,19 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:354
+#: src/gtkconn.c:355
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:362
+#: src/gtkconn.c:363
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:393
+#: src/gtkconn.c:394
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:423
+#: src/gtkconn.c:424
 msgid "Time"
 msgstr "时间"
 
@@ -2432,11 +2531,11 @@
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:817 src/gtkstatus.c:301
+#: src/gtkconv.c:817 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:873 src/gtkconv.c:2539 src/gtkdebug.c:177
+#: src/gtkconv.c:873 src/gtkconv.c:2524 src/gtkdebug.c:177
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
@@ -2457,277 +2556,281 @@
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1417
+#: src/gtkconv.c:1415
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1423 src/protocols/oscar/oscar.c:598
+#: src/gtkconv.c:1421 src/protocols/oscar/oscar.c:612
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1430
+#: src/gtkconv.c:1428
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1433 src/gtkprefs.c:762
+#: src/gtkconv.c:1431 src/gtkprefs.c:762
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1438
+#: src/gtkconv.c:1436
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1444
+#: src/gtkconv.c:1442
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1453 src/gtkrequest.c:265
+#: src/gtkconv.c:1451 src/gtkrequest.c:265
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2547
+#: src/gtkconv.c:2532
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2553
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2598
+#: src/gtkconv.c:2583
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2603
+#: src/gtkconv.c:2588
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2609
+#: src/gtkconv.c:2594
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2952
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:2957
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3025
+#: src/gtkconv.c:3058
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3512
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3514
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3485
+#: src/gtkconv.c:3519
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3487
+#: src/gtkconv.c:3521
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3488
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3524
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3528
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3495
+#: src/gtkconv.c:3529
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3497
+#: src/gtkconv.c:3531
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3499
+#: src/gtkconv.c:3533
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3535
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3540
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3508
+#: src/gtkconv.c:3542
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3544
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3546
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3517
+#: src/gtkconv.c:3551
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3553
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3524
+#: src/gtkconv.c:3558
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3562
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3563
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3564
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3531
+#: src/gtkconv.c:3565
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3566
 msgid "/Options/Show T_imestamps"
-msgstr "/选项/显示时间戳(_I)"
-
-#: src/gtkconv.c:3576
+msgstr "/选项(O)/显示时间戳(_I)"
+
+#: src/gtkconv.c:3567
+msgid "/Options/Show Buddy _Icon"
+msgstr "/选项(O)/显示好友图标(_I)"
+
+#: src/gtkconv.c:3611
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3581
+#: src/gtkconv.c:3616
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3585
+#: src/gtkconv.c:3620
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3626
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3595
+#: src/gtkconv.c:3630
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3634
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3640
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3644
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3613
+#: src/gtkconv.c:3648
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3652
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3623
+#: src/gtkconv.c:3658
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3627
+#: src/gtkconv.c:3662
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3633
+#: src/gtkconv.c:3668
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3636
+#: src/gtkconv.c:3671
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3639
+#: src/gtkconv.c:3674
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3642
+#: src/gtkconv.c:3677
 msgid "/Options/Show Timestamps"
-msgstr "/选项/显示时间戳(I)"
-
-#: src/gtkconv.c:3757
+msgstr "/选项(O)/显示时间戳(I)"
+
+#: src/gtkconv.c:3680
+msgid "/Options/Show Buddy Icon"
+msgstr "/选项(O)/显示好友图标(I)"
+
+#: src/gtkconv.c:3795
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3805
+#: src/gtkconv.c:3843
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3866
+#: src/gtkconv.c:3905
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3878
+#: src/gtkconv.c:3918
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3889
+#: src/gtkconv.c:3930
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4376
+#: src/gtkconv.c:4431
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4877 src/gtkconv.c:4906 src/gtkconv.c:5002 src/gtkconv.c:5060
+#: src/gtkconv.c:4933 src/gtkconv.c:4962 src/gtkconv.c:5058 src/gtkconv.c:5116
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5614 src/gtkconv.c:5617
-msgid "<main>/Conversation/Close"
-msgstr "<main>/对话(C)/关闭(C)"
-
-#: src/gtkconv.c:5881
+#: src/gtkconv.c:6021
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:5884
+#: src/gtkconv.c:6024
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:5887
+#: src/gtkconv.c:6027
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:5891
+#: src/gtkconv.c:6031
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
@@ -2755,20 +2858,21 @@
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:68
+#: 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
+msgid "developer"
+msgstr "开发者"
+
+#: src/gtkdialogs.c:69
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: 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:75
+#: src/gtkdialogs.c:76
 msgid "support"
 msgstr "支持"
 
@@ -2944,7 +3048,7 @@
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:221
+#: src/gtkdialogs.c:222
 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 "
@@ -2954,69 +3058,73 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
 "成,并以 GPL 许可协议发行。<BR><BR>"
 
-#: src/gtkdialogs.c:230
+#: src/gtkdialogs.c:231
+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
 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:235
+#: src/gtkdialogs.c:240
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:250
+#: src/gtkdialogs.c:255
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:265
+#: src/gtkdialogs.c:270
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:280
+#: src/gtkdialogs.c:285
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:300
+#: src/gtkdialogs.c:305
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:370 src/gtkdialogs.c:513 src/gtkdialogs.c:568
+#: src/gtkdialogs.c:454 src/gtkdialogs.c:597 src/gtkdialogs.c:652
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/gtkdialogs.c:376 src/gtkdialogs.c:519 src/gtkdialogs.c:574
+#: src/gtkdialogs.c:460 src/gtkdialogs.c:603 src/gtkdialogs.c:658
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:383
+#: src/gtkdialogs.c:467
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:385
+#: src/gtkdialogs.c:469
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:526
+#: src/gtkdialogs.c:610
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:528
+#: src/gtkdialogs.c:612
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:582
+#: src/gtkdialogs.c:666
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:584
+#: src/gtkdialogs.c:668
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:624
+#: src/gtkdialogs.c:708
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:645
+#: src/gtkdialogs.c:729
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3028,45 +3136,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:654
+#: src/gtkdialogs.c:738
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:661
+#: src/gtkdialogs.c:745
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:682
+#: src/gtkdialogs.c:766
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:683
+#: src/gtkdialogs.c:767
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:685 src/gtkdialogs.c:707 src/gtkdialogs.c:727
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:703
+#: src/gtkdialogs.c:787
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:705
+#: src/gtkdialogs.c:789
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:724
+#: src/gtkdialogs.c:808
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:725
+#: src/gtkdialogs.c:809
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:846
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3078,35 +3186,35 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:829
+#: src/gtkdialogs.c:913
 #, 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:832 src/gtkdialogs.c:833
+#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:871
+#: src/gtkdialogs.c:955
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:874 src/gtkdialogs.c:875
+#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:992
 #, 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:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:996 src/gtkdialogs.c:997
 msgid "Remove Chat"
 msgstr "删除聊天"
 
@@ -3115,15 +3223,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:161 src/gtkft.c:978
+#: src/gtkft.c:161 src/gtkft.c:966
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:164 src/gtkft.c:929
+#: src/gtkft.c:164 src/gtkft.c:917
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:167 src/gtkft.c:848
+#: src/gtkft.c:167 src/gtkft.c:836
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
@@ -3167,54 +3275,54 @@
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:555
 msgid "Filename:"
 msgstr "文件名:"
 
+#: src/gtkft.c:556
+msgid "Status:"
+msgstr "状态:"
+
 #: src/gtkft.c:557
-msgid "Status:"
-msgstr "状态:"
+msgid "Speed:"
+msgstr "速度:"
 
 #: src/gtkft.c:558
-msgid "Speed:"
-msgstr "速度:"
+msgid "Time Elapsed:"
+msgstr "已过时间:"
 
 #: src/gtkft.c:559
-msgid "Time Elapsed:"
-msgstr "已过时间:"
-
-#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:652
+#: src/gtkft.c:645
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:662
+#: src/gtkft.c:655
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:671
+#: src/gtkft.c:664
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:672
+#: src/gtkft.c:665
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:714 src/gtkstock.c:93
+#: src/gtkft.c:702 src/gtkstock.c:93
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:724
+#: src/gtkft.c:712
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:931
+#: src/gtkft.c:919
 msgid "Failed"
 msgstr "已失败"
 
@@ -3230,42 +3338,42 @@
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1019
+#: src/gtkimhtml.c:1021
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1020
+#: src/gtkimhtml.c:1022
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1237
+#: src/gtkimhtml.c:1236
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1249
+#: src/gtkimhtml.c:1248
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1259
+#: src/gtkimhtml.c:1258
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2820
+#: src/gtkimhtml.c:2848
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2828
+#: src/gtkimhtml.c:2856
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2905 src/gtkimhtml.c:2917
+#: src/gtkimhtml.c:2933 src/gtkimhtml.c:2945
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2945
+#: src/gtkimhtml.c:2973
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3273,118 +3381,118 @@
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:258
+#: src/gtkimhtmltoolbar.c:259
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:332
+#: src/gtkimhtmltoolbar.c:334
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:418
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:426
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:429
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:430
+#: src/gtkimhtmltoolbar.c:433
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:435
+#: src/gtkimhtmltoolbar.c:438
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:439
+#: src/gtkimhtmltoolbar.c:442
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:508
+#: src/gtkimhtmltoolbar.c:511
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544
+#: src/gtkimhtmltoolbar.c:537 src/gtkimhtmltoolbar.c:547
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781
+#: src/gtkimhtmltoolbar.c:706 src/gtkimhtmltoolbar.c:784
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:795
+#: src/gtkimhtmltoolbar.c:798
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:977
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:988
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:999
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:1012
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:1024
+#: src/gtkimhtmltoolbar.c:1027
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:1041
+#: src/gtkimhtmltoolbar.c:1044
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:1053
+#: src/gtkimhtmltoolbar.c:1056
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:1065
+#: src/gtkimhtmltoolbar.c:1068
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:1080
+#: src/gtkimhtmltoolbar.c:1083
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1090
+#: src/gtkimhtmltoolbar.c:1093
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1101
+#: src/gtkimhtmltoolbar.c:1104
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:303
+#: src/gtklog.c:308
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
 #. Window **********
-#: src/gtklog.c:391 src/gtklog.c:407
+#: src/gtklog.c:396 src/gtklog.c:412
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/gtkmain.c:310
+#: src/gtkmain.c:319
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/gtkmain.c:312
+#: src/gtkmain.c:321
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3410,11 +3518,11 @@
 "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: src/gtkmain.c:625
+#: src/gtkmain.c:633
 msgid "Unable to load preferences"
 msgstr "无法装入首选项"
 
-#: src/gtkmain.c:625
+#: src/gtkmain.c:634
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -3424,23 +3532,23 @@
 "用首选项窗口重新配置您的设置。"
 
 #. Descriptive label
-#: src/gtknotify.c:218
+#: src/gtknotify.c:262
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:276
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:285
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:246
+#: src/gtknotify.c:290
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3451,7 +3559,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:262
+#: src/gtknotify.c:306
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3462,22 +3570,26 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
+#: src/gtknotify.c:446
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: src/gtknotify.c:601
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "浏览器命令 <b>%s</b> 无效。"
 
-#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
-#: src/gtknotify.c:570
+#: src/gtknotify.c:603 src/gtknotify.c:615 src/gtknotify.c:628
+#: src/gtknotify.c:752
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:431 src/gtknotify.c:444
+#: src/gtknotify.c:613 src/gtknotify.c:626
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "调用 <b>%s</b> 出错: %s"
 
-#: src/gtknotify.c:571
+#: src/gtknotify.c:753
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
@@ -3491,147 +3603,147 @@
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:394 src/gtkpounce.c:906
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:394
+#: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:411
+#: src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:435
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:467
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:471
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:473
 msgid "_Return from away"
 msgstr "回来(_R)"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:475
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:480
+#: src/gtkpounce.c:477
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:482
+#: src/gtkpounce.c:479
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:484
+#: src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:518
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:520
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:525
+#: src/gtkpounce.c:522
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:529
+#: src/gtkpounce.c:526
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:536
+#: src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:619
+#: src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:914
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:983
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:985
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:987
+#: src/gtkpounce.c:979
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:989
+#: src/gtkpounce.c:981
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:990
+#: src/gtkpounce.c:982
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
@@ -3645,8 +3757,8 @@
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:662 src/gtkprefs.c:2069 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
+#: 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
 msgid "Description"
 msgstr "描述"
 
@@ -3659,218 +3771,202 @@
 msgstr "突出显示拼错的单词(_H)"
 
 #: src/gtkprefs.c:763
-msgid "Ignore c_olors"
-msgstr "忽略颜色(_O)"
-
-#: src/gtkprefs.c:765
-msgid "Ignore font _faces"
-msgstr "忽略字体(_F)"
-
-#: src/gtkprefs.c:767
-msgid "Ignore font si_zes"
-msgstr "较大字体(_Z)"
-
-#: src/gtkprefs.c:770
+msgid "Ignore _formatting"
+msgstr "忽略格式(_F)"
+
+#: src/gtkprefs.c:766
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:768
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:778
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:781
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:822
-msgid "Window Closing"
-msgstr "窗口关闭"
-
-#: src/gtkprefs.c:823
-msgid "_Escape closes window"
-msgstr "Esc 键关闭窗口(_E)"
-
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:821
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:830
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:835
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:836
 msgid "Show more buddy details"
 msgstr "显示好友的更多细节"
 
-#: src/gtkprefs.c:887
+#: src/gtkprefs.c:869
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "将未知的斜线命令发送为消息(_S)"
 
-#: src/gtkprefs.c:890
+#: src/gtkprefs.c:872
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:874
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:876
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
 #. All the tab options!
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:880
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:882
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:896
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:899
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:901
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:902
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:903
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:904
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:910
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:979 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5058
+#: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
+#: src/protocols/oscar/oscar.c:5185
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:963
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:972
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:996
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:999
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1002
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1027
+#: src/gtkprefs.c:1009
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:1016
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1020
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1082
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1156
+#: src/gtkprefs.c:1138
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1157
+#: src/gtkprefs.c:1139
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1140
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1141
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1160
+#: src/gtkprefs.c:1142
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1161
+#: src/gtkprefs.c:1143
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1144
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1163
+#: src/gtkprefs.c:1145
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1164
+#: src/gtkprefs.c:1146
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1173
+#: src/gtkprefs.c:1155
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1206
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1228
+#: src/gtkprefs.c:1210
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1217
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1237
+#: src/gtkprefs.c:1219
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1220
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1240
+#: src/gtkprefs.c:1222
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1254
+#: src/gtkprefs.c:1236
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3879,75 +3975,75 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1291
+#: src/gtkprefs.c:1273
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1276
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1297
+#: src/gtkprefs.c:1279
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1281
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1284
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1286
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1289
 msgid "Log when buddies log in/log _out"
 msgstr "记录好友的登入/登出(_O)"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1295
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1301
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1307
 msgid "Log your own _signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_S)"
 
-#: src/gtkprefs.c:1461
+#: src/gtkprefs.c:1443
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1495
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1496
 msgid "_Method:"
 msgstr "方式(_M):"
 
+#: src/gtkprefs.c:1498
+msgid "Console beep"
+msgstr "控制台响铃"
+
+#: src/gtkprefs.c:1500
+msgid "Automatic"
+msgstr "自动"
+
+#: src/gtkprefs.c:1507
+msgid "Command"
+msgstr "命令"
+
+#: src/gtkprefs.c:1508
+msgid "No sounds"
+msgstr "无声音"
+
 #: src/gtkprefs.c:1516
-msgid "Console beep"
-msgstr "控制台响铃"
-
-#: src/gtkprefs.c:1518
-msgid "Automatic"
-msgstr "自动"
-
-#: src/gtkprefs.c:1525
-msgid "Command"
-msgstr "命令"
-
-#: src/gtkprefs.c:1526
-msgid "No sounds"
-msgstr "无声音"
-
-#: src/gtkprefs.c:1534
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3956,102 +4052,102 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1543
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1544
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1546
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1574
+#: src/gtkprefs.c:1556
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1625
+#: src/gtkprefs.c:1607
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1632
+#: src/gtkprefs.c:1614
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1633
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1637
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1641
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1713
+#: src/gtkprefs.c:1695
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1716
+#: src/gtkprefs.c:1698
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1718
+#: src/gtkprefs.c:1700
 msgid "Never"
 msgstr "从不"
 
-#: src/gtkprefs.c:1719
+#: src/gtkprefs.c:1701
 msgid "When away"
 msgstr "离开时"
 
-#: src/gtkprefs.c:1720
+#: src/gtkprefs.c:1702
 msgid "When away and idle"
 msgstr "离开和瞌睡时"
 
-#: src/gtkprefs.c:1723 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:1349 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4207
-#: src/protocols/yahoo/yahoo.c:2408 src/protocols/yahoo/yahoo_profile.c:665
+#: 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/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1724
+#: src/gtkprefs.c:1706
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1727
+#: src/gtkprefs.c:1709
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1730
+#: src/gtkprefs.c:1712
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1732
+#: src/gtkprefs.c:1714
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1740
+#: src/gtkprefs.c:1722
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1741
+#: src/gtkprefs.c:1723
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1745
+#: src/gtkprefs.c:1727
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1753
+#: src/gtkprefs.c:1735
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1793
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4066,7 +4162,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1816
+#: src/gtkprefs.c:1798
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4081,51 +4177,47 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2025
+#: src/gtkprefs.c:2007
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2039
+#: src/gtkprefs.c:2021
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2087
+#: src/gtkprefs.c:2069
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2131
+#: src/gtkprefs.c:2113
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2132
-msgid "Shortcuts"
-msgstr "快捷键"
-
-#: src/gtkprefs.c:2133
+#: src/gtkprefs.c:2114
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2134
+#: src/gtkprefs.c:2115
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2135
+#: src/gtkprefs.c:2116
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2140
+#: src/gtkprefs.c:2121
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2143
+#: src/gtkprefs.c:2124
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2144
+#: src/gtkprefs.c:2125
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2147
+#: src/gtkprefs.c:2128
 msgid "Plugins"
 msgstr "插件"
 
@@ -4149,7 +4241,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
+#: src/gtkprivacy.c:388
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4162,54 +4254,54 @@
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:584 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:585
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:586
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:602
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:596
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:623 src/gtkprivacy.c:636
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:624
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:625
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:627 src/gtkprivacy.c:638
+#: src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:634
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4217,17 +4309,17 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1027
+#: 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
 #: src/request.h:1235
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1027
+#: 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
 #: src/request.h:1235
 msgid "No"
@@ -4237,24 +4329,24 @@
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
+#: src/gtkrequest.c:262 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1483
+#: src/gtkrequest.c:1492
 msgid "That file already exists"
-msgstr "该文件不存在"
-
-#: src/gtkrequest.c:1484
+msgstr "该文件已存在"
+
+#: src/gtkrequest.c:1493
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1522 src/gtkrequest.c:1543
+#: src/gtkrequest.c:1531 src/gtkrequest.c:1556
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1523 src/gtkrequest.c:1544
+#: src/gtkrequest.c:1532 src/gtkrequest.c:1557
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4267,6 +4359,67 @@
 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
+msgid "Title"
+msgstr "标题"
+
+#: src/gtksavedstatuses.c:325
+msgid "Type"
+msgstr "类型"
+
+#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:292
+#: src/protocols/gg/gg.c:298 src/protocols/gg/gg.c:304
+#: src/protocols/gg/gg.c:310 src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
+#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:971
+#: 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
+msgid "Message"
+msgstr "消息"
+
+#: src/gtksavedstatuses.c:399
+msgid "Saved Statuses"
+msgstr "已存状态"
+
+#: src/gtksavedstatuses.c:520
+msgid "Title already in use.  You must choose a unique title."
+msgstr "标题已在使用中。您必须选择唯一的标题。"
+
+#: src/gtksavedstatuses.c:611
+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/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
+msgid "Status"
+msgstr "状态"
+
+#: src/gtksavedstatuses.c:733
+msgid "_Title:"
+msgstr "标题(_T):"
+
+#: src/gtksavedstatuses.c:744
+msgid "Out of the office"
+msgstr "离开办公室"
+
+#: src/gtksavedstatuses.c:755
+msgid "_Status:"
+msgstr "状态(_S):"
+
+#. Custom status message disclosure
+#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
+msgid "Use a different status for some accounts"
+msgstr "为某些账户使用不同的状态"
+
 #: src/gtksound.c:65
 msgid "Buddy logs in"
 msgstr "好友登入"
@@ -4325,76 +4478,8 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#. GAIM_STATUS_AVAILABLE
-#: src/gtkstatus.c:103 src/gtkstatusselector.c:598 src/protocols/gg/gg.c:50
-#: src/protocols/irc/irc.c:175 src/protocols/msn/msn.c:538
-#: 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:771
-#: src/protocols/oscar/oscar.c:6902 src/protocols/yahoo/yahoo.c:2880
-msgid "Available"
-msgstr "可用"
-
-#. GAIM_STATUS_UNAVAILABLE
-#: src/gtkstatus.c:108 src/protocols/gg/gg.c:56
-msgid "Unavailable"
-msgstr "不可用"
-
-#. GAIM_STATUS_HIDDEN
-#: src/gtkstatus.c:113 src/protocols/msn/msn.c:562
-#: src/protocols/zephyr/zephyr.c:2221
-msgid "Hidden"
-msgstr "隐身"
-
-#. GAIM_STATUS_EXTENDED_AWAY
-#: src/gtkstatus.c:123 src/protocols/jabber/buddy.c:1076
-#: src/protocols/jabber/jabber.c:993
-msgid "Extended Away"
-msgstr "远远离开"
-
-#: src/gtkstatus.c:150
-msgid "Custom status"
-msgstr "自定义状态"
-
-#: src/gtkstatus.c:251 src/protocols/jabber/buddy.c:614
-#: src/protocols/jabber/buddy.c:621 src/protocols/jabber/buddy.c:632
-#: src/protocols/jabber/jabber.c:949 src/protocols/msn/msn.c:505
-#: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
-#: src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:737
-#: src/protocols/oscar/oscar.c:739 src/protocols/yahoo/yahoo.c:2531
-msgid "Status"
-msgstr "状态"
-
-#: src/gtkstatus.c:270
-msgid "_Title:"
-msgstr "标题(_T):"
-
-#: src/gtkstatus.c:277
-msgid "Out of the office"
-msgstr "离开办公室"
-
-#: src/gtkstatus.c:286
-msgid "_Status:"
-msgstr "状态(_S):"
-
-#. Custom status message disclosure
-#: src/gtkstatus.c:312 src/gtkstatus.c:313
-msgid "Use a different status for some accounts"
-msgstr "为某些账户使用不同的状态"
-
-#: src/gtkstatus.c:469 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:793 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "标题"
-
-#: src/gtkstatus.c:519
-msgid "Saved Statuses"
-msgstr "已存状态"
-
 #. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:277 src/gtkstatusselector.c:346
-#: src/gtkstatusselector.c:605
+#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
 msgid "New Status"
 msgstr "新建状态"
 
@@ -4418,61 +4503,61 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "装入 %s 时发生了下列错误: %s。"
 
-#: src/gtkutils.c:1401 src/gtkutils.c:1426
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
 msgid "Failed to load image"
 msgstr "装入图像失败"
 
-#: src/gtkutils.c:1489
+#: src/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "无法发送文件夹 %s。"
 
-#: src/gtkutils.c:1491
+#: src/gtkutils.c:1485
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
 
-#: src/gtkutils.c:1519 src/gtkutils.c:1528 src/gtkutils.c:1533
+#: src/gtkutils.c:1513 src/gtkutils.c:1522 src/gtkutils.c:1527
 msgid "You have dragged an image"
 msgstr "您拖曳了图像"
 
-#: src/gtkutils.c:1520
+#: src/gtkutils.c:1514
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
+#: src/gtkutils.c:1518 src/gtkutils.c:1533
 msgid "Set as buddy icon"
 msgstr "设置为好友头像"
 
-#: src/gtkutils.c:1525 src/gtkutils.c:1540
+#: src/gtkutils.c:1519 src/gtkutils.c:1534
 msgid "Send image file"
 msgstr "发送图像文件"
 
-#: src/gtkutils.c:1526 src/gtkutils.c:1540
+#: src/gtkutils.c:1520 src/gtkutils.c:1534
 msgid "Insert in message"
 msgstr "在消息中插入"
 
-#: src/gtkutils.c:1529
+#: src/gtkutils.c:1523
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您是否想要将其设置为此用户的头像?"
 
-#: src/gtkutils.c:1534
+#: src/gtkutils.c:1528
 msgid ""
 "You can send this image as a file transfer orembed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
-#: src/gtkutils.c:1536
+#: src/gtkutils.c:1530
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4483,11 +4568,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1590
+#: src/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-#: src/gtkutils.c:1590
+#: src/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4499,11 +4584,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:528
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:591
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4512,7 +4597,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:593
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4521,48 +4606,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:644 src/log.c:774
+#: src/log.c:661 src/log.c:791
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:654 src/log.c:786
+#: src/log.c:671 src/log.c:803
 #, 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:658
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:719
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:790
+#: src/log.c:807
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/plugin.c:304
+#: src/plugin.c:287
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:309 src/plugin.c:337
+#: src/plugin.c:292 src/plugin.c:320
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:333
+#: src/plugin.c:316
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: src/prefs.c:114
+#: src/prefs.c:1094
 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 "只对好友可用"
@@ -4571,9 +4667,9 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:6916 src/protocols/yahoo/yahoo.c:2406
-#: src/protocols/yahoo/yahoo.c:2924
+#: 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 "隐身"
 
@@ -4581,58 +4677,62 @@
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:56 src/status.c:158
+msgid "Unavailable"
+msgstr "不可用"
+
+#: src/protocols/gg/gg.c:151
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
-#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
+#: 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/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:146
+#: src/protocols/gg/gg.c:160
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:149
+#: src/protocols/gg/gg.c:163
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:152
+#: src/protocols/gg/gg.c:166
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:155
+#: src/protocols/gg/gg.c:169
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:4007
+#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4111
 #, 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:234 src/protocols/gg/gg.c:1075
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4011
-#: src/protocols/oscar/oscar.c:4236 src/protocols/silc/ops.c:1088
+#: 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/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:268 src/protocols/irc/irc.c:167
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
-#: src/protocols/oscar/oscar.c:6698 src/protocols/oscar/oscar.c:6892
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2410
-#: src/protocols/yahoo/yahoo.c:2874
+#: 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 "离线"
 
@@ -4649,184 +4749,172 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
-#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6897
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2412
-#: src/protocols/yahoo/yahoo.c:2877 src/protocols/zephyr/zephyr.c:2218
+#: 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/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/status.c:156
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
-#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
-#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
-#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:180
-#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6903
-#: src/protocols/oscar/oscar.c:6910 src/protocols/yahoo/yahoo.c:2886
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/zephyr/zephyr.c:2226
-msgid "Message"
-msgstr "消息"
-
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:341
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:481
+#: src/protocols/gg/gg.c:495
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:488
+#: src/protocols/gg/gg.c:502
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
+#: src/protocols/gg/gg.c:752 src/protocols/napster/napster.c:486
 #: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2007 src/protocols/yahoo/yahoo.c:2034
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:110 src/protocols/yahoo/ycht.c:483
+#: 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
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:754
+#: src/protocols/gg/gg.c:768
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:757
+#: src/protocols/gg/gg.c:771
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:760
+#: src/protocols/gg/gg.c:774
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:763
+#: src/protocols/gg/gg.c:777
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:773
+#: src/protocols/gg/gg.c:787
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
+#: src/protocols/gg/gg.c:805 src/protocols/gg/gg.c:896
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:853
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:865
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:856
+#: src/protocols/gg/gg.c:870
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:859
+#: src/protocols/gg/gg.c:873
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:906
+#: src/protocols/gg/gg.c:920
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:995
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1000
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1012
+#: src/protocols/gg/gg.c:1026
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5050
+#: src/protocols/gg/gg.c:1031 src/protocols/oscar/oscar.c:5177
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:5061 src/protocols/silc/ops.c:810
+#: 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/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:5062 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1040 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:5189 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5051
+#: 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/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
+#: src/protocols/gg/gg.c:1051 src/protocols/gg/gg.c:1054
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
-#: src/protocols/gg/gg.c:1050
+#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1062
+#: src/protocols/gg/gg.c:1064
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
-#: src/protocols/oscar/oscar.c:5105 src/protocols/oscar/oscar.c:5113
+#: 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/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1111
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1105
+#: src/protocols/gg/gg.c:1119
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1167
+#: src/protocols/gg/gg.c:1181
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1189
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1183
+#: src/protocols/gg/gg.c:1197
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1191
+#: src/protocols/gg/gg.c:1205
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1214
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1207
+#: src/protocols/gg/gg.c:1221
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1340
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1327
+#: 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."
@@ -4834,77 +4922,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1370
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1371
 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:1430
+#: src/protocols/gg/gg.c:1444
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
+#: src/protocols/gg/gg.c:1445 src/protocols/gg/gg.c:1468
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1467
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1518
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1505
+#: 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:1539
+#: src/protocols/gg/gg.c:1553
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1554
 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:1556
+#: src/protocols/gg/gg.c:1570
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
-#: src/protocols/toc/toc.c:1571
+#: src/protocols/gg/gg.c:1575 src/protocols/jabber/jabber.c:1111
+#: src/protocols/toc/toc.c:1577
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1565
+#: src/protocols/gg/gg.c:1579
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1569
+#: src/protocols/gg/gg.c:1583
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1573
+#: src/protocols/gg/gg.c:1587
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1620
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1607
+#: 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."
@@ -4921,30 +5009,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
+#: src/protocols/gg/gg.c:1768 src/protocols/gg/gg.c:1770
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:586
+#: src/protocols/silc/silc.c:1007
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1022
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:590
+#: 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:167
-#: src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:196
+#: 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 "文件传送中止"
 
@@ -4969,8 +5057,8 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:513
-#: src/protocols/irc/irc.c:535
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:516
+#: src/protocols/irc/irc.c:538
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -4990,45 +5078,49 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:259
-#, c-format
-msgid "Logging in: %s"
-msgstr "登入: %s"
-
-#: src/protocols/irc/irc.c:269 src/protocols/jabber/jabber.c:406
-#: src/protocols/jabber/jabber.c:738
+#. 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"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/irc/irc.c:280
+#: src/protocols/irc/irc.c:278
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:347 src/protocols/jabber/jabber.c:301
-#: src/protocols/oscar/oscar.c:1695 src/protocols/oscar/oscar.c:1770
+#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:302
+#: src/protocols/oscar/oscar.c:1737 src/protocols/oscar/oscar.c:1814
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:372 src/protocols/jabber/jabber.c:328
+#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:329
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/irc/irc.c:375 src/protocols/jabber/jabber.c:331
+#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:332
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:510 src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:535
 #: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:671 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1353
+#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1374
+#: src/protocols/yahoo/yahoochat.c:1355
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:674 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1362
+#: src/protocols/irc/irc.c:677 src/protocols/silc/chat.c:1377
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
 msgid "Topic"
 msgstr "话题"
 
@@ -5040,43 +5132,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:781
+#: src/protocols/irc/irc.c:784
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:782
+#: src/protocols/irc/irc.c:785
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:801 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/irc/irc.c:804 src/protocols/irc/msgs.c:201
+#: 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:804 src/protocols/jabber/jabber.c:1642
-#: src/protocols/msn/msn.c:1954 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
+#: 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
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:807
+#: src/protocols/irc/irc.c:810
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:810 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1459
+#: src/protocols/irc/irc.c:813 src/protocols/irc/msgs.c:195
+#: 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:813
+#: src/protocols/irc/irc.c:816
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:816
+#: src/protocols/irc/irc.c:819
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -5109,7 +5201,7 @@
 
 #: 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/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
@@ -5141,133 +5233,141 @@
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:286
+#: src/protocols/irc/msgs.c:287
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:291
+#: src/protocols/irc/msgs.c:292
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:308
+#: src/protocols/irc/msgs.c:309
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:310
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:310
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:332
+#: src/protocols/irc/msgs.c:333
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:428
+msgid "Time Response"
+msgstr "时间响应"
+
+#: src/protocols/irc/msgs.c:429
+msgid "The IRC server's local time is:"
+msgstr "IRC 服务器的本地时间为:"
+
+#: src/protocols/irc/msgs.c:440
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:437
+#: src/protocols/irc/msgs.c:451
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:454
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:445
+#: src/protocols/irc/msgs.c:459
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:479
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:521
+#: src/protocols/irc/msgs.c:535
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:522
+#: src/protocols/irc/msgs.c:536
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:637
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:642
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:663
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:773
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:774
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:836
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:838
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:913
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:914 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:950
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:111
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:112
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:113
 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:113
+#: src/protocols/irc/parse.c:114
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5276,13 +5376,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 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:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5290,7 +5390,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5298,239 +5398,250 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 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:118
+#: src/protocols/irc/parse.c:119
 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:119
+#: src/protocols/irc/parse.c:120
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&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:121
+#: src/protocols/irc/parse.c:122
 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:122
+#: src/protocols/irc/parse.c:123
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
+#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1459
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
 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:125
+#: src/protocols/irc/parse.c:126
 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:126
+#: src/protocols/irc/parse.c:127
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129
 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:129
+#: src/protocols/irc/parse.c:130
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 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:132
+#: src/protocols/irc/parse.c:133
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: 显示 IRC 服务器上当前的本地时间。"
+
+#: src/protocols/irc/parse.c:134
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:135
 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:134
+#: src/protocols/irc/parse.c:136
 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:135
+#: src/protocols/irc/parse.c:137
 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:136
+#: 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:414
+#: src/protocols/irc/parse.c:419
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:420
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:420
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
-#: src/protocols/oscar/oscar.c:1592 src/protocols/toc/toc.c:189
+#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527
+#: 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:51
-msgid "Server requires SSL for login"
-msgstr "服务器需要 SSL 才能登录"
-
-#: src/protocols/jabber/auth.c:111
+#: src/protocols/jabber/auth.c:52
+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
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:386
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:657
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:670
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:674
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1339
+#: 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/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:656
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:657
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:712
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:720
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:724
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/jabber.c:647
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:733
 #: 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:742
-#: src/protocols/jabber/buddy.c:749
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:744
+#: src/protocols/jabber/buddy.c:751
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
-#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
+#: 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/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:783
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:785
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:789
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:798
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
-#: src/protocols/oscar/oscar.c:5086
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:691
+#: src/protocols/oscar/oscar.c:5213
 msgid "Birthday"
 msgstr "生日"
 
@@ -5544,80 +5655,85 @@
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:604
+#: src/protocols/jabber/buddy.c:606
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:1610
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:678 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
-#: src/protocols/oscar/oscar.c:5104 src/protocols/oscar/oscar.c:5112
+#: 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/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/buddy.c:708
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:814
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:814
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:834
+#: src/protocols/jabber/buddy.c:836
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1016
+#: src/protocols/jabber/buddy.c:1018
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1019
+#: src/protocols/jabber/buddy.c:1021
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1026
+#: src/protocols/jabber/buddy.c:1028
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1034
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1040
+#: src/protocols/jabber/buddy.c:1042
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
-#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: 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/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:988
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
-#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6936
+#: src/protocols/jabber/buddy.c:1078 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
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6397
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6532
 #: src/protocols/yahoo/yahoochat.c:958
 msgid "_Room:"
 msgstr "房间(_R):"
@@ -5657,48 +5773,48 @@
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:387
+#: src/protocols/jabber/chat.c:389
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
+#: src/protocols/jabber/chat.c:398 src/protocols/jabber/chat.c:543
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:412
+#: src/protocols/jabber/chat.c:414
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:413
+#: src/protocols/jabber/chat.c:415
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
+#: src/protocols/jabber/chat.c:465 src/protocols/jabber/chat.c:534
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:622
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/jabber/chat.c:672 src/protocols/jabber/chat.c:683
 #: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:729
+#: src/protocols/jabber/chat.c:731
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:767
+#: src/protocols/jabber/chat.c:769
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:768
+#: src/protocols/jabber/chat.c:770
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:771
+#: src/protocols/jabber/chat.c:773
 msgid "Find Rooms"
 msgstr "查找房间"
 
@@ -5706,414 +5822,402 @@
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
-#: 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/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
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
+#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
+#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
 #: src/protocols/trepia/trepia.c:1073
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:441
+#: src/protocols/jabber/jabber.c:442
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1230
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
+#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1085
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:612
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5106
-#: src/protocols/oscar/oscar.c:5114 src/protocols/trepia/trepia.c:336
+#: 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/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:653 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/jabber.c:662
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:669
+#: src/protocols/jabber/jabber.c:670
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#. connect to the server
-#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1774 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2228 src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "正在连接"
-
-#: src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/jabber.c:805
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:810
+#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:344
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:819
+#: src/protocols/jabber/jabber.c:820
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
-#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6696
+#: 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
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:925
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:926
+#: src/protocols/jabber/jabber.c:927
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:929
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:931
+#: src/protocols/jabber/jabber.c:932
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:933
+#: src/protocols/jabber/jabber.c:934
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:938
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
-#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:988 src/protocols/jabber/jabber.c:994
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jabber.c:1006
 msgid "Priority"
 msgstr "优先级"
 
-#: src/protocols/jabber/jabber.c:1021
+#: src/protocols/jabber/jabber.c:1028
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1029
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
+#: src/protocols/jabber/jabber.c:1033 src/protocols/jabber/jabber.c:1034
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1083
+#: src/protocols/jabber/jabber.c:1090
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1096
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1096
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1106 src/protocols/toc/toc.c:1567
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1188
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1190
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1192
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1194
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1196
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1272
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1200
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1202
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1204
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1206
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1210
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1212
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1216
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1218
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1220
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1222
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1224
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1226
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1228
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1235
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1237
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1240
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1243
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1246
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1251
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1253
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1259
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1262
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1264 src/protocols/silc/ops.c:1509
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1266
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1268
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1270
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1274
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1276
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1278
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1280
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1284
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1286
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1288
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1290
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1292
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1294
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1296
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1298
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1300
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1302
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1304
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:1306
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1373
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1425
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1451
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1448
+#: src/protocols/jabber/jabber.c:1455
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1464
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1469
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1475
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1474
+#: src/protocols/jabber/jabber.c:1481
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1480
+#: src/protocols/jabber/jabber.c:1487
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1486
+#: src/protocols/jabber/jabber.c:1493
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1492
+#: src/protocols/jabber/jabber.c:1499
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1497
+#: src/protocols/jabber/jabber.c:1504
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
-#: src/protocols/jabber/jabber.c:1512
-msgid "Hide Operating System"
-msgstr "隐藏操作系统"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6124,52 +6228,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1585 src/protocols/jabber/jabber.c:1587
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1627
+#: src/protocols/jabber/jabber.c:1613
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1618
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1637
+#: src/protocols/jabber/jabber.c:1623
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
+#: src/protocols/jabber/jabber.c:1632 src/protocols/silc/silc.c:1589
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: src/protocols/jabber/message.c:230
+#: src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: src/protocols/jabber/message.c:233
+#: src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
-#: src/protocols/jabber/message.c:297
+#: src/protocols/jabber/message.c:300
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
@@ -6178,49 +6282,49 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:261
+#: src/protocols/jabber/presence.c:264
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:264
+#: src/protocols/jabber/presence.c:267
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:270 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3746 src/protocols/oscar/oscar.c:6326
+#: src/protocols/jabber/presence.c:273 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6461
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:271 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3748 src/protocols/oscar/oscar.c:6327
+#: src/protocols/jabber/presence.c:274 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3852 src/protocols/oscar/oscar.c:6462
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:318 src/protocols/jabber/presence.c:319
+#: src/protocols/jabber/presence.c:321 src/protocols/jabber/presence.c:322
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:320
+#: src/protocols/jabber/presence.c:323
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:322
+#: src/protocols/jabber/presence.c:325
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:324
+#: src/protocols/jabber/presence.c:327
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:361
+#: src/protocols/jabber/presence.c:364
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:364
+#: src/protocols/jabber/presence.c:367
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -6234,18 +6338,6 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/cmdproc.c:358
-msgid "Miscellaneous error"
-msgstr "杂项错误"
-
-#: src/protocols/msn/cmdproc.c:361
-msgid "You have signed on from another location."
-msgstr "您在其它位置用此用户名登入了。"
-
-#: src/protocols/msn/cmdproc.c:363
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN 服务器目前维护中。"
-
 #: src/protocols/msn/dialog.c:91
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -6257,17 +6349,14 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。"
-"您是否想要添加此好友?"
+"本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。您是否想要添加此好友?"
 
 #: src/protocols/msn/dialog.c:105
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr ""
-"本地列表中的 %s 未出现在服务器列表中。"
-"您是否想要添加此好友?"
+msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6365,7 +6454,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:196
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:197
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6458,7 +6547,7 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2207
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2258
 #: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr "认证失败"
@@ -6493,35 +6582,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:116
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:271
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6529,24 +6618,24 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "禁止"
 
+#: src/protocols/msn/msn.c:311
+msgid "Send a mobile message."
+msgstr "发送移动消息。"
+
 #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."
-msgstr "发送移动消息。"
-
-#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2531
+#: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
+#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -6555,70 +6644,75 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:509
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:515
+#: src/protocols/msn/msn.c:512
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2388 src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2390 src/protocols/yahoo/yahoo.c:2899
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
+#: 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:2390
-#: src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2392
+#: src/protocols/yahoo/yahoo.c:2902
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2906
+#: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2914
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2920
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:574
+#: src/protocols/msn/msn.c:559 src/protocols/zephyr/zephyr.c:2221
+#: src/status.c:159
+msgid "Hidden"
+msgstr "隐身"
+
+#: src/protocols/msn/msn.c:571
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:576
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:580
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:587
+#: src/protocols/msn/msn.c:584
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/msn.c:590
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:595
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:621
+#: src/protocols/msn/msn.c:618
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:631
-msgid "Initiate Chat"
-msgstr "进入聊天室"
-
-#: src/protocols/msn/msn.c:667
+#: src/protocols/msn/msn.c:627 src/protocols/novell/novell.c:3380
+msgid "Initiate _Chat"
+msgstr "发起聊天(_C)"
+
+#: src/protocols/msn/msn.c:663
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6626,91 +6720,95 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/msn/msn.c:691
+msgid "Failed to connect to server."
+msgstr "连接到服务器失败。"
+
+#: src/protocols/msn/msn.c:1302 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:1339 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
+#: src/protocols/msn/msn.c:1309 src/protocols/msn/msn.c:1656
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:783
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1386
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
+#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1643
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5091
+#: src/protocols/msn/msn.c:1462 src/protocols/oscar/oscar.c:5218
 #: 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:1508 src/protocols/oscar/oscar.c:5078
+#: src/protocols/msn/msn.c:1469 src/protocols/oscar/oscar.c:5205
 #: 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:1517 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1478 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1485 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: 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
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553
+#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1567
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
+#: src/protocols/msn/msn.c:1589
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1598 src/protocols/msn/msn.c:1604
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1623 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:1684
+#: src/protocols/msn/msn.c:1645
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1685
+#: src/protocols/msn/msn.c:1646
 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 "
@@ -6719,24 +6817,16 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1689
+#: src/protocols/msn/msn.c:1650
 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:1695 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1656 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
-#: src/protocols/msn/msn.c:1836
-msgid "Display conversation closed notices"
-msgstr "显示对话关闭通知"
-
-#: src/protocols/msn/msn.c:1841
-msgid "Display timeout notices"
-msgstr "显示超时通知"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6747,47 +6837,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1928 src/protocols/msn/msn.c:1930
+#: src/protocols/msn/msn.c:1861 src/protocols/msn/msn.c:1863
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1949 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1882 src/protocols/trepia/trepia.c:1298
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1958
+#: src/protocols/msn/msn.c:1891
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/nexus.c:79
-msgid "Unable to connect to server"
-msgstr "无法连接到服务器"
-
-#: src/protocols/msn/nexus.c:218
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
-
-#: src/protocols/msn/notification.c:85
-msgid "Requesting to send password"
-msgstr "正在请求发送密码"
-
-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636
-msgid "Retrieving buddy list"
-msgstr "正在获取好友列表"
-
-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174
-#: src/protocols/oscar/oscar.c:2496
-msgid "Password sent"
-msgstr "密码已送出"
-
-#: src/protocols/msn/notification.c:732
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr "%s 的 MSN 好友列表临时不可用。请稍候再试一次。"
-
-#: src/protocols/msn/notification.c:1128
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1312
+msgid "Unable to connect"
+msgstr "无法连接"
+
+#: src/protocols/msn/notification.c:178
+#, c-format
+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
+msgid "Unknown error."
+msgstr "未知错误。"
+
+#: src/protocols/msn/notification.c:187
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s(%3$s) 上的 %1$s"
+
+#: src/protocols/msn/notification.c:492
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "无法在 %s(%s) 上添加用户"
+
+#: src/protocols/msn/notification.c:496
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "无法在 %s(%s) 上屏蔽用户"
+
+#: src/protocols/msn/notification.c:500
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "无法允许 %s(%s) 上的拥护"
+
+#: src/protocols/msn/notification.c:508
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "无法添加 %s,原因是您的好友列表已满。"
+
+#: src/protocols/msn/notification.c:517
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 不是有效的通行证账户。"
+
+#: src/protocols/msn/notification.c:774
+msgid "Unable to rename group"
+msgstr "无法重命名组"
+
+#: src/protocols/msn/notification.c:829
+msgid "Unable to delete group"
+msgstr "无法删除组"
+
+#: src/protocols/msn/notification.c:1232
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6809,64 +6924,110 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:93
-#, c-format
-msgid "Unable to connect to %s server"
-msgstr "无法连接到 %s 服务器"
-
-#: src/protocols/msn/servconn.c:97
-#, c-format
-msgid "Error writing to %s server"
-msgstr "从 %s 服务器读取时出错"
-
-#: src/protocols/msn/servconn.c:101
-#, c-format
-msgid "Error reading from %s server"
-msgstr "从 %s 服务器读取时出错"
-
-#: src/protocols/msn/servconn.c:105
-#, c-format
-msgid "Unknown error from %s server"
-msgstr "%s 服务器的未知错误"
-
-#: src/protocols/msn/servconn.c:334
-msgid "Received HTTP error. Please report this."
-msgstr "收到了 HTTP 错误。请进行报告。"
+#: src/protocols/msn/servconn.c:129
+msgid "Writing error"
+msgstr "写入错误"
+
+#: src/protocols/msn/servconn.c:131
+msgid "Reading error"
+msgstr "读取错误"
+
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:315
+#: src/protocols/oscar/oscar.c:4173
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: src/protocols/msn/servconn.c:136
+#, c-format
+msgid ""
+"Connection error from %s server (%s):\n"
+"%s"
+msgstr "%s 服务器(%s)的连接错误:\n%s"
+
+#: src/protocols/msn/session.c:293
+msgid "Our protocol is not supported by the server."
+msgstr "服务器不支持此协议。"
+
+#: src/protocols/msn/session.c:297
+msgid "Error parsing HTTP."
+msgstr "分析 HTTP 出错。"
+
+#: src/protocols/msn/session.c:301
+msgid "You have signed on from another location."
+msgstr "您在其它位置用此用户名登入了。"
+
+#: src/protocols/msn/session.c:304
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr "MSN 服务器临时不可用。请稍候再试一次。"
+
+#: src/protocols/msn/session.c:309
+msgid "The MSN servers are going down temporarily."
+msgstr "MSN 服务器目前维护中。"
+
+#: src/protocols/msn/session.c:313
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "无法通过身份验证: %s"
+
+#: src/protocols/msn/session.c:318
+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
+msgid "Handshaking"
+msgstr "握手"
+
+#: src/protocols/msn/session.c:340
+msgid "Transferring"
+msgstr "文件传送"
+
+#: src/protocols/msn/session.c:342
+msgid "Starting authentication"
+msgstr "开始身份验证"
+
+#: src/protocols/msn/session.c:343
+msgid "Getting cookie"
+msgstr "获得 cookie"
+
+#: src/protocols/msn/session.c:345
+msgid "Sending cookie"
+msgstr "发送 cookie"
+
+#: src/protocols/msn/session.c:346 src/protocols/trepia/trepia.c:636
+msgid "Retrieving buddy list"
+msgstr "正在获取好友列表"
 
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/switchboard.c:363
-msgid "Message may have not been sent because a time out occurred:"
+#: src/protocols/msn/switchboard.c:377
+msgid "Message may have not been sent because a timeout occurred:"
 msgstr "消息未发出,因为发生了超时:"
 
-#: src/protocols/msn/switchboard.c:371
+#: src/protocols/msn/switchboard.c:385
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "消息未发出,隐身时不允许:"
 
-#: src/protocols/msn/switchboard.c:375
+#: src/protocols/msn/switchboard.c:389
 msgid "Message could not be sent because the user is offline:"
 msgstr "消息未发出,因为用户离线:"
 
-#: src/protocols/msn/switchboard.c:379
+#: src/protocols/msn/switchboard.c:393
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "消息未发出,因为发生了连接错误:"
 
-#: src/protocols/msn/switchboard.c:383
+#: src/protocols/msn/switchboard.c:397
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "消息未发出,因为切换板发生了错误:"
 
-#: src/protocols/msn/switchboard.c:391
+#: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#: src/protocols/msn/switchboard.c:459
-msgid "The conversation has become inactive and timed out."
-msgstr "对话已停止并超时。"
-
-#: src/protocols/msn/switchboard.c:478
+#: src/protocols/msn/switchboard.c:647
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
@@ -6923,7 +7084,7 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1277
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -7171,8 +7332,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5064
-#: src/protocols/oscar/oscar.c:5071
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5198
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -7273,10 +7434,6 @@
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3380
-msgid "Initiate _Chat"
-msgstr "发起聊天(_C)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7299,280 +7456,280 @@
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:193
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:194
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:195
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:196
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:199
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:200
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:202
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:203
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:204
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:204
-msgid "Responses lost"
-msgstr "响应丢失"
-
 #: src/protocols/oscar/oscar.c:205
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Responses lost"
+msgstr "响应丢失"
 
 #: src/protocols/oscar/oscar.c:206
+msgid "Request denied"
+msgstr "请求被禁止"
+
+#: src/protocols/oscar/oscar.c:207
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:208
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:209
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:210
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:210
-msgid "Too evil (receiver)"
-msgstr "太邪恶(接收者)"
-
 #: src/protocols/oscar/oscar.c:211
-msgid "User temporarily unavailable"
-msgstr "用户临时不可用"
+msgid "Too evil (receiver)"
+msgstr "太邪恶(接收者)"
 
 #: src/protocols/oscar/oscar.c:212
+msgid "User temporarily unavailable"
+msgstr "用户临时不可用"
+
+#: src/protocols/oscar/oscar.c:213
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:213
-msgid "List overflow"
-msgstr "列表溢出"
-
 #: src/protocols/oscar/oscar.c:214
+msgid "List overflow"
+msgstr "列表溢出"
+
+#: src/protocols/oscar/oscar.c:215
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:216
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:217
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:406 src/protocols/oscar/oscar.c:489
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:600
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:603
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
+#: src/protocols/oscar/oscar.c:606 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7043
+#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7158
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:616
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:619
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:608
+#: src/protocols/oscar/oscar.c:622
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:625
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:614
+#: src/protocols/oscar/oscar.c:628
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:631
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:634
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:637
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:640
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:643
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:646
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:649
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:652
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:655
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:659
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:662
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:665
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7041
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6941
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7056
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6931
+#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7046
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:693
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:771
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:780
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:937
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:939
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:909
+#: src/protocols/oscar/oscar.c:947
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1024 src/protocols/oscar/oscar.c:1155
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1105
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1531
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1495
+#: src/protocols/oscar/oscar.c:1536
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1530
+#: src/protocols/oscar/oscar.c:1571
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1534
+#: src/protocols/oscar/oscar.c:1575
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1538 src/protocols/oscar/oscar.c:3503
+#: src/protocols/oscar/oscar.c:1579 src/protocols/oscar/oscar.c:3607
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1605 src/protocols/toc/toc.c:881
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "您已经断开与聊天室 %s 的连接。"
-
-#: src/protocols/oscar/oscar.c:1624
+#: src/protocols/oscar/oscar.c:1643
+#, c-format
+msgid "You have lost your connection to chat room %s."
+msgstr "您已经丢失与聊天室 %s 的连接。"
+
+#: src/protocols/oscar/oscar.c:1666
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1747
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1727
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7582,46 +7739,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1758
+#: src/protocols/oscar/oscar.c:1801
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1861 src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:2350
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1913
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1982 src/protocols/yahoo/yahoo_filexfer.c:178
-#: src/protocols/yahoo/yahoo_filexfer.c:187
-#: src/protocols/yahoo/yahoo_filexfer.c:197
+#: 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
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1987
+#: src/protocols/oscar/oscar.c:2031
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2059
+#: src/protocols/oscar/oscar.c:2110
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2184 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2235 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2189
+#: src/protocols/oscar/oscar.c:2240
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2193
+#: src/protocols/oscar/oscar.c:2244
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2198
+#: src/protocols/oscar/oscar.c:2249
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7629,21 +7786,33 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2203
+#: src/protocols/oscar/oscar.c:2254
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2234
+#: src/protocols/oscar/oscar.c:2285
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2306
+#: src/protocols/oscar/oscar.c:2357
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2342 src/protocols/oscar/oscar.c:2372
-#: src/protocols/oscar/oscar.c:2461
+#: src/protocols/oscar/oscar.c:2381
+msgid "The SecurID key entered is invalid."
+msgstr "输入的 SecurID 密钥无效。"
+
+#: src/protocols/oscar/oscar.c:2395
+msgid "Enter SecurID"
+msgstr "输入 SecurID"
+
+#: src/protocols/oscar/oscar.c:2396
+msgid "Enter the 6 digit number from the digital display."
+msgstr "输入所显示的六位数字。"
+
+#: src/protocols/oscar/oscar.c:2436 src/protocols/oscar/oscar.c:2466
+#: src/protocols/oscar/oscar.c:2555
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7651,20 +7820,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2345 src/protocols/oscar/oscar.c:2375
+#: src/protocols/oscar/oscar.c:2439 src/protocols/oscar/oscar.c:2469
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2464
+#: src/protocols/oscar/oscar.c:2558
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3494
+#: src/protocols/oscar/oscar.c:2590
+msgid "Password sent"
+msgstr "密码已送出"
+
+#: src/protocols/oscar/oscar.c:3598
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3497
+#: src/protocols/oscar/oscar.c:3601
 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 "
@@ -7673,41 +7846,41 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3640
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3648
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3649
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3679
 #, 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:3580 src/protocols/oscar/oscar.c:3582
+#: src/protocols/oscar/oscar.c:3684 src/protocols/oscar/oscar.c:3686
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3630 src/protocols/oscar/oscar.c:3632
-#: src/protocols/oscar/oscar.c:3639 src/protocols/oscar/oscar.c:3736
-#: src/protocols/oscar/oscar.c:3756 src/protocols/oscar/oscar.c:6318
-#: src/protocols/oscar/oscar.c:6364
+#: 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
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3638
+#: src/protocols/oscar/oscar.c:3742
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3736
+#: src/protocols/oscar/oscar.c:3840
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7716,11 +7889,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3744 src/protocols/oscar/oscar.c:6324
+#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6459
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3756
+#: src/protocols/oscar/oscar.c:3860
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7730,17 +7903,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3757
+#: src/protocols/oscar/oscar.c:3861
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3764
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3772
+#: src/protocols/oscar/oscar.c:3876
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7753,7 +7926,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:3884
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7766,7 +7939,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3788
+#: src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7779,32 +7952,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3809
+#: src/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3815
+#: src/protocols/oscar/oscar.c:3919
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3819
+#: src/protocols/oscar/oscar.c:3923
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3903
+#: src/protocols/oscar/oscar.c:4007
 #, 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:3912
+#: src/protocols/oscar/oscar.c:4016
 #, 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:3921
+#: src/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7812,93 +7985,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:3930
+#: src/protocols/oscar/oscar.c:4034
 #, 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:3939
+#: src/protocols/oscar/oscar.c:4043
 #, 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:3948
+#: src/protocols/oscar/oscar.c:4052
 #, 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:4002 src/protocols/oscar/oscar.c:4235
+#: src/protocols/oscar/oscar.c:4106 src/protocols/oscar/oscar.c:4340
 #: 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:4068
+#: src/protocols/oscar/oscar.c:4172
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:4069
-msgid "Unknown error"
-msgstr "未知错误"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4105 src/protocols/oscar/oscar.c:4110
-#: src/protocols/oscar/oscar.c:4168 src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4272 src/protocols/oscar/oscar.c:4276
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4272
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4275
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4193
+#: src/protocols/oscar/oscar.c:4298
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4197
+#: src/protocols/oscar/oscar.c:4302
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4202 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4307 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4286
+#: src/protocols/oscar/oscar.c:4391
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4577
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4692
+#: src/protocols/oscar/oscar.c:4797
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4693
+#: src/protocols/oscar/oscar.c:4798
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7906,158 +8075,160 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4760
+#: src/protocols/oscar/oscar.c:4867
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4762
+#: src/protocols/oscar/oscar.c:4869
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4882 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
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5076 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5203 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5078 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5078 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5205 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5094
+#: src/protocols/oscar/oscar.c:5221
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5225
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5103
+#: src/protocols/oscar/oscar.c:5230
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5107 src/protocols/oscar/oscar.c:5115
+#: src/protocols/oscar/oscar.c:5234 src/protocols/oscar/oscar.c:5242
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5238
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5246
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5247
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5248
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5122
+#: src/protocols/oscar/oscar.c:5249
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5124
+#: src/protocols/oscar/oscar.c:5251
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5261
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5183
+#: src/protocols/oscar/oscar.c:5310
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:5204
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:5332
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5208
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: src/protocols/oscar/oscar.c:5225
+#: src/protocols/oscar/oscar.c:5357
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5378
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5380
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5279
+#: src/protocols/oscar/oscar.c:5411
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5282
+#: src/protocols/oscar/oscar.c:5414
 #, 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:5285
+#: src/protocols/oscar/oscar.c:5417
 #, 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:5288
+#: src/protocols/oscar/oscar.c:5420
 #, 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:5291
+#: src/protocols/oscar/oscar.c:5423
 #, 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:5294
+#: src/protocols/oscar/oscar.c:5426
 #, 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:5297
+#: src/protocols/oscar/oscar.c:5429
 #, 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:5300
+#: src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5442
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8066,25 +8237,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5311 src/protocols/oscar/oscar.c:5318
+#: src/protocols/oscar/oscar.c:5443 src/protocols/oscar/oscar.c:5450
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5316
+#: src/protocols/oscar/oscar.c:5448
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5383
+#: src/protocols/oscar/oscar.c:5515
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5518
+#: src/protocols/oscar/oscar.c:5650
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5519
+#: src/protocols/oscar/oscar.c:5651
 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 "
@@ -8093,7 +8264,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5546
+#: src/protocols/oscar/oscar.c:5678
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8103,15 +8274,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5551
+#: src/protocols/oscar/oscar.c:5683
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5588
+#: src/protocols/oscar/oscar.c:5717
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5589
+#: src/protocols/oscar/oscar.c:5718
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8120,7 +8291,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5634
+#: src/protocols/oscar/oscar.c:5765
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8132,11 +8303,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5639
+#: src/protocols/oscar/oscar.c:5770
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5726
+#: src/protocols/oscar/oscar.c:5861
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8146,16 +8317,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5728 src/protocols/oscar/oscar.c:6184
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:5863 src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6333
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5890
+#: src/protocols/oscar/oscar.c:6025
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:6026
 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 "
@@ -8164,13 +8335,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6075 src/protocols/oscar/oscar.c:6076
-#: src/protocols/oscar/oscar.c:6081 src/protocols/oscar/oscar.c:6242
-#: src/protocols/oscar/oscar.c:6243 src/protocols/oscar/oscar.c:6248
+#: 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
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6182
+#: src/protocols/oscar/oscar.c:6317
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8178,11 +8349,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6182 src/protocols/oscar/oscar.c:6196
+#: src/protocols/oscar/oscar.c:6317 src/protocols/oscar/oscar.c:6331
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6196
+#: src/protocols/oscar/oscar.c:6331
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8192,18 +8363,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6279
+#: src/protocols/oscar/oscar.c:6414
 #, 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:6285
+#: src/protocols/oscar/oscar.c:6420
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6318
+#: src/protocols/oscar/oscar.c:6453
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8213,17 +8384,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6360
+#: src/protocols/oscar/oscar.c:6495
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6496
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6364
+#: src/protocols/oscar/oscar.c:6499
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8233,76 +8404,92 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6365
+#: src/protocols/oscar/oscar.c:6500
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6402 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6538 src/protocols/toc/toc.c:1282
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6440
+#: src/protocols/oscar/oscar.c:6577
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6529
+#: src/protocols/oscar/oscar.c:6644
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6779
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7114
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7000
+#: src/protocols/oscar/oscar.c:7115
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7019
+#: src/protocols/oscar/oscar.c:7134
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7140
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7037
+#: src/protocols/oscar/oscar.c:7152
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7054
+#: src/protocols/oscar/oscar.c:7169
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7084
+#: src/protocols/oscar/oscar.c:7229
+msgid "Require authorization"
+msgstr "请求认证"
+
+#: src/protocols/oscar/oscar.c:7232
+msgid "Hide IP address"
+msgstr "隐藏 IP 地址"
+
+#: src/protocols/oscar/oscar.c:7235
+msgid "Web aware"
+msgstr "Web 状态"
+
+#: src/protocols/oscar/oscar.c:7240
+msgid "ICQ Privacy Options"
+msgstr "ICQ 隐私选项"
+
+#: src/protocols/oscar/oscar.c:7257
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7085
+#: src/protocols/oscar/oscar.c:7258
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7092
+#: src/protocols/oscar/oscar.c:7265
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7144
+#: src/protocols/oscar/oscar.c:7317
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7189
+#: src/protocols/oscar/oscar.c:7362
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7192
+#: src/protocols/oscar/oscar.c:7365
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7193
+#: src/protocols/oscar/oscar.c:7366
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8310,71 +8497,77 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7210
+#: src/protocols/oscar/oscar.c:7383
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7211
+#: src/protocols/oscar/oscar.c:7384
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7212
+#: src/protocols/oscar/oscar.c:7385
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7293 src/protocols/silc/silc.c:814
+#: src/protocols/oscar/oscar.c:7466 src/protocols/silc/silc.c:803
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7298
+#: src/protocols/oscar/oscar.c:7472
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7303 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7477 src/protocols/silc/silc.c:799
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7308
+#: src/protocols/oscar/oscar.c:7483
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7312
+#: src/protocols/oscar/oscar.c:7487
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7321
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:7497
+msgid "Show privacy options..."
+msgstr "显示隐藏选项..."
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:7504
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7325
+#: src/protocols/oscar/oscar.c:7508
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7329
+#: src/protocols/oscar/oscar.c:7512
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7333
+#: src/protocols/oscar/oscar.c:7516
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7340
+#: src/protocols/oscar/oscar.c:7523
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7346
+#: src/protocols/oscar/oscar.c:7529
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7351
+#: src/protocols/oscar/oscar.c:7534
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7420
+#: src/protocols/oscar/oscar.c:7603
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7423
+#: src/protocols/oscar/oscar.c:7606
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8388,19 +8581,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7516 src/protocols/oscar/oscar.c:7518
+#: src/protocols/oscar/oscar.c:7699 src/protocols/oscar/oscar.c:7701
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7537
+#: src/protocols/oscar/oscar.c:7720
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7540
+#: src/protocols/oscar/oscar.c:7723
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7543 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7726 src/protocols/zephyr/zephyr.c:2859
 msgid "Encoding"
 msgstr "编码"
 
@@ -8501,7 +8694,7 @@
 msgstr "显示公钥"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
@@ -8587,57 +8780,57 @@
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:632
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:653
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:655
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "饥渴"
@@ -8667,7 +8860,7 @@
 msgstr "设备"
 
 #: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
+#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:694
 msgid "Timezone"
 msgstr "时区"
 
@@ -8695,85 +8888,85 @@
 msgid "Kill User"
 msgstr "杀死用户"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "密码句(_P):"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "频道信息"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>频道名称:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>用户数:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>频道创建人:</b> %s"
 
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>频道密码句:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>频道 HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>频道话题:</b><br>%s"
 
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>频道模式:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
-#: src/protocols/silc/chat.c:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8785,122 +8978,122 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:886
+#: 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
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1687
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:592
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:870
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:874
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:881
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:892
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:896
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:903
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:908
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:912
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:917
+#: src/protocols/silc/chat.c:918
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:922
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:928
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:932
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:994
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:997
+#: src/protocols/silc/chat.c:998
 #, 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:1056
+#: src/protocols/silc/chat.c:1057
 #, 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:1058
+#: src/protocols/silc/chat.c:1059
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1060
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:903
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
+#: src/protocols/silc/chat.c:1254 src/protocols/silc/silc.c:904
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -9045,7 +9238,7 @@
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:791
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
@@ -9272,15 +9465,15 @@
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:631
+#: src/protocols/silc/silc.c:620
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:622
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/silc.c:647
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9288,43 +9481,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:655 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:657 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:659 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:675
+#: src/protocols/silc/silc.c:664
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:671
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:674
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/silc.c:680
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:687
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:700 src/protocols/silc/silc.c:701
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:713
+#: src/protocols/silc/silc.c:702
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9333,182 +9526,182 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
-#: src/protocols/silc/silc.c:1159
+#: src/protocols/silc/silc.c:742 src/protocols/silc/silc.c:748
+#: src/protocols/silc/silc.c:1148
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:742
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
+#: src/protocols/silc/silc.c:743 src/protocols/silc/silc.c:1143
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:797
+#: src/protocols/silc/silc.c:786
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:806
+#: src/protocols/silc/silc.c:795
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:879
+#: src/protocols/silc/silc.c:868
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/silc/silc.c:1019
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1111
+#: src/protocols/silc/silc.c:1100
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1213
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1218
+#: src/protocols/silc/silc.c:1207
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1220
+#: src/protocols/silc/silc.c:1209
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1233
+#: src/protocols/silc/silc.c:1222
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1263
+#: src/protocols/silc/silc.c:1252
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1326
+#: src/protocols/silc/silc.c:1315
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1330
+#: src/protocols/silc/silc.c:1319
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1323
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1328
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1332
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1336
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2563
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1344
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1348
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1352
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1356
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1360
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1366
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1370
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1374
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1378
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1382
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1386
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1390
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1398
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1402
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1406
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1410
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1414
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1418
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1423
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1427
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9516,39 +9709,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1439
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1452
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1457
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1473
+#: src/protocols/silc/silc.c:1462
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1476
+#: src/protocols/silc/silc.c:1465
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1481
+#: src/protocols/silc/silc.c:1470
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1486
+#: src/protocols/silc/silc.c:1475
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9561,40 +9754,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1577
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1596
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1602
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1606
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1611
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1631
+#: src/protocols/silc/silc.c:1620
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -9841,43 +10034,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1430
+#: src/protocols/toc/toc.c:1432
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1572
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1694
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1724
+#: src/protocols/toc/toc.c:1730
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
-#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
+#: src/protocols/toc/toc.c:1775 src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1939 src/protocols/toc/toc.c:2027
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1966
+#: src/protocols/toc/toc.c:1972
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2072
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2100
+#: src/protocols/toc/toc.c:2106
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2107
+#: src/protocols/toc/toc.c:2113
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -9892,15 +10085,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
+#: src/protocols/toc/toc.c:2200 src/protocols/toc/toc.c:2202
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2215
+#: src/protocols/toc/toc.c:2221
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2219
+#: src/protocols/toc/toc.c:2225
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9993,36 +10186,36 @@
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:624
+#: src/protocols/yahoo/yahoo.c:626
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:643 src/protocols/yahoo/yahoo.c:3161
+#: src/protocols/yahoo/yahoo.c:645 src/protocols/yahoo/yahoo.c:3169
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:688
+#: src/protocols/yahoo/yahoo.c:690
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:755
+#: src/protocols/yahoo/yahoo.c:757
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:760
 #, 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:761
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1509
+#: src/protocols/yahoo/yahoo.c:1511
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10032,11 +10225,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1512
+#: src/protocols/yahoo/yahoo.c:1514
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1585
+#: src/protocols/yahoo/yahoo.c:1587
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10044,19 +10237,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1588
+#: src/protocols/yahoo/yahoo.c:1590
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1622
+#: src/protocols/yahoo/yahoo.c:1624
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1633
+#: src/protocols/yahoo/yahoo.c:1635
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1634
+#: src/protocols/yahoo/yahoo.c:1636
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10067,93 +10260,93 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1642
+#: src/protocols/yahoo/yahoo.c:1644
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1645
+#: src/protocols/yahoo/yahoo.c:1647
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1648
+#: src/protocols/yahoo/yahoo.c:1650
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1702
+#: src/protocols/yahoo/yahoo.c:1704
 #, 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:1705
+#: src/protocols/yahoo/yahoo.c:1707
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/yahoo/yahoo.c:1941 src/protocols/yahoo/yahoo.c:2067
 #: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2087 src/protocols/yahoo/yahoo.c:2197
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoochat.c:1370 src/protocols/yahoo/yahoochat.c:1431
+#: 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/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
 #: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2392 src/protocols/yahoo/yahoo.c:2897
+#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2905
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2908
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2396 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2911
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2400 src/protocols/yahoo/yahoo.c:2909
+#: src/protocols/yahoo/yahoo.c:2402 src/protocols/yahoo/yahoo.c:2917
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2915
+#: src/protocols/yahoo/yahoo.c:2406 src/protocols/yahoo/yahoo.c:2923
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2485 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo.c:2487 src/protocols/yahoo/yahoo.c:2513
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2590
+#: src/protocols/yahoo/yahoo.c:2592
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2595
+#: src/protocols/yahoo/yahoo.c:2597
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2646
+#: src/protocols/yahoo/yahoo.c:2648
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2655
+#: src/protocols/yahoo/yahoo.c:2657
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2665
+#: src/protocols/yahoo/yahoo.c:2667
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/yahoo/yahoo.c:2671
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3205
+#: src/protocols/yahoo/yahoo.c:3213
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3209
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10167,51 +10360,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3289 src/protocols/yahoo/yahoo.c:3291
+#: src/protocols/yahoo/yahoo.c:3297 src/protocols/yahoo/yahoo.c:3299
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3310
+#: src/protocols/yahoo/yahoo.c:3318
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3321
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3324
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3327
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3330
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3333
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3336
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3339
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3342
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3345
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:168
+#: src/protocols/yahoo/yahoo_filexfer.c:169
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -10333,27 +10526,23 @@
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1311
-msgid "Unable to connect"
-msgstr "无法连接"
-
-#: src/protocols/yahoo/yahoochat.c:1311
+#: src/protocols/yahoo/yahoochat.c:1312
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1358
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1359
+#: src/protocols/yahoo/yahoochat.c:1361
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1370 src/protocols/yahoo/yahoochat.c:1431
+#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1424
+#: src/protocols/yahoo/yahoochat.c:1426
 msgid "User Rooms"
 msgstr "用户房间"
 
@@ -10511,21 +10700,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:954
+#: src/proxy.c:959
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:958
+#: src/proxy.c:963
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1613
+#: src/proxy.c:1784
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1613
+#: src/proxy.c:1784
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10557,7 +10746,7 @@
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1164
+#: src/server.c:1166
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10566,80 +10755,170 @@
 "%s 邀请了 %s 加入聊天室 %s:\n"
 "<b>%s</b>"
 
-#: src/server.c:1168
+#: src/server.c:1172
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: src/server.c:1174
+#: src/server.c:1178
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/status.c:608
+#: src/status.c:154
+msgid "Unset"
+msgstr "取消设置"
+
+#: src/status.c:614
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:613
+#: src/status.c:619
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1320
+#: src/status.c:1314
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/status.c:1336
+#: src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/status.c:2010
-#, c-format
-msgid ""
-"An error was encountered parsing the file containing your saved statuses (%"
-"s).  They have not been loaded, and the old file has been renamed to status."
-"xml~."
-msgstr ""
-"分析包含您已存状态的文件(%s)时出错。状态未装入,旧文件被移动到 status.xml~ 中了。"
-
-#: src/status.c:2014
-msgid "Saved Statuses Error"
-msgstr "已存状态错误"
-
-#: src/util.c:2354
+#: src/util.c:2121
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+"读取 %s 出错"
+
+#: src/util.c:2122
+#, 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
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2357
+#: src/util.c:2560
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2387
+#: src/util.c:2590
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2401
+#: src/util.c:2604
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2409
+#: src/util.c:2612
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2417
+#: src/util.c:2620
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2834
+#: src/util.c:3037
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
+#~ 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."
+#~ "xml~."
+#~ msgstr ""
+#~ "分析包含您好友列表的文件时出错。好友列表未装入,旧文件被移动到 blist.xml~ "
+#~ "中了。"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "好友列表出错"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>账户:</b>"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/对话(C)/关闭(C)"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "忽略颜色(_O)"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "忽略字体(_F)"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "较大字体(_Z)"
+
+#~ msgid "Window Closing"
+#~ msgstr "窗口关闭"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "Esc 键关闭窗口(_E)"
+
+#~ msgid "Shortcuts"
+#~ msgstr "快捷键"
+
+#~ msgid "Logging in: %s"
+#~ msgstr "登入: %s"
+
+#~ msgid "Hide Operating System"
+#~ msgstr "隐藏操作系统"
+
+#~ msgid "Miscellaneous error"
+#~ msgstr "杂项错误"
+
+#~ msgid "Initiate Chat"
+#~ msgstr "进入聊天室"
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "显示对话关闭通知"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "显示超时通知"
+
+#~ msgid "Unable to connect to server"
+#~ msgstr "无法连接到服务器"
+
+#~ msgid "Unknown error when attempting to authorize with MSN login server."
+#~ msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
+
+#~ msgid "Requesting to send password"
+#~ msgstr "正在请求发送密码"
+
+#~ msgid "Unable to connect to %s server"
+#~ msgstr "无法连接到 %s 服务器"
+
+#~ msgid "Error writing to %s server"
+#~ msgstr "从 %s 服务器读取时出错"
+
+#~ msgid "Error reading from %s server"
+#~ msgstr "从 %s 服务器读取时出错"
+
+#~ msgid "Received HTTP error. Please report this."
+#~ msgstr "收到了 HTTP 错误。请进行报告。"
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "对话已停止并超时。"
+
+#~ msgid "Saved Statuses Error"
+#~ msgstr "已存状态错误"
+
 #~ msgid "Auto log in"
 #~ msgstr "自动登录"
 
@@ -10747,9 +11026,6 @@
 #~ "  -v, --version       显示当前版本并退出\n"
 #~ "  -h, --help          显示帮助并退出\n"
 
-#~ msgid "Interface Options"
-#~ msgstr "界面选项"
-
 #~ msgid "D_isplay remote nicknames if no alias is set"
 #~ msgstr "如果未设置别名则显示远程昵称(_I)"