changeset 9009:fe5d083f0172

[gaim-migrate @ 9785] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 22 May 2004 15:54:58 +0000
parents 6dc1f052edc0
children 54a0f8069f76
files po/zh_CN.po
diffstat 1 files changed, 1346 insertions(+), 1295 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Sat May 22 07:04:19 2004 +0000
+++ b/po/zh_CN.po	Sat May 22 15:54:58 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-06 10:09-0400\n"
-"PO-Revision-Date: 2004-05-07 04:05+0800\n"
+"POT-Creation-Date: 2004-05-22 00:01-0400\n"
+"PO-Revision-Date: 2004-05-22 14:49+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"
@@ -94,7 +94,7 @@
 ">offline."
 msgstr ""
 "分值最低的好友是联系人中有优先权的好友。\n"
-"使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为:在线->瞌睡->离开+瞌睡->离"
+"使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为: 在线->瞌睡->离开+瞌睡->离"
 "线。"
 
 #: plugins/contact_priority.c:142
@@ -158,13 +158,13 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1599 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1591 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2149
-#: src/protocols/novell/novell.c:2266 src/protocols/novell/novell.c:2318
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4827
-#: src/protocols/oscar/oscar.c:5810 src/protocols/oscar/oscar.c:6428
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2715
+#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2884
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5406
+#: src/protocols/oscar/oscar.c:6388 src/protocols/oscar/oscar.c:6587
 #: src/protocols/silc/buddy.c:1360 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -172,7 +172,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:4745 src/protocols/oscar/oscar.c:6436
+#: src/protocols/oscar/oscar.c:5324 src/protocols/oscar/oscar.c:6595
 msgid "Back"
 msgstr "回来"
 
@@ -188,7 +188,7 @@
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2571
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2542
 msgid "Preferences"
 msgstr "首选项"
 
@@ -337,7 +337,7 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"这个插件非常酷,它可以完成以下功能:\n"
+"这个插件非常酷,它可以完成以下功能:\n"
 "- 在您登入后告诉您谁写的这个程序\n"
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
@@ -389,7 +389,7 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "允许在对话窗口中支持鼠标手势。\n"
-"拖曳鼠标中键可执行特定操作:\n"
+"拖曳鼠标中键可执行特定操作:\n"
 "\n"
 "向下再向右可关闭对话。\n"
 "向上再向左可切换到上个对话。\n"
@@ -403,15 +403,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2957 src/gtkprefs.c:836 src/gtkprefs.c:971
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1632 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:3004 src/gtkprefs.c:864 src/gtkprefs.c:1010
+#: src/gtkprefs.c:1052 src/gtkprefs.c:1604 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1979
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1369 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1951
+#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1365 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -426,13 +426,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6699
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6860
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3978
-#: src/gtkblist.c:4306
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4029
+#: src/gtkblist.c:4358
 msgid "Group:"
 msgstr "组:"
 
@@ -469,7 +469,7 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3803
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3853
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "好友"
@@ -488,7 +488,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:380 plugins/idle.c:52 src/gtkconn.c:620
 msgid "Account"
 msgstr "账户"
 
@@ -534,7 +534,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -550,15 +550,15 @@
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -583,31 +583,27 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "瞌睡时间"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "设置"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "打瞌睡"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "分钟。"
-
-#: plugins/idle.c:96
+#: plugins/idle.c:56
+msgid "Minutes"
+msgstr "分钟"
+
+#: plugins/idle.c:63 plugins/idle.c:98
+msgid "I'dle Mak'er"
+msgstr "瞌睡虫"
+
+#: plugins/idle.c:64 plugins/idle.c:80
+msgid "Set Account Idle Time"
+msgstr "设定账户瞌睡时间"
+
+#: plugins/idle.c:67
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "瞌睡虫"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:68 src/dialogs.c:907
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: plugins/idle.c:100 plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
@@ -849,7 +845,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:505
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -857,7 +853,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:508 plugins/signals-test.c:510
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1010,11 +1006,11 @@
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -1045,6 +1041,10 @@
 msgid "Delay"
 msgstr "延迟"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "分钟。"
+
 #: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "应用(_A)"
@@ -1069,30 +1069,30 @@
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:840
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:858
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1103,19 +1103,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:425
+#: plugins/win32/transparency/win2ktrans.c:466
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:427
+#: plugins/win32/transparency/win2ktrans.c:468
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1124,7 +1124,7 @@
 msgstr ""
 "此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
 "\n"
-"* 注意:此插件需要 Win2000 或 WinXP。"
+"* 注意: 此插件需要 Win2000 或 WinXP。"
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
@@ -1140,8 +1140,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2998
-#: src/gtkprefs.c:2478
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3045
+#: src/gtkprefs.c:2449
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1160,8 +1160,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:880
-#: src/gtkprefs.c:2479 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:911
+#: src/gtkprefs.c:2450 src/protocols/msn/msn.c:1607
 msgid "Conversations"
 msgstr "对话"
 
@@ -1220,15 +1220,15 @@
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:119 src/about.c:120 src/about.c:121 src/about.c:122
 msgid "developer"
 msgstr "开发者"
 
-#: src/about.c:122
+#: src/about.c:123
 msgid "support"
 msgstr "支持"
 
-#: src/about.c:129
+#: src/about.c:130
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
@@ -1436,44 +1436,45 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1043
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:191
-#: src/protocols/msn/msn.c:202 src/protocols/msn/msn.c:213
-#: src/protocols/msn/msn.c:224 src/protocols/oscar/oscar.c:2759
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:6489
-#: src/protocols/oscar/oscar.c:6585 src/protocols/oscar/oscar.c:6634
-#: src/protocols/oscar/oscar.c:6716 src/protocols/silc/buddy.c:447
-#: src/protocols/silc/buddy.c:1087 src/protocols/silc/chat.c:657
-#: src/protocols/silc/ops.c:978 src/protocols/silc/ops.c:1389
+#: src/account.c:343 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
+#: src/dialogs.c:581 src/gtkblist.c:2391 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:191 src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:213 src/protocols/msn/msn.c:224
+#: src/protocols/oscar/oscar.c:3310 src/protocols/oscar/oscar.c:3391
+#: src/protocols/oscar/oscar.c:6648 src/protocols/oscar/oscar.c:6744
+#: src/protocols/oscar/oscar.c:6793 src/protocols/oscar/oscar.c:6877
+#: src/protocols/silc/buddy.c:447 src/protocols/silc/buddy.c:1087
+#: src/protocols/silc/chat.c:657 src/protocols/silc/ops.c:978
+#: src/protocols/silc/ops.c:1389 src/protocols/silc/silc.c:687
 #: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
 #: src/request.h:1242
 msgid "OK"
 msgstr "确定"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
-#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:853 src/dialogs.c:875
-#: src/dialogs.c:892 src/dialogs.c:911 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2364 src/gtkblist.c:4345
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575
-#: src/gtkprivacy.c:588 src/gtkprivacy.c:613 src/gtkprivacy.c:624
+#: src/dialogs.c:306 src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352
+#: src/dialogs.c:473 src/dialogs.c:529 src/dialogs.c:582 src/dialogs.c:929
+#: src/dialogs.c:946 src/dialogs.c:965 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2392 src/gtkblist.c:4397
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
 #: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
 #: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:6307 src/protocols/oscar/oscar.c:6490
-#: src/protocols/oscar/oscar.c:6586 src/protocols/oscar/oscar.c:6635
-#: src/protocols/oscar/oscar.c:6700 src/protocols/oscar/oscar.c:6717
+#: src/protocols/oscar/oscar.c:1360 src/protocols/oscar/oscar.c:3270
+#: src/protocols/oscar/oscar.c:3311 src/protocols/oscar/oscar.c:3347
+#: src/protocols/oscar/oscar.c:3392 src/protocols/oscar/oscar.c:6649
+#: src/protocols/oscar/oscar.c:6745 src/protocols/oscar/oscar.c:6794
+#: src/protocols/oscar/oscar.c:6861 src/protocols/oscar/oscar.c:6878
 #: src/protocols/silc/buddy.c:448 src/protocols/silc/buddy.c:992
 #: src/protocols/silc/buddy.c:1088 src/protocols/silc/chat.c:658
-#: src/protocols/silc/ops.c:1390 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/ops.c:1390 src/protocols/silc/silc.c:688
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2513 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
@@ -1482,8 +1483,8 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:381 src/dialogs.c:841 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:513
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
@@ -1505,7 +1506,7 @@
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3438
+#: src/away.c:333 src/gtkconv.c:1160 src/gtkconv.c:3337 src/gtkconv.c:3436
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "删除"
@@ -1518,7 +1519,7 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:590 src/gtkprefs.c:2481
+#: src/blist.c:590 src/gtkprefs.c:2452
 msgid "Chats"
 msgstr "聊天"
 
@@ -1538,23 +1539,23 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:693
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2161
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2727
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2235
+#: src/blist.c:2236
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "分析您的好友列表时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
 
-#: src/blist.c:2238
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1584,67 +1585,71 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1966
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1969
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2061
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2184
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2466 src/gtkprefs.c:1371
+#: src/conversation.c:2489 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2468
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:154
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "按对话计数"
+
+#: src/dialogs.c:155
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:174
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1656,47 +1661,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:183
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:190
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:301
+#: src/dialogs.c:302
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:304 src/dialogs.c:305
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:314
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:316 src/dialogs.c:317
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:326
 #, 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/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:329 src/dialogs.c:330
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1705,103 +1710,116 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:454 src/dialogs.c:510 src/dialogs.c:562
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:460 src/dialogs.c:516 src/dialogs.c:568
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:467
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:469
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:523
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:524
+#: src/dialogs.c:525
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
+#: src/dialogs.c:576
+msgid "Get User Log"
+msgstr "获取用户日志"
+
+#: src/dialogs.c:578
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "您想要查看谁的日志?请输入他/她的用户名。"
+
+#: src/dialogs.c:606 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
+#: src/dialogs.c:634 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
+#: src/dialogs.c:673 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:692
+#: src/dialogs.c:746
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:748
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:758
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:820
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:841
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:845
-msgid "Save & Use"
-msgstr "保存并使用"
-
-#: src/dialogs.c:849
-msgid "Use"
-msgstr "使用"
-
-#: src/dialogs.c:871
+#: src/dialogs.c:895
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/dialogs.c:899
+msgid "Sa_ve & Use"
+msgstr "保存并使用(_V)"
+
+#: src/dialogs.c:903
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: src/dialogs.c:925
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:872
+#: src/dialogs.c:926
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:874 src/dialogs.c:891 src/dialogs.c:910 src/gtkrequest.c:243
+#: src/dialogs.c:928 src/dialogs.c:945 src/dialogs.c:964 src/gtkrequest.c:243
 #: src/protocols/silc/chat.c:545
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:888
+#: src/dialogs.c:942
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:943
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:906
+#: src/dialogs.c:960
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:908
+#: src/dialogs.c:962
 msgid "Alias Buddy"
 msgstr "好友别名"
 
@@ -1882,19 +1900,19 @@
 msgstr ""
 "\n"
 "使用 AIM: URIs:\n"
-"给用户名发送即时消息:\n"
+"给用户名发送即时消息:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
 "在这种情况下,“Penguin”就是想要开聊的用户名,而“hello world”是\n"
 "想要发送的消息。“+”用来替代空格。请注意上面使用的内容 - 如果您想\n"
 "要从 shell 运行此命令,“&”就必须转码,否则命令将会在该处停止。\n"
-"同时,下列命令将打开和用户名开聊的对话窗口,而不发送消息:\n"
+"同时,下列命令将打开和用户名开聊的对话窗口,而不发送消息:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
-"加入聊天:\n"
+"加入聊天:\n"
 "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...加入“PenguinLounge”聊天室。\n"
 "\n"
-"添加好友:\n"
+"添加好友:\n"
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
@@ -1909,21 +1927,21 @@
 #. for people like myself, who are too lazy to add an away msg :)
 #: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
-msgstr "烦着呢,别理我"
-
-#: src/gaimrc.c:375 src/gaimrc.c:1439
+msgstr "对不起,我临时有事离开一会儿。麻烦您稍后再联络我。"
+
+#: src/gaimrc.c:374 src/gaimrc.c:1401
 msgid "boring default"
-msgstr "烦死我了"
-
-#: src/gaimrc.c:1248 src/gtkblist.c:2959
+msgstr "临时有事"
+
+#: src/gaimrc.c:1211 src/gtkblist.c:3006
 msgid "Alphabetical"
-msgstr "字母序"
-
-#: src/gaimrc.c:1250 src/gtkblist.c:2960
+msgstr "按字母序"
+
+#: src/gaimrc.c:1213 src/gtkblist.c:3007
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1252 src/gtkblist.c:2961
+#: src/gaimrc.c:1215 src/gtkblist.c:3008
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1947,7 +1965,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3950
+#: src/gtkaccount.c:406 src/gtkblist.c:4001
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1955,7 +1973,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3964 src/gtkblist.c:4292
+#: src/gtkaccount.c:484 src/gtkblist.c:4015 src/gtkblist.c:4344
 msgid "Alias:"
 msgstr "别名:"
 
@@ -2016,7 +2034,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1172
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1185
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -2032,15 +2050,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1166
+#: src/gtkaccount.c:937 src/gtkprefs.c:1179
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1196
+#: src/gtkaccount.c:946 src/gtkprefs.c:1209
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1214
+#: src/gtkaccount.c:950 src/gtkprefs.c:1227
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -2048,7 +2066,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1251
+#: src/gtkaccount.c:963 src/gtkprefs.c:1264
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -2083,15 +2101,15 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3364
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3922
 msgid "Screen Name"
 msgstr "用户名"
 
 #: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:6427 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1182
-#: src/protocols/zephyr/zephyr.c:1192
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6586 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1183
+#: src/protocols/zephyr/zephyr.c:1193
 msgid "Online"
 msgstr "在线"
 
@@ -2123,212 +2141,214 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4344 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3431 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3003
+#: src/gtkaccount.c:2234 src/gtkblist.c:4396 src/gtkconv.c:1162
+#: src/gtkconv.c:3330 src/gtkconv.c:3429 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3554
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4232
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "您目前登入的协议中没有一个可以聊天的。"
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:811
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:832
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:431 src/gtkroomlist.c:365
+#: src/gtkblist.c:843 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3148
+#: src/gtkblist.c:1082 src/gtkblist.c:3198
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3139
+#: src/gtkblist.c:1085 src/gtkblist.c:3189
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1087
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1089
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1153 src/gtkblist.c:1282 src/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1155 src/gtkblist.c:1284 src/gtkblist.c:1301
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1260 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1262
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1298 src/gtkblist.c:1324
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1329
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3943 src/gtkpounce.c:333
+#: src/gtkblist.c:1987 src/gtkconv.c:3950 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2338
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2339
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2340
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2341
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2342
+msgid "/Buddies/View User _Log..."
+msgstr "/好友(B)/查看用户日志(_L)..."
+
+#: src/gtkblist.c:2344
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2345
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2346
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2347
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2348
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2350
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2351
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2354
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2355
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2356
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2357
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2358
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具(T)/插件操作(_U)"
+
+#: src/gtkblist.c:2360
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2361
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2362
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2363
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2364
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2366
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2369
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2370
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2371
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2372
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2337,18 +2357,20 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2453
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
-msgstr "\n<b>状态:</b> 离线"
-
-#: src/gtkblist.c:2468
+msgstr ""
+"\n"
+"<b>状态:</b> 离线"
+
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2356,7 +2378,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2364,7 +2386,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2372,7 +2394,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2380,7 +2402,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2388,7 +2410,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2396,7 +2418,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2404,7 +2426,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2412,95 +2434,112 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>状态</b>:可怕"
-
-#: src/gtkblist.c:2494
+"<b>状态</b>: 可怕"
+
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
-"<b>状态</b>:混乱"
-
-#: src/gtkblist.c:2765
+"<b>状态</b>: 混乱"
+
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2767
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2772
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3025
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2921
+msgid "/Buddies/Join a Chat..."
+msgstr "/好友(B)/加入聊天(C)..."
+
+#: src/gtkblist.c:2924
+msgid "/Tools/Room List"
+msgstr "/工具(T)/房间列表(O)"
+
+#: src/gtkblist.c:2927
+msgid "/Tools/Privacy"
+msgstr "/工具(T)/隐私(I)"
+
+#: src/gtkblist.c:3072
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3028
+#: src/gtkblist.c:3075
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3031
+#: src/gtkblist.c:3078
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
+#: src/gtkblist.c:3081
+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:3119
+#: src/gtkblist.c:3169
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3121
+#: src/gtkblist.c:3171
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3145
+#: src/gtkblist.c:3195
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3154
+#: src/gtkblist.c:3204
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3157
+#: src/gtkblist.c:3207
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3162
+#: src/gtkblist.c:3212
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3165
+#: src/gtkblist.c:3215
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3170
+#: src/gtkblist.c:3220
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3905 src/protocols/silc/buddy.c:686
+#: src/gtkblist.c:3955 src/protocols/silc/buddy.c:686
 #: src/protocols/silc/buddy.c:944 src/protocols/silc/buddy.c:989
 #: src/protocols/silc/buddy.c:1079 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3928
+#: src/gtkblist.c:3979
 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. "
@@ -2510,29 +2549,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3988 src/gtkblist.c:4272
+#: src/gtkblist.c:4039 src/gtkblist.c:4324
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4239
+#: src/gtkblist.c:4283
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您目前登入的协议中没有一个可以聊天的。"
+
+#: src/gtkblist.c:4290
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4262
+#: src/gtkblist.c:4314
 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:4341
+#: src/gtkblist.c:4393
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4342
+#: src/gtkblist.c:4394
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4887
+#: src/gtkblist.c:4947 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2586,323 +2631,331 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:191 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:539
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:567
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:588
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:608
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:716 src/gtkdebug.c:127
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:742 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1120
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1128
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:767
+#: src/gtkconv.c:1130
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1139 src/gtkconv.c:3344
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1148
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2200
+#: src/gtkconv.c:2240
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2205
+#: src/gtkconv.c:2245
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2211
+#: src/gtkconv.c:2251
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2578
+#: src/gtkconv.c:2618
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2586
+#: src/gtkconv.c:2626
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2689
+#: src/gtkconv.c:2729
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3106
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3123
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3125
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3130
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3132
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3133
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3135
+msgid "/Conversation/Clear"
+msgstr "/对话(C)/清除"
+
+#: src/gtkconv.c:3139
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3143
+#: src/gtkconv.c:3141
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3143
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3145
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3150
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3154
+#: src/gtkconv.c:3152
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3154
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3158
+#: src/gtkconv.c:3156
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3161
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3163
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3170
+#: src/gtkconv.c:3168
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3174
+#: src/gtkconv.c:3172
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3173
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3174
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3175
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3219
+#: src/gtkconv.c:3217
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3222
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3228
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3232
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3238
+#: src/gtkconv.c:3236
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3242
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3248
+#: src/gtkconv.c:3246
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3252
+#: src/gtkconv.c:3250
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3256
+#: src/gtkconv.c:3254
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3262
+#: src/gtkconv.c:3260
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3264
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3272
+#: src/gtkconv.c:3270
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3273
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3276
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3410 src/gtkconv.c:3412
+#: src/gtkconv.c:3300 src/gtkconv.c:3302 src/gtkconv.c:3408 src/gtkconv.c:3410
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3316
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3319
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3323 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3326
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3333
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3340
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3690
+#: src/gtkconv.c:3347 src/gtkconv.c:3691
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3424
+#: src/gtkconv.c:3422
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3427
+#: src/gtkconv.c:3425
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3434
+#: src/gtkconv.c:3432
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3441
+#: src/gtkconv.c:3439
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3549
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3613
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3668
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3680
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4234
+#: src/gtkconv.c:4241
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4779 src/gtkconv.c:4811 src/gtkconv.c:4932 src/gtkconv.c:4999
+#: src/gtkconv.c:4764 src/gtkconv.c:4796 src/gtkconv.c:4917 src/gtkconv.c:4984
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5532 src/gtkconv.c:5535
+#: src/gtkconv.c:5515 src/gtkconv.c:5518
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "保存调试日志"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "时间戳"
 
@@ -3044,34 +3097,38 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "粘贴为文本(_S)"
+
+#: src/gtkimhtml.c:1200
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1212
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1222
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2642
+#: src/gtkimhtml.c:2651
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2650
+#: src/gtkimhtml.c:2659
 #, c-format
 msgid "Error saving image: %s"
-msgstr "保存图像出错:%s"
-
-#: src/gtkimhtml.c:2659
+msgstr "保存图像出错: %s"
+
+#: src/gtkimhtml.c:2668
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2682
+#: src/gtkimhtml.c:2691
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3097,65 +3154,65 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:457
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:483
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:616
+#: src/gtkimhtmltoolbar.c:618
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:631
+#: src/gtkimhtmltoolbar.c:633
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:849
+#: src/gtkimhtmltoolbar.c:851
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:860
+#: src/gtkimhtmltoolbar.c:862
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:871
+#: src/gtkimhtmltoolbar.c:873
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:887
+#: src/gtkimhtmltoolbar.c:889
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:901
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:918
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:928
+#: src/gtkimhtmltoolbar.c:930
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:940
+#: src/gtkimhtmltoolbar.c:942
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:957
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:965
+#: src/gtkimhtmltoolbar.c:967
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:978
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3164,7 +3221,7 @@
 msgstr "交谈对象"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:369 src/gtklog.c:385
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3175,17 +3232,17 @@
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3196,7 +3253,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3207,22 +3264,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:434
+#: src/gtknotify.c:420
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: src/gtknotify.c:437 src/gtknotify.c:451 src/gtknotify.c:466
-#: src/gtknotify.c:574
+#: src/gtknotify.c:423 src/gtknotify.c:437 src/gtknotify.c:452
+#: src/gtknotify.c:560
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:448 src/gtknotify.c:463
+#: src/gtknotify.c:434 src/gtknotify.c:449
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "调用“%s”出错:%s"
-
-#: src/gtknotify.c:575
+msgstr "调用“%s”出错: %s"
+
+#: src/gtknotify.c:561
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
@@ -3258,7 +3315,7 @@
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:483 src/main.c:298
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
@@ -3375,371 +3432,315 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:407
+#: src/gtkprefs.c:409
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:409
+#: src/gtkprefs.c:411
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:603
+#: src/gtkprefs.c:635
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/gtkprefs.c:638
+#: src/gtkprefs.c:675
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:645 src/gtkprefs.c:2016 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:682 src/gtkprefs.c:1988 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:759 src/gtkprefs.c:1041
+#: src/gtkprefs.c:750 src/gtkprefs.c:1060
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:751
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:754
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:768
-msgid "Ignore c_olors"
-msgstr "忽略颜色(_O)"
-
-#: src/gtkprefs.c:770
-msgid "Ignore font _faces"
-msgstr "忽略字体(_F)"
-
-#: src/gtkprefs.c:772
-msgid "Ignore font si_zes"
-msgstr "忽略字体大小(_Z)"
-
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:757
 msgid "Ignore formatting on incoming messages"
 msgstr "忽略收到信息的格式"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:760
+msgid "Default Formatting"
+msgstr "默认格式"
+
+#: src/gtkprefs.c:815
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:816
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:818
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:821
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:822
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:825
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:797
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
-
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:826
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Ctrl+{B/I/U} 更改格式(_F)"
+
+#: src/gtkprefs.c:828
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:844
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:853
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:830
-msgid "Buddy List Toolbar"
-msgstr "好友列表工具栏"
-
-#: src/gtkprefs.c:831 src/gtkprefs.c:966 src/gtkprefs.c:1016
+#: src/gtkprefs.c:859 src/gtkprefs.c:1005 src/gtkprefs.c:1047
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:968 src/gtkprefs.c:1018
+#: src/gtkprefs.c:861 src/gtkprefs.c:1007 src/gtkprefs.c:1049
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:834 src/gtkprefs.c:969 src/gtkprefs.c:1019
+#: src/gtkprefs.c:862 src/gtkprefs.c:1008 src/gtkprefs.c:1050
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:835 src/gtkprefs.c:970 src/gtkprefs.c:1020
+#: src/gtkprefs.c:863 src/gtkprefs.c:1009 src/gtkprefs.c:1051
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:841 src/gtkprefs.c:982 src/gtkprefs.c:1032
+#: src/gtkprefs.c:866 src/gtkprefs.c:1016 src/gtkprefs.c:1058
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:845
-msgid "Group Display"
-msgstr "组显示"
-
-#: src/gtkprefs.c:846
-msgid "Show _numbers in groups"
-msgstr "在组中显示数字(_N)"
-
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:869
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:851 src/gtkprefs.c:989
+#: src/gtkprefs.c:870 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:872
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:855
+#: src/gtkprefs.c:874
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:876
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:878
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:915
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:922
+msgid "Number of conversations per window"
+msgstr "每个窗口的对话数"
+
+#: src/gtkprefs.c:931
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:934
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:937
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:899
-msgid "_Tab Placement:"
-msgstr "标签位置(_T):"
-
-#: src/gtkprefs.c:901
-msgid "Top"
-msgstr "上"
-
-#: src/gtkprefs.c:902
-msgid "Bottom"
-msgstr "下"
-
-#: src/gtkprefs.c:903
-msgid "Left"
-msgstr "左"
-
-#: src/gtkprefs.c:904
-msgid "Right"
-msgstr "右"
-
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:939
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:942
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:952
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:934
-msgid "Show status _icons on tabs"
-msgstr "在标签上显示状态图标(_I)"
-
-#: src/gtkprefs.c:965 src/gtkprefs.c:1015
+#: src/gtkprefs.c:965
+msgid "_Tab Placement:"
+msgstr "标签位置(_T):"
+
+#: src/gtkprefs.c:967
+msgid "Top"
+msgstr "上"
+
+#: src/gtkprefs.c:968
+msgid "Bottom"
+msgstr "下"
+
+#: src/gtkprefs.c:969
+msgid "Left"
+msgstr "左"
+
+#: src/gtkprefs.c:970
+msgid "Right"
+msgstr "右"
+
+#: src/gtkprefs.c:1003 src/gtkprefs.c:1045
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1026
-msgid "New window _width:"
-msgstr "新窗口宽度(_W):"
-
-#: src/gtkprefs.c:978 src/gtkprefs.c:1028
-msgid "New window _height:"
-msgstr "新窗口高度(_H):"
-
-#: src/gtkprefs.c:980 src/gtkprefs.c:1030
-msgid "_Entry field height:"
-msgstr "输入框高度(_E):"
-
-#: src/gtkprefs.c:984
-msgid "Hide window on _send"
-msgstr "发送后隐藏窗口(_S)"
-
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1019
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1022
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1025
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1026
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1035
-msgid "Tab Completion"
-msgstr "Tab 补全"
-
-#: src/gtkprefs.c:1036
-msgid "_Tab-complete nicks"
-msgstr "按 Tab 补全昵称(_T)"
-
-#: src/gtkprefs.c:1038
-msgid "_Old-style tab completion"
-msgstr "旧风格的 Tab 补全"
-
-#: src/gtkprefs.c:1043
-msgid "_Show people joining in window"
-msgstr "在窗口中显示加入的人(_S)"
-
-#: src/gtkprefs.c:1045
-msgid "_Show people leaving in window"
-msgstr "在窗口中显示离开的人(_S)"
-
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1061
 msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1069 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4219
+#: src/gtkprefs.c:1082 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4777
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1071
+#: src/gtkprefs.c:1084
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1080
+#: src/gtkprefs.c:1093
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1117
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1107
+#: src/gtkprefs.c:1120
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1123
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1130
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1178
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1168
+#: src/gtkprefs.c:1181
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1175
+#: src/gtkprefs.c:1188
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1246
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1289
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1290
+#: src/gtkprefs.c:1303
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1291
+#: src/gtkprefs.c:1304
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1292
+#: src/gtkprefs.c:1305
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1306
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1307
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1295
+#: src/gtkprefs.c:1308
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1296
+#: src/gtkprefs.c:1309
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1356
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1367
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1370
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3748,87 +3749,79 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1426
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1445
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1451
-msgid "Log when buddies go away/come _back"
-msgstr "记录好友的离开/回来(_B)"
-
-#: src/gtkprefs.c:1457
-msgid "Log your _own signons/idleness/awayness"
-msgstr "记录您自己的登入/瞌睡/离开(_O)"
-
 #: src/gtkprefs.c:1464
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "为每个好友的登入创建独立的日志文件(_N)"
-
-#: src/gtkprefs.c:1508
+msgid "Log when buddies go away/come _back"
+msgstr "记录好友的离开/回来(_B)"
+
+#: src/gtkprefs.c:1470
+msgid "Log your _own signons/idleness/awayness"
+msgstr "记录您自己的登入/瞌睡/离开(_O)"
+
+#: src/gtkprefs.c:1516
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1510
-msgid "Sounds when you _log in"
-msgstr "您登录时发声(_L)"
-
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1517
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1515
-msgid "_Sounds while away"
-msgstr "离开时发声(_S)"
-
 #: src/gtkprefs.c:1519
+msgid "_Sounds while away"
+msgstr "离开时发声(_S)"
+
+#: src/gtkprefs.c:1523
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1524
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1526
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1528
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1531
+#: src/gtkprefs.c:1535
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1541
+#: src/gtkprefs.c:1545
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3837,73 +3830,61 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1601
-msgid "_Sending messages removes away status"
-msgstr "发送消息的同时清除离开状态(_S)"
-
-#: src/gtkprefs.c:1604
+#: src/gtkprefs.c:1592
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1607
+#: src/gtkprefs.c:1595
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1611
-msgid "Seconds before _resending:"
-msgstr "重发前等待的秒数(_R):"
-
-#: src/gtkprefs.c:1615
+#: src/gtkprefs.c:1596
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1617
+#: src/gtkprefs.c:1598
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1620
-msgid "Send auto-response in _active conversations"
-msgstr "在激活的对话中发送自动回复(_A)"
-
-#: src/gtkprefs.c:1629 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2155 src/protocols/oscar/oscar.c:3377
+#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2721 src/protocols/oscar/oscar.c:3935
 #: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1630
+#: src/gtkprefs.c:1602
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1605
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1636
+#: src/gtkprefs.c:1608
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1610
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1618
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1619
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1623
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1631
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1734
+#: src/gtkprefs.c:1706
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3918,7 +3899,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1711
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3933,108 +3914,104 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1972
+#: src/gtkprefs.c:1944
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1986
+#: src/gtkprefs.c:1958
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2034
+#: src/gtkprefs.c:2006
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2161
+#: src/gtkprefs.c:2133
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2240
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2247
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2294
+#: src/gtkprefs.c:2266
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:2298
+#: src/gtkprefs.c:2270
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2274
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2437
+#: src/gtkprefs.c:2409
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2473
+#: src/gtkprefs.c:2445
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2474
+#: src/gtkprefs.c:2446
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2475
-msgid "Fonts"
-msgstr "字体"
-
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2447
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2448
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2480
+#: src/gtkprefs.c:2451
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2453
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2483
+#: src/gtkprefs.c:2454
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2486
+#: src/gtkprefs.c:2457
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2459
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2489
+#: src/gtkprefs.c:2460
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2461
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2462
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2463
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2495
+#: src/gtkprefs.c:2466
 msgid "Protocols"
 msgstr "协议"
 
-#: src/gtkprefs.c:2496
+#: src/gtkprefs.c:2467
 msgid "Plugins"
 msgstr "插件"
 
@@ -4058,63 +4035,63 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1277
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1277
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4123,13 +4100,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1318 src/protocols/silc/buddy.c:303
+#: src/protocols/novell/novell.c:1837 src/protocols/silc/buddy.c:303
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
 #: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1319 src/protocols/silc/buddy.c:304
+#: src/protocols/novell/novell.c:1838 src/protocols/silc/buddy.c:304
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
@@ -4139,22 +4116,16 @@
 msgstr "应用"
 
 #: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
-#: src/protocols/silc/util.c:298
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr "您目前登入的协议中没有一个可以列出聊天室的。"
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
@@ -4198,29 +4169,29 @@
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
-msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
-
-#: src/gtkutils.c:130
+msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
+
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:165
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "保存图标"
 
@@ -4228,11 +4199,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4241,7 +4212,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4250,55 +4221,55 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, 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:661
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "请创建一个账户。"
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:255
+#: src/main.c:253
 msgid "<b>_Account:</b>"
 msgstr "<b>账户(_A):</b>"
 
-#: src/main.c:269
+#: src/main.c:267
 msgid "<b>_Password:</b>"
 msgstr "<b>密码(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:286
+#: src/main.c:284
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: src/main.c:292
+#: src/main.c:290
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4317,7 +4288,7 @@
 "  -h, --help          display this help and exit\n"
 msgstr ""
 "Gaim %s\n"
-"用法:%s [选项]...\n"
+"用法: %s [选项]...\n"
 "\n"
 "  -a, --acct          显示账户编辑窗口\n"
 "  -w, --away[=消息]   登入后设为离开(可选“消息”指定要使用的离开消息名称)\n"
@@ -4331,23 +4302,23 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4359,9 +4330,9 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2146
-#: src/protocols/novell/novell.c:2265 src/protocols/novell/novell.c:2316
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2712
+#: src/protocols/novell/novell.c:2831 src/protocols/novell/novell.c:2882
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2599
 #: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "可用"
@@ -4375,10 +4346,10 @@
 msgstr "只对好友离开"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4740 src/protocols/oscar/oscar.c:4818
-#: src/protocols/oscar/oscar.c:4842 src/protocols/oscar/oscar.c:6433
-#: src/protocols/oscar/oscar.c:6438 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5319 src/protocols/oscar/oscar.c:5397
+#: src/protocols/oscar/oscar.c:5421 src/protocols/oscar/oscar.c:6592
+#: src/protocols/oscar/oscar.c:6597 src/protocols/yahoo/yahoo.c:2293
 #: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隐身"
@@ -4395,7 +4366,7 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1160
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1659
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
@@ -4425,7 +4396,7 @@
 #: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
-msgstr "状态:%s"
+msgstr "状态: %s"
 
 #: src/protocols/gg/gg.c:399
 msgid "Could not connect"
@@ -4504,24 +4475,24 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4211
+#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4769
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4222 src/protocols/trepia/trepia.c:267
+#: src/protocols/oscar/oscar.c:4780 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4781 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1627
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1628
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4770
 msgid "Nick"
 msgstr "昵称"
 
@@ -4536,19 +4507,19 @@
 
 #. City
 #: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/oscar/oscar.c:4824 src/protocols/oscar/oscar.c:4832
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1305
-#: src/protocols/msn/msn.c:1549 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:3405
+#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1301
+#: src/protocols/msn/msn.c:1545 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3747 src/protocols/oscar/oscar.c:3963
 #: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
 #: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4619,53 +4590,53 @@
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1347
+#: src/protocols/gg/gg.c:1348
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1348
+#: src/protocols/gg/gg.c:1349
 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:1381
+#: src/protocols/gg/gg.c:1383
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1382
+#: src/protocols/gg/gg.c:1384
 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:1399
+#: src/protocols/gg/gg.c:1401
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1408 src/protocols/jabber/jabber.c:1060
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1410 src/protocols/jabber/jabber.c:1060
+#: src/protocols/toc/toc.c:1553
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1418
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1422
+#: src/protocols/gg/gg.c:1424
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1428
+#: src/protocols/gg/gg.c:1430
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1462
+#: src/protocols/gg/gg.c:1464
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1463
+#: src/protocols/gg/gg.c:1465
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4683,7 +4654,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1608 src/protocols/gg/gg.c:1610
+#: src/protocols/gg/gg.c:1607 src/protocols/gg/gg.c:1609
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4698,15 +4669,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
 #: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:2931
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3482
+#: src/protocols/oscar/oscar.c:6025
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
 #: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:2933
-#: src/protocols/oscar/oscar.c:5454
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3484
+#: src/protocols/oscar/oscar.c:6026
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4729,7 +4700,7 @@
 #: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
-msgstr "未知的错误代码:%s"
+msgstr "未知的错误代码: %s"
 
 #: src/protocols/irc/cmds.c:137
 msgid ""
@@ -4752,7 +4723,7 @@
 #: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
-msgstr "目前的话题为:%s"
+msgstr "目前的话题为: %s"
 
 #: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
@@ -4790,7 +4761,7 @@
 msgstr "查看 MOTD"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6534
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6693
 #: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "发送文件"
@@ -4810,14 +4781,14 @@
 #: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
-msgstr "登录名:%s"
+msgstr "登录名: %s"
 
 #: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
 #: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
+#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:1576
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
@@ -4844,31 +4815,31 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:615
+#: src/protocols/irc/irc.c:612
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:616
+#: src/protocols/irc/irc.c:613
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:633 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1388 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:632 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1386 src/protocols/napster/napster.c:657
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:636 src/protocols/jabber/jabber.c:1409
-#: src/protocols/msn/msn.c:1732 src/protocols/napster/napster.c:663
-#: src/protocols/silc/silc.c:1047 src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:635 src/protocols/jabber/jabber.c:1407
+#: src/protocols/msn/msn.c:1726 src/protocols/napster/napster.c:662
+#: src/protocols/silc/silc.c:1045 src/protocols/trepia/trepia.c:1306
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:639 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:638 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:642 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:641 src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:586
 msgid "Username"
 msgstr "用户名"
@@ -4923,12 +4894,12 @@
 #: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s 将话题改为:%s"
+msgstr "%s 将话题改为: %s"
 
 #: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s 的话题为:%s"
+msgstr "%s 的话题为: %s"
 
 #: src/protocols/irc/msgs.c:299
 #, c-format
@@ -4976,7 +4947,7 @@
 #: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "您被 %s:%s 踢出了"
+msgstr "您被 %s: %s 踢出了"
 
 #: src/protocols/irc/msgs.c:601
 #, c-format
@@ -5003,12 +4974,12 @@
 
 #: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
-msgstr "错误:服务器的 PONG 无效"
+msgstr "错误: 服务器的 PONG 无效"
 
 #: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING 响应 -- 延后:%lu 秒"
+msgstr "PING 响应 -- 延后: %lu 秒"
 
 #: src/protocols/irc/msgs.c:840
 #, c-format
@@ -5024,26 +4995,26 @@
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此信息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%s 的回复时间:%lu 秒"
-
-#: src/protocols/irc/parse.c:319
+msgstr "%s 的回复时间: %lu 秒"
+
+#: src/protocols/irc/parse.c:321
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1413
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
@@ -5152,7 +5123,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4246
+#: src/protocols/oscar/oscar.c:4805
 msgid "Birthday"
 msgstr "生日"
 
@@ -5172,14 +5143,14 @@
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
 #: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2168
-#: src/protocols/novell/novell.c:2172 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2734
+#: src/protocols/novell/novell.c:2738 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
 #: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1389
 msgid "Resource"
 msgstr "资源"
 
@@ -5188,7 +5159,7 @@
 msgstr "中名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4264 src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4823 src/protocols/oscar/oscar.c:4831
 msgid "Address"
 msgstr "地址"
 
@@ -5381,8 +5352,8 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4266
-#: src/protocols/oscar/oscar.c:4274 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:4833 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
@@ -5406,9 +5377,9 @@
 #. connect to the server
 #: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
 #: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1576 src/protocols/oscar/oscar.c:944
+#: src/protocols/novell/novell.c:2097 src/protocols/oscar/oscar.c:1580
 #: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5426,7 +5397,7 @@
 
 #: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
 #: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5818
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6396
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -5470,8 +5441,8 @@
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4830
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:6588
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -5499,7 +5470,7 @@
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1539
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -5714,24 +5685,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1367 src/protocols/jabber/jabber.c:1369
+#: src/protocols/jabber/jabber.c:1364 src/protocols/jabber/jabber.c:1366
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1392
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1397
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1402
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1413 src/protocols/silc/silc.c:1043
+#: src/protocols/jabber/jabber.c:1411 src/protocols/silc/silc.c:1041
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -5743,17 +5714,17 @@
 #: src/protocols/jabber/message.c:173
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s 将话题改为:%s"
+msgstr "%s 将话题改为: %s"
 
 #: src/protocols/jabber/message.c:175
 #, c-format
 msgid "The topic is: %s"
-msgstr "话题为:%s"
+msgstr "话题为: %s"
 
 #: src/protocols/jabber/message.c:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "投递到 %s 的消息失败:%s"
+msgstr "投递到 %s 的消息失败: %s"
 
 #: src/protocols/jabber/message.c:228
 msgid "Jabber Message Error"
@@ -5910,7 +5881,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -5962,7 +5933,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6055,7 +6026,7 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1356
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1989
 #: src/protocols/silc/ops.c:1198 src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
@@ -6088,7 +6059,7 @@
 #: src/protocols/msn/error.c:234
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN 错误:%s\n"
+msgstr "MSN 错误: %s\n"
 
 #: src/protocols/msn/msn.c:79
 msgid "Your new MSN friendly name is too long."
@@ -6142,40 +6113,40 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:675
+#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:672
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:677
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:674
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
 #: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:679
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2152
-#: src/protocols/novell/novell.c:2267 src/protocols/novell/novell.c:2321
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:676
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2718
+#: src/protocols/novell/novell.c:2833 src/protocols/novell/novell.c:2887
 #: src/protocols/silc/buddy.c:1364 src/protocols/silc/silc.c:47
 #: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2277
 #: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:681
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
 #: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:683
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:680
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
 #: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:685
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:682
+#: src/protocols/zephyr/zephyr.c:1180 src/protocols/zephyr/zephyr.c:1195
 msgid "Hidden"
 msgstr "隐身"
 
@@ -6219,7 +6190,7 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:802
+#: src/protocols/msn/msn.c:799
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6228,11 +6199,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:806 src/protocols/msn/msn.c:843
+#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:840
 msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:839
+#: src/protocols/msn/msn.c:836
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6241,81 +6212,81 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1306 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1376 src/protocols/oscar/oscar.c:4251
+#: src/protocols/msn/msn.c:1372 src/protocols/oscar/oscar.c:4810
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1383 src/protocols/oscar/oscar.c:4238
+#: src/protocols/msn/msn.c:1379 src/protocols/oscar/oscar.c:4796
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1391 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1394 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1406 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1402 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1423 src/protocols/msn/msn.c:1429
-#: src/protocols/msn/msn.c:1436 src/protocols/msn/msn.c:1443
-#: src/protocols/msn/msn.c:1450
+#: src/protocols/msn/msn.c:1419 src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1439
+#: src/protocols/msn/msn.c:1446
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1459 src/protocols/msn/msn.c:1472
-#: src/protocols/msn/msn.c:1479
+#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1468
+#: src/protocols/msn/msn.c:1475
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1488 src/protocols/msn/msn.c:1494
-#: src/protocols/msn/msn.c:1501
+#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1490
+#: src/protocols/msn/msn.c:1497
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
+#: src/protocols/msn/msn.c:1506 src/protocols/msn/msn.c:1512
 #: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1520 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1535 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1531 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1553 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1612
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1617
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6330,15 +6301,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1707 src/protocols/msn/msn.c:1709
+#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1727 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1721 src/protocols/trepia/trepia.c:1301
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1736
+#: src/protocols/msn/msn.c:1730
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6363,7 +6334,7 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:2278
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6438,7 +6409,7 @@
 "Error reading from %s server. Lastcommand was:\n"
 " %s"
 msgstr ""
-"从 %s 服务器读取时出错。上个命令是:\n"
+"从 %s 服务器读取时出错。上个命令是:\n"
 " %s"
 
 #: src/protocols/msn/servconn.c:222
@@ -6475,7 +6446,7 @@
 #: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
-msgstr "用户数:%s,文件数:%s,大小:%sGB"
+msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
 #: src/protocols/napster/napster.c:318
@@ -6509,8 +6480,8 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5524
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:6096
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6525,70 +6496,100 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:637 src/protocols/napster/napster.c:639
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr "登录失败(0x%X)。"
-
-#: src/protocols/novell/novell.c:225
-#, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "无法发送消息。无法获得用户的详细信息(0x%X)。"
-
-#: src/protocols/novell/novell.c:371
-#, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "无法将“%s”添加到您的好友列表中(0x%X)。"
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "登录失败(%s)。"
+
+#: src/protocols/novell/novell.c:232
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
+
+#: src/protocols/novell/novell.c:378
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "无法发送消息(0x%X)。"
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr "无法给 %s 发送消息。无法创建会议(0x%X)。"
-
-#: src/protocols/novell/novell.c:489
-#, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "无法发送消息。无法创建会议(0x%X)。"
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "无法发送消息(%s)。"
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "无法邀请用户(%s)。"
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "无法发送消息。无法创建会议(%s)。"
+
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(0x%X)。"
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
+
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(0x%X)。"
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1345
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "GroupWise 会议 %d"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr "无法获得用户 %s 的详细信息(0x%X)。"
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1108
+"list (%s)."
+msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "无法获得用户 %s 的详细信息(%s)。"
+
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "无法将“%s”添加到您的好友列表中(%s)。"
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "无法将“%s”添加到您的好友列表中(%s)。"
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "无法将 %s 添加到您的许可列表中(%s)。"
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "无法将 %s 从隐私列表中删除(%s)。"
+
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1568
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "无法更改服务器端的隐私设置(%s)。"
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "无法创建会议(%s)。"
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1607
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:983
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
 msgstr "用户 ID"
 
@@ -6599,36 +6600,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:997
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1017
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1085
+#: src/protocols/novell/novell.c:1558
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise 会议 %d"
+
+#: src/protocols/novell/novell.c:1583
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1114
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr "处理事件或响应出错。(0x%X)"
-
-#: src/protocols/novell/novell.c:1148
+#: src/protocols/novell/novell.c:1613
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "处理事件或响应出错(%s)。"
+
+#: src/protocols/novell/novell.c:1647
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1163
+#: src/protocols/novell/novell.c:1662
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1303
+#: src/protocols/novell/novell.c:1795
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "已经邀请 %s 加入此对话。"
+
+#: src/protocols/novell/novell.c:1822
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1304
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6639,15 +6650,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1306
+#: src/protocols/novell/novell.c:1825
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1409
+#: src/protocols/novell/novell.c:1930
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:1463
+#: src/protocols/novell/novell.c:1984
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6657,33 +6668,37 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1561
+#: src/protocols/novell/novell.c:2082
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:2104
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:1847
+#: src/protocols/novell/novell.c:2413
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2158 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5820 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2724 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6398 src/protocols/yahoo/yahoo.c:2297
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2169
+#: src/protocols/novell/novell.c:2735
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2268 src/protocols/novell/novell.c:2324
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2890
 msgid "Appear Offline"
 msgstr "显示为离线"
 
+#: src/protocols/novell/novell.c:3283
+msgid "Initiate _Chat"
+msgstr "发起聊天(_C)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6695,297 +6710,336 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2413 src/protocols/novell/novell.c:2415
+#: src/protocols/novell/novell.c:3355 src/protocols/novell/novell.c:3357
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:2432
+#: src/protocols/novell/novell.c:3376
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:2436
+#: src/protocols/novell/novell.c:3380
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
-msgstr "主机不支持"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "客户不支持"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
-msgstr "客户拒绝"
-
 #: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
-msgstr "回复太大"
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
-msgstr "响应丢失"
+msgid "Not supported by host"
+msgstr "主机不支持"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Not supported by client"
+msgstr "客户不支持"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Refused by client"
+msgstr "客户拒绝"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Reply too big"
+msgstr "回复太大"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Responses lost"
+msgstr "响应丢失"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Request denied"
+msgstr "请求被禁止"
+
+#: src/protocols/oscar/oscar.c:200
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:434 src/protocols/silc/silc.c:630
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/silc.c:630
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6542
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6701
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4839
-#: src/protocols/oscar/oscar.c:6432
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5418
+#: src/protocols/oscar/oscar.c:6591
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:6589
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4836
-#: src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:6590
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "二人世界连接失败"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "与 %s 的二人世界已建立"
+
+#: src/protocols/oscar/oscar.c:906
+#, 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:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "无法开始二人世界"
+
+#: src/protocols/oscar/oscar.c:1352
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "您选择了与 %s 进行二人世界连接。"
+
+#: src/protocols/oscar/oscar.c:1355
+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:1359 src/protocols/oscar/oscar.c:3269
+msgid "Connect"
+msgstr "连接"
+
+#: src/protocols/oscar/oscar.c:1425 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1441
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1522
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1536
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"无法登入:无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
+"无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1564
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1449
+#: src/protocols/oscar/oscar.c:1665 src/protocols/oscar/oscar.c:2082
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1673
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1786 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1791
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1862
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1333 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1966 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1971
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1342
+#: src/protocols/oscar/oscar.c:1975
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1347
+#: src/protocols/oscar/oscar.c:1980
 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."
@@ -6993,21 +7047,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1985
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1384
+#: src/protocols/oscar/oscar.c:2017
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1456
+#: src/protocols/oscar/oscar.c:2089
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:1522
-#: src/protocols/oscar/oscar.c:1610
+#: src/protocols/oscar/oscar.c:2125 src/protocols/oscar/oscar.c:2155
+#: src/protocols/oscar/oscar.c:2243
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7015,29 +7069,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:2128 src/protocols/oscar/oscar.c:2158
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:2246
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2195 src/protocols/oscar/oscar.c:5924
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "与 %s 的二人世界已建立"
-
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:2551
+#: src/protocols/oscar/oscar.c:3062 src/protocols/oscar/oscar.c:3084
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2712
+#: src/protocols/oscar/oscar.c:3261
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2715
+#: src/protocols/oscar/oscar.c:3264
 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 "
@@ -7046,79 +7095,75 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2720 src/protocols/oscar/oscar.c:6306
-msgid "Connect"
-msgstr "连接"
-
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:3300
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:3308
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3309
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2787
+#: src/protocols/oscar/oscar.c:3338
 #, 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:2792 src/protocols/oscar/oscar.c:2794
+#: src/protocols/oscar/oscar.c:3343 src/protocols/oscar/oscar.c:3345
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:2832
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:2921
-#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3285
-#: src/protocols/oscar/oscar.c:3345 src/protocols/oscar/oscar.c:5445
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/oscar/oscar.c:3381 src/protocols/oscar/oscar.c:3383
+#: src/protocols/oscar/oscar.c:3390 src/protocols/oscar/oscar.c:3472
+#: src/protocols/oscar/oscar.c:3492 src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6063
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:3389
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2921
+#: src/protocols/oscar/oscar.c:3472
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %u 想要将您加为他/她的好友,理由如下:\n"
+"用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2929 src/protocols/oscar/oscar.c:5451
+#: src/protocols/oscar/oscar.c:3480 src/protocols/oscar/oscar.c:6023
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:3492
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
+"用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3493
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:3500
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2957
+#: src/protocols/oscar/oscar.c:3508
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7128,10 +7173,10 @@
 msgstr ""
 "您收到了特殊消息\n"
 "\n"
-"发出人:%s [%s]\n"
+"发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:3516
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7141,10 +7186,10 @@
 msgstr ""
 "您收到了 ICQ 寻呼\n"
 "\n"
-"发出人:%s [%s]\n"
+"发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3524
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7154,35 +7199,35 @@
 msgstr ""
 "您从 %s [%s]收到了 ICQ 电子邮件\n"
 "\n"
-"内容是:\n"
+"内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2994
+#: src/protocols/oscar/oscar.c:3545
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
-
-#: src/protocols/oscar/oscar.c:3000
+msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
+
+#: src/protocols/oscar/oscar.c:3551
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3004
+#: src/protocols/oscar/oscar.c:3555
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3640
 #, 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:3098
+#: src/protocols/oscar/oscar.c:3649
 #, 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:3107
+#: src/protocols/oscar/oscar.c:3658
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7190,77 +7235,77 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3667
 #, 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:3125
+#: src/protocols/oscar/oscar.c:3676
 #, 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:3134
+#: src/protocols/oscar/oscar.c:3685
 #, 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:3188
+#: src/protocols/oscar/oscar.c:3746
 #, 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"
 
-#: src/protocols/oscar/oscar.c:3247
+#: src/protocols/oscar/oscar.c:3805
 #, c-format
 msgid "SNAC threw error: %s\n"
-msgstr "SNAC 扔出错误:%s\n"
-
-#: src/protocols/oscar/oscar.c:3248
+msgstr "SNAC 扔出错误: %s\n"
+
+#: src/protocols/oscar/oscar.c:3806
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3283
+#: src/protocols/oscar/oscar.c:3841
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3342
+#: src/protocols/oscar/oscar.c:3900
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3365
+#: src/protocols/oscar/oscar.c:3923
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3926
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3372 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3930 src/protocols/yahoo/yahoo.c:3088
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:4012
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:4198
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:3858
+#: src/protocols/oscar/oscar.c:4416
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4417
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7268,184 +7313,193 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3922
+#: src/protocols/oscar/oscar.c:4480
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:4482
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:4513
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4783 src/protocols/oscar/oscar.c:4790
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4795
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4796
+msgid "Not specified"
+msgstr "未指定"
+
+#: src/protocols/oscar/oscar.c:4797 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4797 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4813
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4258
+#: src/protocols/oscar/oscar.c:4817
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4263
+#: src/protocols/oscar/oscar.c:4822
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4267 src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4826 src/protocols/oscar/oscar.c:4834
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4271
+#: src/protocols/oscar/oscar.c:4830
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4279
+#: src/protocols/oscar/oscar.c:4838
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4839
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4840
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4841
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4284
+#: src/protocols/oscar/oscar.c:4843
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4290
+#: src/protocols/oscar/oscar.c:4849
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4340
+#: src/protocols/oscar/oscar.c:4899
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:4920
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:4924
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4382
+#: src/protocols/oscar/oscar.c:4941
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4962
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4405
+#: src/protocols/oscar/oscar.c:4964
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:4992
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:4995
 #, 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:4439
+msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名与原始用户名不符。"
+
+#: src/protocols/oscar/oscar.c:4998
 #, 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:4442
+msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
+
+#: src/protocols/oscar/oscar.c:5001
 #, 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:4445
+msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
+
+#: src/protocols/oscar/oscar.c:5004
 #, 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:4448
+msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
+
+#: src/protocols/oscar/oscar.c:5007
 #, 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:4451
+msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
+
+#: src/protocols/oscar/oscar.c:5010
 #, 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:4454
+msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址无效。"
+
+#: src/protocols/oscar/oscar.c:5013
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "错误 0x%04x:未知错误。"
-
-#: src/protocols/oscar/oscar.c:4464
+msgstr "错误 0x%04x: 未知错误。"
+
+#: src/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"您的用户名格式化后如下:\n"
+"您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4465 src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5031
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4688
+#: src/protocols/oscar/oscar.c:5094
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
+
+#: src/protocols/oscar/oscar.c:5267
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4689
+#: src/protocols/oscar/oscar.c:5268
 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 "
@@ -7454,7 +7508,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4716
+#: src/protocols/oscar/oscar.c:5295
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7464,19 +7518,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:5300
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4737 src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:5316 src/protocols/oscar/oscar.c:6596
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:4755
+#: src/protocols/oscar/oscar.c:5334
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4756
+#: src/protocols/oscar/oscar.c:5335
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7485,7 +7539,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4796
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7497,11 +7551,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4801
+#: src/protocols/oscar/oscar.c:5380
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4894
+#: src/protocols/oscar/oscar.c:5466
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7511,16 +7565,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:5312
-#: src/protocols/oscar/oscar.c:5325
+#: src/protocols/oscar/oscar.c:5467 src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:5897
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5603
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5032
+#: src/protocols/oscar/oscar.c:5604
 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 "
@@ -7529,13 +7583,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5208 src/protocols/oscar/oscar.c:5209
-#: src/protocols/oscar/oscar.c:5214 src/protocols/oscar/oscar.c:5369
-#: src/protocols/oscar/oscar.c:5370 src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5780 src/protocols/oscar/oscar.c:5781
+#: src/protocols/oscar/oscar.c:5786 src/protocols/oscar/oscar.c:5941
+#: src/protocols/oscar/oscar.c:5942 src/protocols/oscar/oscar.c:5947
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5311
+#: src/protocols/oscar/oscar.c:5883
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7543,11 +7597,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5311 src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5883 src/protocols/oscar/oscar.c:5896
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5896
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7557,124 +7611,112 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5406
+#: src/protocols/oscar/oscar.c:5978
 #, 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:5412
+#: src/protocols/oscar/oscar.c:5984
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5445
+#: src/protocols/oscar/oscar.c:6017
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 想要将您加为好友,原因如下:\n"
+"用户 %s 想要将您加为好友,原因如下:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6059
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5488
+#: src/protocols/oscar/oscar.c:6060
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/oscar/oscar.c:6063
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
+"用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6064
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5529 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6101 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:5551
+#: src/protocols/oscar/oscar.c:6123
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:5792
+#: src/protocols/oscar/oscar.c:6213
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
+
+#: src/protocols/oscar/oscar.c:6370
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6286
-msgid "Unable to open Direct IM"
-msgstr "无法开始二人世界"
-
-#: src/protocols/oscar/oscar.c:6299
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您选择了与 %s 进行二人世界连接。"
-
-#: src/protocols/oscar/oscar.c:6302
-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:6487
+#: src/protocols/oscar/oscar.c:6646
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6503
+#: src/protocols/oscar/oscar.c:6662
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6511
+#: src/protocols/oscar/oscar.c:6670
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6526
+#: src/protocols/oscar/oscar.c:6685
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6555
+#: src/protocols/oscar/oscar.c:6714
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6576
+#: src/protocols/oscar/oscar.c:6735
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6577
+#: src/protocols/oscar/oscar.c:6736
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6583
+#: src/protocols/oscar/oscar.c:6742
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6791
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6676
+#: src/protocols/oscar/oscar.c:6835
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6838
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6680
+#: src/protocols/oscar/oscar.c:6839
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7682,75 +7724,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6855
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:6856
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:6857
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6713
+#: src/protocols/oscar/oscar.c:6874
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6875
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6790
+#: src/protocols/oscar/oscar.c:6951
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6797
+#: src/protocols/oscar/oscar.c:6958
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:6805
+#: src/protocols/oscar/oscar.c:6966
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6812
+#: src/protocols/oscar/oscar.c:6973
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6980
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6827
+#: src/protocols/oscar/oscar.c:6988
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6838
+#: src/protocols/oscar/oscar.c:6999
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:7005
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6850
+#: src/protocols/oscar/oscar.c:7011
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:7017
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:6865
+#: src/protocols/oscar/oscar.c:7026
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6873
+#: src/protocols/oscar/oscar.c:7034
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:6880
+#: src/protocols/oscar/oscar.c:7041
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -7765,15 +7807,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7004 src/protocols/oscar/oscar.c:7006
+#: src/protocols/oscar/oscar.c:7159 src/protocols/oscar/oscar.c:7161
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7180
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7185
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -7829,8 +7871,7 @@
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr ""
-"收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
+msgstr "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
 
 #: src/protocols/silc/buddy.c:288
 #, c-format
@@ -7897,10 +7938,11 @@
 
 #: src/protocols/silc/buddy.c:687
 msgid ""
-"You cannot receive buddy notifications untill you import its public key.  "
+"You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令。"
+"除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令来获取公"
+"钥。"
 
 #: src/protocols/silc/buddy.c:987
 #, c-format
@@ -7909,9 +7951,9 @@
 
 #: src/protocols/silc/buddy.c:990
 msgid ""
-"To add the buddy you must import its public key. Press Import to import a "
-"public key."
-msgstr "要添加好友,您必须导入其公钥。请按[导入]以导入公钥。"
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr "要添加好友,您必须导入他/她的公钥。请按[导入]以导入公钥。"
 
 #: src/protocols/silc/buddy.c:993
 msgid "Import..."
@@ -8070,8 +8112,8 @@
 "able to join."
 msgstr ""
 "频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码句和数字签名。"
-"如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么"
-"只有那些公钥已经列出的用户才能加入。"
+"如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
+"些公钥已经列出的用户才能加入。"
 
 #: src/protocols/silc/chat.c:396 src/protocols/silc/chat.c:397
 #: src/protocols/silc/chat.c:434 src/protocols/silc/chat.c:435
@@ -8166,8 +8208,7 @@
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"在您加入私有组之前,必须先加入 %s 频道"
+msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
 #: src/protocols/silc/chat.c:963
 msgid "Join Private Group"
@@ -8235,7 +8276,7 @@
 #: src/protocols/silc/ops.c:338
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s 已经将 <I>%s</I> 的话题改为:%s"
+msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
 
 #: src/protocols/silc/ops.c:398
 #, c-format
@@ -8282,7 +8323,9 @@
 msgid ""
 "Personal Information:\n"
 "\n"
-msgstr "个人信息:\n\n"
+msgstr ""
+"个人信息:\n"
+"\n"
 
 #: src/protocols/silc/ops.c:769
 #, c-format
@@ -8359,7 +8402,9 @@
 msgid ""
 "\n"
 "Note:\t\t%s\n"
-msgstr "\n注释:\t\t%s\n"
+msgstr ""
+"\n"
+"注释:\t\t%s\n"
 
 #: src/protocols/silc/ops.c:862
 msgid "Join Chat"
@@ -8394,7 +8439,9 @@
 msgid ""
 "\n"
 "Channels:\n"
-msgstr "\n频道:\n"
+msgstr ""
+"\n"
+"频道:\n"
 
 #: src/protocols/silc/ops.c:965
 #, c-format
@@ -8414,7 +8461,9 @@
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
-msgstr "公钥漏印:\n%s"
+msgstr ""
+"公钥漏印: \n"
+"%s"
 
 #: src/protocols/silc/ops.c:979
 msgid "More..."
@@ -8467,9 +8516,8 @@
 
 #: src/protocols/silc/ops.c:1203
 msgid ""
-"Resuming detached session failed.Press Reconnect to create new connection."
-msgstr ""
-"恢复脱离的会话失败。请按[重新连接]以创建新连接。"
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
 #: src/protocols/silc/ops.c:1209
 msgid "Connection timeout"
@@ -8498,51 +8546,50 @@
 
 #: src/protocols/silc/ops.c:1417
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失败:版本不匹配,请升级您的客户端"
+msgstr "失败: 版本不匹配,请升级您的客户端"
 
 #: src/protocols/silc/ops.c:1420
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "失败:远程不信任或不支持您的公钥"
+msgstr "失败: 远程不信任或不支持您的公钥"
 
 #: src/protocols/silc/ops.c:1423
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "失败:远程不支持提议的 KE 组"
+msgstr "失败: 远程不支持提议的 KE 组"
 
 #: src/protocols/silc/ops.c:1426
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "失败:远程不支持提议的密码算法"
+msgstr "失败: 远程不支持提议的密码算法"
 
 #: src/protocols/silc/ops.c:1429
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失败:远程不支持提议的 PKCS"
+msgstr "失败: 远程不支持提议的 PKCS"
 
 #: src/protocols/silc/ops.c:1432
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "失败:远程不支持提议的散列函数"
+msgstr "失败: 远程不支持提议的散列函数"
 
 #: src/protocols/silc/ops.c:1435
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失败:远程不支持 HMAC"
+msgstr "失败: 远程不支持 HMAC"
 
 #: src/protocols/silc/ops.c:1437
 msgid "Failure: Incorrect signature"
-msgstr "失败:签名不正确"
+msgstr "失败: 签名不正确"
 
 #: src/protocols/silc/ops.c:1439
 msgid "Failure: Invalid cookie"
-msgstr "失败:无效的 cookie"
+msgstr "失败: 无效的 cookie"
 
 #: src/protocols/silc/ops.c:1450
 msgid "Failure: Authentication failed"
-msgstr "失败:身份验证失败"
+msgstr "失败: 身份验证失败"
 
 #: src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr ""
-"收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
+msgstr "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -8556,7 +8603,8 @@
 "\n"
 "%s\n"
 "%s\n"
-msgstr "%s 密钥的指纹和漏印分别是:\n"
+msgstr ""
+"%s 密钥的指纹和漏印分别是:\n"
 "\n"
 "%s\n"
 "%s\n"
@@ -8606,7 +8654,9 @@
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
-msgstr "\n您首选的联系方式"
+msgstr ""
+"\n"
+"您首选的联系方式"
 
 #: src/protocols/silc/silc.c:636
 msgid "SMS"
@@ -8654,8 +8704,8 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"您可以让其它用户看到您的在线状态信息以及您的个人信息。"
-"请填入您想要其它用户看到的有关您自己的信息。"
+"您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
+"到的有关您自己的信息。"
 
 #: src/protocols/silc/silc.c:720
 msgid "Message of the Day"
@@ -8728,48 +8778,48 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1019
+#: src/protocols/silc/silc.c:1016
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/silc/silc.c:1018
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1050
+#: src/protocols/silc/silc.c:1048
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1056
+#: src/protocols/silc/silc.c:1054
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1060
+#: src/protocols/silc/silc.c:1058
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1065
+#: src/protocols/silc/silc.c:1063
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1068
+#: src/protocols/silc/silc.c:1066
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1071
+#: src/protocols/silc/silc.c:1069
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1074
+#: src/protocols/silc/silc.c:1072
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:196 src/protocols/silc/util.c:216
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
-#: src/protocols/silc/util.c:295 src/protocols/silc/util.c:296
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
 msgid "Public Key Information"
 msgstr "公钥信息"
 
@@ -8866,7 +8916,7 @@
 #: src/protocols/toc/toc.c:568
 #, c-format
 msgid "Failure unknown: %s."
-msgstr "未知失败:%s。"
+msgstr "未知失败: %s。"
 
 #: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
@@ -8887,12 +8937,12 @@
 #: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "发生了未知登入错误:%s。"
+msgstr "发生了未知登入错误: %s。"
 
 #: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "发生了未知错误 %d。信息:%s"
+msgstr "发生了未知错误 %d。信息: %s"
 
 #: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
@@ -8924,43 +8974,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1671
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1707
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1752 src/protocols/toc/toc.c:1792
+#: src/protocols/toc/toc.c:1916 src/protocols/toc/toc.c:2004
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1949
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2049
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2083
 #, 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:2083
+msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:2090
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -8976,15 +9026,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2172 src/protocols/toc/toc.c:2174
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2193
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2197
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9068,7 +9118,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1280 src/protocols/trepia/trepia.c:1282
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
@@ -9288,27 +9338,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
@@ -9372,34 +9422,34 @@
 msgid "User Rooms"
 msgstr "用户房间"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
+#: src/protocols/zephyr/zephyr.c:560
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -9407,19 +9457,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1164
+#: src/protocols/zephyr/zephyr.c:1165
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1207
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1213
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1219
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
@@ -9434,7 +9484,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1371 src/protocols/zephyr/zephyr.c:1373
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
@@ -9452,19 +9502,20 @@
 
 #. Forbidden
 #: src/proxy.c:853
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "访问被禁止: 代理服务器禁止端口 80 流过。"
-
-#: src/proxy.c:855
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1594
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1594
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -9482,61 +9533,61 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:958
+#: src/server.c:917
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:972
+#: src/server.c:931
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1154 src/server.c:1164
+#: src/server.c:1111 src/server.c:1121
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1177
+#: src/server.c:1134
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1193
+#: src/server.c:1150
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1195
+#: src/server.c:1152
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1210
+#: src/server.c:1167
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/server.c:1224
+#: src/server.c:1181
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1235 src/server.c:1243
+#: src/server.c:1192 src/server.c:1200
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1257
+#: src/server.c:1214
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1307
+#: src/server.c:1264
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -9545,25 +9596,25 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1310
+#: src/server.c:1267
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1420
+#: src/server.c:1377
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
-"用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
+"用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 "%s"
 
-#: src/server.c:1424
+#: src/server.c:1381
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
-
-#: src/server.c:1430
+msgstr "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
+
+#: src/server.c:1387
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -9590,32 +9641,32 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2040
+#: src/util.c:2128
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2043
+#: src/util.c:2131
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2162 src/util.c:2167 src/util.c:2172 src/util.c:2175
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2163 src/util.c:2167 src/util.c:2181 src/util.c:2183
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2163 src/util.c:2172 src/util.c:2181 src/util.c:2186
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2435
+#: src/util.c:2523
 msgid "g003: Error opening connection.\n"
-msgstr "g003:打开连接出错。\n"
+msgstr "g003: 打开连接出错。\n"
 
 #: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."