changeset 9269:37aa1a2fe9df

[gaim-migrate @ 10070] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 12 Jun 2004 15:41:19 +0000
parents 54fb1f466953
children 25553cb0fe96
files po/ChangeLog po/zh_CN.po
diffstat 2 files changed, 1748 insertions(+), 1485 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Sat Jun 12 15:13:29 2004 +0000
+++ b/po/ChangeLog	Sat Jun 12 15:41:19 2004 +0000
@@ -2,6 +2,7 @@
 
 version 0.79cvs
 	* English (Canadian) translation updated (Adam Weinberger)
+	* Chinese (Simplified) translation updated (Funda Wang)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 
 version 0.78 (05/30/2004):
--- a/po/zh_CN.po	Sat Jun 12 15:13:29 2004 +0000
+++ b/po/zh_CN.po	Sat Jun 12 15:41:19 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-24 21:09-0400\n"
-"PO-Revision-Date: 2004-05-25 10:49+0800\n"
+"POT-Creation-Date: 2004-06-12 00:02-0400\n"
+"PO-Revision-Date: 2004-06-12 12:24+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"
@@ -158,21 +158,21 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1793 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
 #: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
 #: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
-#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5466
+#: src/protocols/oscar/oscar.c:6448 src/protocols/oscar/oscar.c:6647
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "离开"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
+#: src/protocols/oscar/oscar.c:5384 src/protocols/oscar/oscar.c:6655
 msgid "Back"
 msgstr "回来"
 
@@ -188,7 +188,7 @@
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2483
 msgid "Preferences"
 msgstr "首选项"
 
@@ -238,6 +238,43 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
+#: plugins/extplacement.c:68
+msgid "By conversation count"
+msgstr "按对话计数"
+
+#: plugins/extplacement.c:89
+msgid "Conversation Placement"
+msgstr "交谈放置"
+
+#: plugins/extplacement.c:94
+msgid "Number of conversations per window"
+msgstr "每个窗口的对话数"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:114
+msgid "ExtPlacement"
+msgstr "扩展放置"
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:116
+msgid "Extra conversation placement options."
+msgstr "额外的对话放置选项。"
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:118
+msgid ""
+"Either restrict the number of conversations per windows or use separate "
+"windows for IMs and Chats"
+msgstr "限制每个窗口的对话数,或者为即时消息和聊天使用单独的窗口"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -403,15 +440,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:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
-#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2958 src/gtkprefs.c:914 src/gtkprefs.c:967
+#: src/gtkprefs.c:1806 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
-#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2155
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
+#: src/protocols/msn/msn.c:1284 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -426,13 +463,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6934
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
-#: src/gtkblist.c:4312
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3984
+#: src/gtkblist.c:4313
 msgid "Group:"
 msgstr "组:"
 
@@ -469,8 +506,8 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3808
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
@@ -599,7 +636,7 @@
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:793
+#: plugins/idle.c:67 src/dialogs.c:795
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -965,7 +1002,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:910
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
@@ -1033,19 +1070,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:109
+#: plugins/timestamp.c:199
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:205
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -1056,7 +1093,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1064,7 +1101,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
@@ -1088,7 +1125,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:908
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -1141,7 +1178,7 @@
 
 #. Buddy List
 #: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2392
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1160,8 +1197,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
-#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:959
+#: src/gtkprefs.c:2393 src/protocols/msn/msn.c:1609
 msgid "Conversations"
 msgstr "对话"
 
@@ -1264,11 +1301,11 @@
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:165 src/about.c:202
+#: src/about.c:165 src/about.c:203
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:166 src/about.c:203
+#: src/about.c:166 src/about.c:204
 msgid "Czech"
 msgstr "捷克语"
 
@@ -1284,19 +1321,19 @@
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:170 src/about.c:205
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:171 src/about.c:205
+#: src/about.c:171 src/about.c:206
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:172 src/about.c:206
+#: src/about.c:172 src/about.c:207
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:173 src/about.c:207
+#: src/about.c:173 src/about.c:208
 msgid "French"
 msgstr "法语"
 
@@ -1312,11 +1349,11 @@
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:177 src/about.c:208
+#: src/about.c:177 src/about.c:209
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:178 src/about.c:211
 msgid "Korean"
 msgstr "朝鲜语"
 
@@ -1332,7 +1369,7 @@
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:182 src/about.c:211
+#: src/about.c:182 src/about.c:212
 msgid "Polish"
 msgstr "波兰语"
 
@@ -1348,7 +1385,7 @@
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:186 src/about.c:212
+#: src/about.c:186 src/about.c:213
 msgid "Russian"
 msgstr "俄语"
 
@@ -1360,7 +1397,7 @@
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/about.c:189 src/about.c:214
+#: src/about.c:189 src/about.c:215
 msgid "Swedish"
 msgstr "瑞典语"
 
@@ -1372,39 +1409,39 @@
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:191
+#: src/about.c:192
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:192
+#: src/about.c:193
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:199
+#: src/about.c:200
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:200
-msgid "Amharic"
-msgstr "阿姆哈拉语"
-
 #: src/about.c:201
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: src/about.c:202
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:209
+#: src/about.c:210
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:213
+#: src/about.c:214
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:215
+#: src/about.c:216
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:998
+#: src/account.c:278 src/protocols/jabber/jabber.c:1000
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
@@ -1438,43 +1475,43 @@
 #.
 #: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
 #: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
-#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
-#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
-#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
-#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
-#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:3352 src/protocols/oscar/oscar.c:3446
+#: src/protocols/oscar/oscar.c:6716 src/protocols/oscar/oscar.c:6813
+#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6951
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1134
 #: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
 #: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/protocols/yahoo/yahoo.c:2642 src/protocols/yahoo/yahoo.c:2651
 #: src/request.h:1242
 msgid "OK"
 msgstr "确定"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
 #: 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:581 src/dialogs.c:815
-#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:818
+#: src/dialogs.c:835 src/dialogs.c:854 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4352
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 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:515 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
-#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
-#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
-#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
-#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
-#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
-#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
-#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3390
+#: src/protocols/oscar/oscar.c:3447 src/protocols/oscar/oscar.c:6717
+#: src/protocols/oscar/oscar.c:6814 src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6935 src/protocols/oscar/oscar.c:6952
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1135 src/protocols/silc/chat.c:710
 #: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
-#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2643
+#: src/protocols/yahoo/yahoo.c:2652 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
@@ -1506,7 +1543,7 @@
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/away.c:333 src/gtkconv.c:1359 src/gtkconv.c:3541 src/gtkconv.c:3640
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "删除"
@@ -1519,7 +1556,7 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:590 src/gtkprefs.c:2506
+#: src/blist.c:590
 msgid "Chats"
 msgstr "聊天"
 
@@ -1539,7 +1576,7 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721
 #: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "未知"
@@ -1577,74 +1614,74 @@
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: src/conversation.c:293
+#: src/conversation.c:271
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:301
+#: src/conversation.c:279
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1953
+#: src/conversation.c:1957
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1956
+#: src/conversation.c:1960
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2051
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2054
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2094
+#: src/conversation.c:2098
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2169
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2171
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2487
+#: src/conversation.c:2461
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2489 src/gtkprefs.c:1438
+#: src/conversation.c:2463
+msgid "Separate IM and Chat windows"
+msgstr "分离即时消息和聊天窗口"
+
+#: src/conversation.c:2465 src/gtkprefs.c:1332
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2491
+#: src/conversation.c:2467
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2493
+#: src/conversation.c:2469
 msgid "By account"
 msgstr "按账户"
 
-#: src/conversation.c:2495
-msgid "By conversation count"
-msgstr "按对话计数"
-
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "警告用户"
@@ -1769,45 +1806,45 @@
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:781
+#: src/dialogs.c:783
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:787
 msgid "Sa_ve & Use"
 msgstr "保存并使用(_V)"
 
-#: src/dialogs.c:789
+#: src/dialogs.c:791
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/dialogs.c:811
+#: src/dialogs.c:814
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:812
+#: src/dialogs.c:815
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/dialogs.c:817 src/dialogs.c:834 src/dialogs.c:853 src/gtkrequest.c:243
 #: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:829
+#: src/dialogs.c:832
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:846
+#: src/dialogs.c:849
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:848
+#: src/dialogs.c:851
 msgid "Alias Buddy"
 msgstr "好友别名"
 
@@ -1849,7 +1886,7 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [command]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 "用法: %s 命令 [选项] [URI]\n"
 "\n"
@@ -1917,19 +1954,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "对不起,我临时有事离开一会儿。麻烦您稍后再联络我。"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1411
+#: src/gaimrc.c:372 src/gaimrc.c:1409
 msgid "boring default"
 msgstr "临时有事"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2960
+#: src/gaimrc.c:1219 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2961
+#: src/gaimrc.c:1221 src/gtkblist.c:2961
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1225 src/gtkblist.c:2962
+#: src/gaimrc.c:1223 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1953,7 +1990,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3955
+#: src/gtkaccount.c:406 src/gtkblist.c:3956
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1961,7 +1998,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
+#: src/gtkaccount.c:484 src/gtkblist.c:3970 src/gtkblist.c:4299
 msgid "Alias:"
 msgstr "别名:"
 
@@ -2022,7 +2059,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1136
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -2038,15 +2075,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1233
+#: src/gtkaccount.c:937 src/gtkprefs.c:1130
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1263
+#: src/gtkaccount.c:946 src/gtkprefs.c:1157
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1281
+#: src/gtkaccount.c:950 src/gtkprefs.c:1175
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -2054,7 +2091,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1318
+#: src/gtkaccount.c:963 src/gtkprefs.c:1212
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -2076,7 +2113,7 @@
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665
 msgid "Register"
 msgstr "注册"
 
@@ -2089,14 +2126,14 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3980
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
-#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:957
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6646 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2385 src/protocols/zephyr/zephyr.c:1167
 #: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "在线"
@@ -2129,9 +2166,9 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
-#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
+#: src/gtkaccount.c:2234 src/gtkblist.c:4351 src/gtkconv.c:1361
+#: src/gtkconv.c:3534 src/gtkconv.c:3633 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3609
 msgid "Add"
 msgstr "添加"
 
@@ -2145,15 +2182,15 @@
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
+#: src/gtkblist.c:844 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1132 src/gtkblist.c:3152
+#: src/gtkblist.c:1132 src/gtkblist.c:3153
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:3143
+#: src/gtkblist.c:1135 src/gtkblist.c:3144
 msgid "I_M"
 msgstr "开聊(_M)"
 
@@ -2191,7 +2228,7 @@
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
+#: src/gtkblist.c:1223 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
@@ -2208,7 +2245,7 @@
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
+#: src/gtkblist.c:1941 src/gtkconv.c:4166 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
@@ -2489,45 +2526,45 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3123
+#: src/gtkblist.c:3124
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3125
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3149
+#: src/gtkblist.c:3150
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3158
+#: src/gtkblist.c:3159
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3162
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3166
+#: src/gtkblist.c:3167
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3170
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3175
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
-#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
-#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
+#: src/gtkblist.c:3910 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:991 src/protocols/silc/buddy.c:1036
+#: src/protocols/silc/buddy.c:1126 src/protocols/yahoo/yahoo.c:2566
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3933
+#: src/gtkblist.c:3934
 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. "
@@ -2537,35 +2574,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3993 src/gtkblist.c:4278
+#: src/gtkblist.c:3994 src/gtkblist.c:4279
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4237
+#: src/gtkblist.c:4238
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4244
+#: src/gtkblist.c:4245
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4268
+#: src/gtkblist.c:4269
 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:4347
+#: src/gtkblist.c:4348
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4348
+#: src/gtkblist.c:4349
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4915 src/gtkblist.c:5012
+#: src/gtkblist.c:4916 src/gtkblist.c:5013
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2614,323 +2651,404 @@
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:172
+#: src/gtkconv.c:173
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:190 src/gtkdebug.c:212
+#: src/gtkconv.c:191 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
+#: src/gtkconv.c:192 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:370
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr "我正在使用 Gaim v%s。"
+
+#: src/gtkconv.c:379
+msgid "Supported debug options are:  version"
+msgstr "支持的调试选项有:version"
+
+#: src/gtkconv.c:392
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
+"此环境下可使用下列命令:\n"
+
+#: src/gtkconv.c:426
+msgid "No such command (in this context)."
+msgstr "没有这样的命令(在此环境中)。"
+
+#: src/gtkconv.c:473
+msgid ""
+"No such command. If you didn't mean to type a command, you can turn commands "
+"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
+"commands."
+msgstr ""
+"没有这样的命令。如果您本来并不想输入命令,您可以在工具->首选项->界面->转换->"
+"启用“斜线”命令中关闭命令。"
+
+#: src/gtkconv.c:481
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command. If "
+"you didn't mean to type a command, you can turn commands off from Tools-"
+">Preferences->Interface->Conversation->Enable \"slash\" commands."
+msgstr ""
+"语法错误:您为命令输入的参数个数不对。如果您本来并不想输入命令,您可以在工具-"
+">首选项->界面->转换->启用“斜线”命令中关闭命令。"
+
+#: src/gtkconv.c:488
+msgid "Your command failed for an unknown reason."
+msgstr "您的命令失败,原因未知。"
+
+#: src/gtkconv.c:495
+msgid "That command only works in Chats, not IMs."
+msgstr "命令只在聊天中可用,对话中无效。"
+
+#: src/gtkconv.c:498
+msgid "That command only works in IMs, not Chats."
+msgstr "命令只在对话中可用,聊天中无效。"
+
+#: src/gtkconv.c:502
+msgid "That command doesn't work on this protocol."
+msgstr "命令无法在此协议下工作。"
+
+#: src/gtkconv.c:718
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:582
+#: src/gtkconv.c:746
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:603
+#: src/gtkconv.c:767
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:623
+#: src/gtkconv.c:787
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:731 src/gtkdebug.c:127
+#: src/gtkconv.c:895 src/gtkdebug.c:127
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:757 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1135
+#: src/gtkconv.c:1319
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1143
+#: src/gtkconv.c:1327
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1145 src/gtkprefs.c:783
+#: src/gtkconv.c:1329 src/gtkprefs.c:779
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1154 src/gtkconv.c:3361
+#: src/gtkconv.c:1338 src/gtkconv.c:3548
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1163
+#: src/gtkconv.c:1347
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2255
+#: src/gtkconv.c:2435
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2260
+#: src/gtkconv.c:2440
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2266
+#: src/gtkconv.c:2446
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2635
+#: src/gtkconv.c:2818
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2643
+#: src/gtkconv.c:2826
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2746
+#: src/gtkconv.c:2929
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3306
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3140
+#: src/gtkconv.c:3323
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3325
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3330
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3332
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3333
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3335
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3339
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3158
+#: src/gtkconv.c:3341
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3343
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3345
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3350
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3352
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3354
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3356
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3361
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3363
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3185
+#: src/gtkconv.c:3368
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3372
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3373
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3191
+#: src/gtkconv.c:3374
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3375
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3376
+msgid "/Options/Show T_imestamps"
+msgstr "/选项/显示时间戳(_I)"
+
+#: src/gtkconv.c:3418
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3423
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3429
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3433
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3437
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3259
+#: src/gtkconv.c:3443
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3447
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3451
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3271
+#: src/gtkconv.c:3455
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3277
+#: src/gtkconv.c:3461
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3281
+#: src/gtkconv.c:3465
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3287
+#: src/gtkconv.c:3471
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3474
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3293
+#: src/gtkconv.c:3477
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
+#: src/gtkconv.c:3480
+msgid "/Options/Show Timestamps"
+msgstr "/选项/显示时间戳(I)"
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
+#: src/gtkconv.c:3504 src/gtkconv.c:3506 src/gtkconv.c:3612 src/gtkconv.c:3614
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3520
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3336
+#: src/gtkconv.c:3523
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3527 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3530
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3350
+#: src/gtkconv.c:3537
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3357
+#: src/gtkconv.c:3544
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3364 src/gtkconv.c:3708
+#: src/gtkconv.c:3551 src/gtkconv.c:3895
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3439
+#: src/gtkconv.c:3626
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3442
+#: src/gtkconv.c:3629
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3449
+#: src/gtkconv.c:3636
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3643
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3753
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3817
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3872
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3884
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4252
+#: src/gtkconv.c:4457
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
+#: src/gtkconv.c:4998 src/gtkconv.c:5030 src/gtkconv.c:5151 src/gtkconv.c:5218
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5503 src/gtkconv.c:5506
+#: src/gtkconv.c:5733 src/gtkconv.c:5736
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
+#: src/gtkconv.c:6107
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;动作&gt;:向好友或聊天发送 IRC 风格的动作。"
+
+#: src/gtkconv.c:6110
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;选项&gt;:在当前对话中发送各种调试信息。"
+
+#: src/gtkconv.c:6114
+msgid "help:  List available commands."
+msgstr "help:列出可用的命令。"
+
+#: src/gtkconv.c:6118
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;命令&gt;:关于具体命令的帮助。"
+
 #: src/gtkdebug.c:226
 msgid "Save Debug Log"
 msgstr "保存调试日志"
@@ -3060,7 +3178,7 @@
 msgstr "该文件不存在。"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1025
 msgid "Open..."
 msgstr "打开..."
 
@@ -3113,22 +3231,22 @@
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2667
+#: src/gtkimhtml.c:2669
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2675
+#: src/gtkimhtml.c:2677
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2684
+#: src/gtkimhtml.c:2686
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2707
+#: src/gtkimhtml.c:2709
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3237,7 +3355,7 @@
 msgstr "交谈对象"
 
 #. Window **********
-#: src/gtklog.c:370 src/gtklog.c:386
+#: src/gtklog.c:372 src/gtklog.c:388
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3304,320 +3422,333 @@
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:193
+#: src/gtkpounce.c:194
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:406 src/gtkpounce.c:846
+#: src/gtkpounce.c:420 src/gtkpounce.c:923
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:406
+#: src/gtkpounce.c:420
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:438
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:451
+#: src/gtkpounce.c:465
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:475
+#: src/gtkpounce.c:489
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:483 src/main.c:296
+#: src/gtkpounce.c:497 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:485
+#: src/gtkpounce.c:499
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:487
+#: src/gtkpounce.c:501
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:503
 msgid "Re_turn from away"
 msgstr "回来(_T)"
 
-#: src/gtkpounce.c:491
+#: src/gtkpounce.c:505
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:507
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:495
+#: src/gtkpounce.c:509
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:497
+#: src/gtkpounce.c:511
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:540
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:548
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:534
+#: src/gtkpounce.c:550
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:552
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:536
+#: src/gtkpounce.c:554
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:537
+#: src/gtkpounce.c:556
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:541
+#: src/gtkpounce.c:560
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:543
+#: src/gtkpounce.c:562
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:544
+#: src/gtkpounce.c:563
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:627
+#: src/gtkpounce.c:646
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:853
+#: src/gtkpounce.c:930
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:903
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s 开始向您打字"
-
-#: src/gtkpounce.c:904
-#, c-format
-msgid "%s has signed on"
-msgstr "%s 已登入"
-
-#: src/gtkpounce.c:905
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s 睡醒了"
-
-#: src/gtkpounce.c:906
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s 回来了"
-
-#: src/gtkpounce.c:907
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s 停止了给您打字"
-
-#: src/gtkpounce.c:908
-#, c-format
-msgid "%s has signed off"
-msgstr "%s 已登出"
-
-#: src/gtkpounce.c:909
-#, c-format
-msgid "%s has become idle"
-msgstr "%s 打起瞌睡"
-
-#: src/gtkpounce.c:911
+#: src/gtkpounce.c:994
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s 开始向您打字(%s)"
+
+#: src/gtkpounce.c:996
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s 已登入(%s)"
+
+#: src/gtkpounce.c:998
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s 睡醒了(%s)"
+
+#: src/gtkpounce.c:1000
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s 回来了(%s)"
+
+#: src/gtkpounce.c:1002
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s 停止了给您打字(%s)"
+
+#: src/gtkpounce.c:1004
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s 已登出(%s)"
+
+#: src/gtkpounce.c:1006
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s 打起瞌睡(%s)"
+
+#: src/gtkpounce.c:1008
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s 走了。(%s)"
+
+#: src/gtkpounce.c:1009
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:406
+#: src/gtkprefs.c:402
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:408
+#: src/gtkprefs.c:404
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:628
 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:672
+#: src/gtkprefs.c:668
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:675 src/gtkprefs.c:2192 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:775 src/gtkprefs.c:1114
+#: src/gtkprefs.c:771
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:772
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:775
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
+#: src/gtkprefs.c:780
+msgid "Ignore c_olors"
+msgstr "忽略颜色(_O)"
+
+#: src/gtkprefs.c:782
+msgid "Ignore font _faces"
+msgstr "忽略字体(_F)"
+
 #: src/gtkprefs.c:784
-msgid "Ignore c_olors"
-msgstr "忽略颜色(_O)"
-
-#: src/gtkprefs.c:786
-msgid "Ignore font _faces"
-msgstr "忽略字体(_F)"
-
-#: src/gtkprefs.c:788
 msgid "Ignore font si_zes"
 msgstr "较大字体(_Z)"
 
+#: src/gtkprefs.c:787
+msgid "_Ignore formatting on incoming messages"
+msgstr "忽略收到信息的格式(_I)"
+
 #: src/gtkprefs.c:791
-msgid "_Ignore formatting on incoming messages"
-msgstr "忽略收到信息的格式(_I)"
-
-#: src/gtkprefs.c:795
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:793
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:825
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
-msgstr ""
-"当您使用的协议支持格式时,您送出的信息将会显示为这样。"
-
-#: src/gtkprefs.c:832
+msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
+
+#: src/gtkprefs.c:828
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:865
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:866
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:868
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:871
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:872
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:875
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:876
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} 更改格式(_F)"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:878
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:894
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:903
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
+#: src/gtkprefs.c:909 src/gtkprefs.c:962
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
+#: src/gtkprefs.c:911 src/gtkprefs.c:964
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
+#: src/gtkprefs.c:912 src/gtkprefs.c:965
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
+#: src/gtkprefs.c:913 src/gtkprefs.c:966
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
+#: src/gtkprefs.c:916 src/gtkprefs.c:981
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:919
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:924 src/gtkprefs.c:1074
+#: src/gtkprefs.c:920 src/gtkprefs.c:977
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:922
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
+#: src/gtkprefs.c:924
+msgid "Show idle _times"
+msgstr "显示瞌睡时间(_T)"
+
+#: src/gtkprefs.c:926
+msgid "Dim i_dle buddies"
+msgstr "显示睡着的好友(_D)"
+
 #: src/gtkprefs.c:928
-msgid "Show idle _times"
-msgstr "显示瞌睡时间(_T)"
-
-#: src/gtkprefs.c:930
-msgid "Dim i_dle buddies"
-msgstr "显示睡着的好友(_D)"
-
-#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:969
-msgid "_Placement:"
-msgstr "位置(_P):"
-
-#: src/gtkprefs.c:976
-msgid "Number of conversations per window"
-msgstr "每个窗口的对话数"
+#: src/gtkprefs.c:973
+msgid "Show _formatting toolbar"
+msgstr "显示格式工具栏(_F)"
+
+#: src/gtkprefs.c:975
+msgid "Show _aliases in tabs/titles"
+msgstr "在标签/标题中显示别名(_A)"
+
+#: src/gtkprefs.c:979
+msgid "Enable buddy ic_on animation"
+msgstr "启用好友图标动画(_O)"
+
+#: src/gtkprefs.c:983
+msgid "_Notify buddies that you are typing to them"
+msgstr "提醒好友您正在打字给他们(_N)"
 
 #: src/gtkprefs.c:985
-msgid "Show _formatting toolbar"
-msgstr "显示格式工具栏(_F)"
-
-#: src/gtkprefs.c:988
-msgid "Show a_liases in tabs/titles"
-msgstr "在标签/标题中显示别名(_L)"
-
+msgid "Enable \"_slash\" commands"
+msgstr "允许斜线开头的命令(_S)"
+
+#: src/gtkprefs.c:987
+msgid "Use _multi-colored screen names in chats"
+msgstr "在聊天中使用多种颜色来区分用户名(_M)"
+
+#. All the tab options!
 #: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "标签选项"
@@ -3626,164 +3757,136 @@
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:996
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
-
-#: src/gtkprefs.c:1006
+#: src/gtkprefs.c:1008
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:1019
-msgid "_Tab Placement:"
-msgstr "标签位置(_T):"
-
-#: src/gtkprefs.c:1021
+#: src/gtkprefs.c:1011
+msgid "Tab p_lacement:"
+msgstr "标签位置(_L):"
+
+#: src/gtkprefs.c:1013
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1014
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1015
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1016
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
-msgid "Window"
-msgstr "窗口"
-
-#: src/gtkprefs.c:1073
-msgid "Buddy Icons"
-msgstr "好友图标"
-
-#: src/gtkprefs.c:1076
-msgid "Enable buddy icon a_nimation"
-msgstr "启用好友图标动画(_N)"
-
-#: src/gtkprefs.c:1079
-msgid "Typing Notification"
-msgstr "打字提示"
-
-#: src/gtkprefs.c:1080
-msgid "Notify buddies that you are _typing to them"
-msgstr "提醒好友您正在打字给他们(_T)"
-
-#: src/gtkprefs.c:1115
-msgid "Co_lorize screen names"
-msgstr "用户名着色(_L)"
-
-#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4811
+#: src/gtkprefs.c:1022
+msgid "New conversation _placement:"
+msgstr "新对话放置(_P):"
+
+#: src/gtkprefs.c:1073 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4837
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1075
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1147
+#: src/gtkprefs.c:1084
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1171
+#: src/gtkprefs.c:1108
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1114
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1121
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1232
-msgid "Proxy Type"
-msgstr "代理类型"
-
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1128
+msgid "Proxy Server"
+msgstr "代理服务器"
+
+#: src/gtkprefs.c:1132
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1242
-msgid "Proxy Server"
-msgstr "代理服务器"
-
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1194
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1356
+#: src/gtkprefs.c:1250
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1251
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1358
+#: src/gtkprefs.c:1252
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1359
+#: src/gtkprefs.c:1253
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1254
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1255
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1256
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1363
+#: src/gtkprefs.c:1257
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1266
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1317
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1321
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1328
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1330
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1331
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1333
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1347
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3792,79 +3895,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1384
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1387
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1390
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1392
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1395
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1397
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1506
+#: src/gtkprefs.c:1400
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1406
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1412
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1418
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1556
+msgid "Sound Selection"
+msgstr "声音选择"
+
+#: src/gtkprefs.c:1631
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1632
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1634
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1638
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1578
+#: src/gtkprefs.c:1639
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1580
+#: src/gtkprefs.c:1641
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1643
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1650
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1658
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3873,61 +3980,86 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1685
+msgid "Sound Events"
+msgstr "声音事件"
+
+#: src/gtkprefs.c:1736
+msgid "Play"
+msgstr "播放"
+
+#: src/gtkprefs.c:1743
+msgid "Event"
+msgstr "事件"
+
+#: src/gtkprefs.c:1762
+msgid "Test"
+msgstr "测试"
+
+#: src/gtkprefs.c:1766
+msgid "Reset"
+msgstr "重置"
+
+#: src/gtkprefs.c:1770
+msgid "Choose..."
+msgstr "选择..."
+
+#: src/gtkprefs.c:1794
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1797
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1798
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1800
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
-#: src/protocols/yahoo/yahoo.c:2297
+#: src/gtkprefs.c:1803 src/protocols/msn/msn.c:1154
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2729
+#: src/protocols/oscar/oscar.c:3993 src/protocols/yahoo/yahoo.c:2381
+#: src/protocols/yahoo/yahoo_profile.c:651
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1656
+#: src/gtkprefs.c:1804
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1807
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1810
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1812
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1672
+#: src/gtkprefs.c:1820
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1821
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1677
+#: src/gtkprefs.c:1825
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1685
+#: src/gtkprefs.c:1833
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1760
+#: src/gtkprefs.c:1910
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3942,7 +4074,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1915
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3957,104 +4089,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1998
+#: src/gtkprefs.c:2148
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2012
+#: src/gtkprefs.c:2162
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2060
+#: src/gtkprefs.c:2210
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2187
-msgid "Sound Selection"
-msgstr "声音选择"
-
-#: src/gtkprefs.c:2294
-msgid "Play"
-msgstr "播放"
-
-#: src/gtkprefs.c:2301
-msgid "Event"
-msgstr "事件"
-
-#: src/gtkprefs.c:2320
-msgid "Test"
-msgstr "测试"
-
-#: src/gtkprefs.c:2324
-msgid "Reset"
-msgstr "重置"
-
-#: src/gtkprefs.c:2328
-msgid "Choose..."
-msgstr "选择..."
-
-#: src/gtkprefs.c:2463
+#: src/gtkprefs.c:2355
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2499
+#: src/gtkprefs.c:2391
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2394
+msgid "Message Text"
+msgstr "消息文本"
+
+#: src/gtkprefs.c:2395
+msgid "Shortcuts"
+msgstr "快捷键"
+
+#: src/gtkprefs.c:2396
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2501
-msgid "Message Text"
-msgstr "消息文本"
-
-#: src/gtkprefs.c:2502
-msgid "Shortcuts"
-msgstr "快捷键"
-
-#: src/gtkprefs.c:2505
-msgid "IMs"
-msgstr "即时消息"
-
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2397
+msgid "Sounds"
+msgstr "声音"
+
+#: src/gtkprefs.c:2398
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2508
-msgid "Proxy"
-msgstr "代理"
-
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2511
+#: src/gtkprefs.c:2401
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2403
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2514
-msgid "Sounds"
-msgstr "声音"
-
-#: src/gtkprefs.c:2515
-msgid "Sound Events"
-msgstr "声音事件"
-
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2404
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2405
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2520
-msgid "Protocols"
-msgstr "协议"
-
-#: src/gtkprefs.c:2521
+#: src/gtkprefs.c:2408
 msgid "Plugins"
 msgstr "插件"
 
@@ -4078,7 +4170,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4143,13 +4235,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
 #: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
@@ -4158,17 +4250,17 @@
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
-#: src/protocols/silc/util.c:299
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
+#: src/protocols/silc/util.c:300
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkroomlist.c:328
+#: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: src/gtkroomlist.c:397
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
@@ -4371,12 +4463,12 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:378 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:2720
+#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2720
 #: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
-#: src/protocols/yahoo/yahoo.c:2771
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2738
+#: src/protocols/yahoo/yahoo.c:2853
 msgid "Available"
 msgstr "可用"
 
@@ -4388,12 +4480,12 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
-#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
-#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
+#: src/protocols/oscar/oscar.c:5379 src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5481 src/protocols/oscar/oscar.c:6652
+#: src/protocols/oscar/oscar.c:6657 src/protocols/yahoo/yahoo.c:2379
+#: src/protocols/yahoo/yahoo.c:2758 src/protocols/yahoo/yahoo.c:2863
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4416,7 +4508,7 @@
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:104
+#: src/protocols/jabber/jabber.c:105
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4451,11 +4543,10 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
-#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
-#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
-#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/yahoo/yahoo.c:2063 src/protocols/yahoo/yahoo.c:2126
+#: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "无法连接。"
@@ -4481,7 +4572,7 @@
 msgstr "GG 库的关键错误\n"
 
 #: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
@@ -4518,25 +4609,25 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4829
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:617
+#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
 msgid "Nick"
 msgstr "昵称"
 
@@ -4550,20 +4641,22 @@
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
 #: 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:928 src/protocols/msn/msn.c:1307
-#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
-#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
-#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
-#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
-#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1223
+#: src/protocols/msn/msn.c:1531 src/protocols/msn/msn.c:1547
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3806
+#: src/protocols/oscar/oscar.c:4022 src/protocols/toc/toc.c:468
+#: src/protocols/yahoo/yahoo_profile.c:740
+#: src/protocols/yahoo/yahoo_profile.c:777
+#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:1124 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4660,8 +4753,8 @@
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
-#: src/protocols/toc/toc.c:1558
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/toc/toc.c:1543
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -4712,17 +4805,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: 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:3516
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3537
+#: src/protocols/oscar/oscar.c:6085
 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:3518
-#: src/protocols/oscar/oscar.c:6060
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3539
+#: src/protocols/oscar/oscar.c:6086
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4747,36 +4838,19 @@
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-"<B>支持的命令:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG NAMES<BR>NICK OP "
-"DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC UMODE<BR>VOICE "
-"DEVOICE WALLOPS WHOIS<BR>"
-
-#: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-"<B>支持的 IRC 命令:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "未设定话题"
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/yahoo/yahoo_filexfer.c:228
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
@@ -4807,8 +4881,8 @@
 
 #. FIXME: remove this when the ui does it for us.
 #: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
-#: src/protocols/yahoo/yahoo.c:2507
+#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:6756 src/protocols/yahoo/yahoo.c:2585
 msgid "Send File"
 msgstr "发送文件"
 
@@ -4824,7 +4898,7 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
@@ -4833,21 +4907,21 @@
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
 #: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:388 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1345
 #: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/irc/irc.c:542 src/protocols/silc/chat.c:1348
 #: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "话题"
@@ -4861,33 +4935,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:624
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:625
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1555 src/protocols/napster/napster.c:640
 #: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
-#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1576
+#: src/protocols/msn/msn.c:1726 src/protocols/napster/napster.c:645
 #: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1477
 #: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "用户名"
@@ -4914,7 +4988,7 @@
 msgstr " <i>(identified)</i>"
 
 #: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo.c:3058
+#: src/protocols/yahoo/yahoo_profile.c:992
 msgid "Realname"
 msgstr "真名"
 
@@ -4963,109 +5037,265 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:404
+#: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:415
+#: src/protocols/irc/msgs.c:416
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:419
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:423
+#: src/protocols/irc/msgs.c:424
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:444
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:501
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:596
+#: src/protocols/irc/msgs.c:604
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:601
+#: src/protocols/irc/msgs.c:609
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:622
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:709
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:710
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:723
+#: src/protocols/irc/msgs.c:731
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:771
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:765
+#: src/protocols/irc/msgs.c:773
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:848
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:871
+#: src/protocols/irc/msgs.c:885
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;要执行的动作&gt;:执行动作。"
+
+#: src/protocols/irc/parse.c:110
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr "away [消息]:设置离开消息,不尾随消息则代表离开。"
+
+#: src/protocols/irc/parse.c:111
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;昵称1&gt; [昵称2]……:删除某人的管理员状态。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:112
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;昵称1&gt; [昵称2]……:删除某人的频道语音状态,使其无法在频道被管理"
+"(+m)时说话。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:113
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr "invite &lt;昵称&gt; [房间]:邀请某人加入您指定的频道,或者当前频道。"
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]:输入一个或多个频道,如需要的"
+"话可选提供频道密钥。"
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]:输入一个或多个频道,如需"
+"要的话可选提供频道密钥。"
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr "kick &lt;昵称&gt; [消息]:将某人踢出频道。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;要执行的动作&gt;:执行动作。"
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;昵称|频道&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:设置或取消频道或用户模式。"
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr "msg &lt;昵称&gt; &lt;消息&gt;:给用户发送私下消息(与频道相对)。"
+
+#: src/protocols/irc/parse.c:121
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "name [频道]:列出频道中目前的用户。"
+
+#: src/protocols/irc/parse.c:122
+msgid "nick &lt;new nick name&gt;:  Change your nick name."
+msgstr "nick &lt;新昵称&gt;:更改您的昵称。"
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;昵称1&gt; [昵称2]……:为某人授予频道管理员状态。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr "operwall &lt;消息&gt;:如果您不知道这是什么功能,请不要使用。"
+
+#: src/protocols/irc/parse.c:125
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr "part [房间] [消息]:离开当前频道或指定频道,并留下可选的消息。"
+
+#: src/protocols/irc/parse.c:126
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr "ping [昵称]:询问用户发了多长时间呆(若未指定用户则代表服务器)。"
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr "query &lt;昵称&gt; &lt;消息&gt;:给用户发送私下消息(与频道相对)。"
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [消息]:断开与服务器的连接,并留下可选的消息。"
+
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quot [……]:向服务器发送原始命令。"
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr "remove &lt;昵称&gt; [消息]:从房间删除某人。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [新话题]:查看或更改频道话题。"
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:设置或取消用户模式。"
+
+#: src/protocols/irc/parse.c:133
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;昵称1&gt; [昵称2]:为某人授予频道语音状态。您必须是频道管理员。"
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr "wallops &lt;消息&gt;:如果您不知道这是什么功能,请不要使用。"
+
+#: src/protocols/irc/parse.c:135
+msgid "whois &lt;nick&gt;:  Get information on a user."
+msgstr "whois &lt;昵称&gt;:获得用户信息。"
+
+#: src/protocols/irc/parse.c:228 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:320
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
-#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
-#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:686
 msgid "Disconnected."
 msgstr "已断开连接。"
 
@@ -5111,13 +5341,13 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
-#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
-#: src/protocols/yahoo/yahoo.c:3054
+#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1148
+#: src/protocols/silc/buddy.c:1474 src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:987
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
 msgid "URL"
 msgstr "URL"
 
@@ -5138,7 +5368,7 @@
 msgstr "区域"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:637
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -5155,8 +5385,8 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1529
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:982
 msgid "Email"
 msgstr "电子邮件"
 
@@ -5177,7 +5407,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4839
+#: src/protocols/oscar/oscar.c:4865
 msgid "Birthday"
 msgstr "生日"
 
@@ -5196,15 +5426,15 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
+#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2742
 #: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2426
+#: src/protocols/yahoo/yahoo.c:2504
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1558
 msgid "Resource"
 msgstr "资源"
 
@@ -5212,8 +5442,8 @@
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
 #: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "地址"
@@ -5270,467 +5500,525 @@
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
 msgstr "房间列表错误"
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:652
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:690
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:74
+#: src/protocols/jabber/jabber.c:75
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:322
+#: src/protocols/jabber/jabber.c:323
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:325
+#: src/protocols/jabber/jabber.c:326
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
+#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
+#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:431
+#: src/protocols/jabber/jabber.c:432
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
+#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
+#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:601
+#: src/protocols/jabber/jabber.c:602
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
-#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
+#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1531
 #: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:652
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:660
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
+#: src/protocols/jabber/jabber.c:743
+msgid "Logged out"
+msgstr "已登出"
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
-#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/zephyr/zephyr.c:865
+#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2251 src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:786
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:790
+#: src/protocols/jabber/jabber.c:792
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:799
+#: src/protocols/jabber/jabber.c:801
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
-#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
+#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6456
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:910
+#: src/protocols/jabber/jabber.c:912
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:914
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:916
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/jabber.c:919
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:921
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:923
+#: src/protocols/jabber/jabber.c:925
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:945
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:6622
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5469
+#: src/protocols/oscar/oscar.c:6648
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:978
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:979
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/jabber.c:1040
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1046
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1533
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1136
-msgid "Bad Request"
-msgstr "无效请求"
-
 #: src/protocols/jabber/jabber.c:1138
+msgid "Bad Request"
+msgstr "无效请求"
+
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1142
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1144
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1148
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1150
-msgid "Malformed Jabber ID"
-msgstr "Jabber ID 格式错误"
-
 #: src/protocols/jabber/jabber.c:1152
+msgid "Malformed Jabber ID"
+msgstr "Jabber ID 格式错误"
+
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1164
+#: src/protocols/jabber/jabber.c:1166
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1176
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1183
-msgid "Authorization Aborted"
-msgstr "认证被中断"
-
 #: src/protocols/jabber/jabber.c:1185
+msgid "Authorization Aborted"
+msgstr "认证被中断"
+
+#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1196
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1205
-msgid "Bad Format"
-msgstr "格式无效"
-
 #: src/protocols/jabber/jabber.c:1207
+msgid "Bad Format"
+msgstr "格式无效"
+
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1232
-msgid "Policy Violation"
-msgstr "违背策略"
-
 #: src/protocols/jabber/jabber.c:1234
+msgid "Policy Violation"
+msgstr "违背策略"
+
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1240
-msgid "See Other Host"
-msgstr "查看其它主机"
-
 #: src/protocols/jabber/jabber.c:1242
+msgid "See Other Host"
+msgstr "查看其它主机"
+
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1246
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1323
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "无法屏蔽用户 %s"
+
+#: src/protocols/jabber/jabber.c:1375
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "无法踢出用户 %s"
+
+#: src/protocols/jabber/jabber.c:1400
+msgid "config:  Configure a chat room."
+msgstr "config:配置聊天室。"
+
+#: src/protocols/jabber/jabber.c:1403
+msgid "configure:  Configure a chat room."
+msgstr "configure:配置聊天室。"
+
+#: src/protocols/jabber/jabber.c:1406
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;新昵称&gt;:更改您的昵称。"
+
+#: src/protocols/jabber/jabber.c:1410
+msgid "part [room]:  Leave the room."
+msgstr "part [房间]:离开聊天室。"
+
+#: src/protocols/jabber/jabber.c:1413
+msgid "register:  Register with a chat room."
+msgstr "register:注册聊天室。"
+
+#: src/protocols/jabber/jabber.c:1418
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [新话题]:查看或更改话题。"
+
+#: src/protocols/jabber/jabber.c:1422
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr "ban &lt;用户&gt; [房间]:在房间中屏蔽一个用户。"
+
+#: src/protocols/jabber/jabber.c:1426
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr "invite &lt;用户&gt; [房间]:邀请用户加入房间。"
+
+#: src/protocols/jabber/jabber.c:1430
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "join: &lt;房间&gt; [服务器]:加入此服务器上的聊天聊天室。"
+
+#: src/protocols/jabber/jabber.c:1434
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "kick &lt;用户&gt; [房间]:从房间中踢出一个用户。"
+
+#: src/protocols/jabber/jabber.c:1438
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;用户&gt; &lt;消息&gt;:向另外的好友发送私人消息。"
+
+#: src/protocols/jabber/jabber.c:1452
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -5745,24 +6033,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1535
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1388
+#: src/protocols/jabber/jabber.c:1561
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1393
+#: src/protocols/jabber/jabber.c:1566
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1398
+#: src/protocols/jabber/jabber.c:1571
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
+#: src/protocols/jabber/jabber.c:1580 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -5799,39 +6087,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:221
+#: src/protocols/jabber/presence.c:223
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:226
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:279 src/protocols/jabber/presence.c:280
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:279
+#: src/protocols/jabber/presence.c:281
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:285
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:303
+#: src/protocols/jabber/presence.c:307
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:306
+#: src/protocols/jabber/presence.c:310
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -5845,311 +6133,271 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dispatch.c:42
-msgid "Unable to request USR\n"
-msgstr "无法请求 USR\n"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
-msgid "Unable to login using MD5"
-msgstr "无法使用 MD5 登入"
-
-#: src/protocols/msn/dispatch.c:68
-msgid "Unable to send USR"
-msgstr "无法发送 USR"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
-msgid "Requesting to send password"
-msgstr "正在请求发送密码"
-
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr "协议版本不支持"
-
-#: src/protocols/msn/dispatch.c:117
-msgid "Unable to request CVR\n"
-msgstr "无法请求 CVR\n"
-
-#: src/protocols/msn/dispatch.c:126
-msgid "Unable to request INF\n"
-msgstr "无法请求 INF\n"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr "得到无效的 XFR"
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr "无法传送"
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr "无法处理消息。"
-
-#: src/protocols/msn/dispatch.c:232
-msgid "Unable to write to server"
-msgstr "无法写入服务器。"
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
-msgid "Syncing with server"
-msgstr "正在与服务器同步"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr "从服务器读取时出错"
-
-#: src/protocols/msn/error.c:33
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr "杂项错误"
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr "您在其它位置用此用户名登入了。"
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr "MSN 服务器目前维护中。"
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "无法处理消息"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "语法错误(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:40
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "无效的电子邮件地址"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "用户不存在"
 
-#: src/protocols/msn/error.c:47
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "已登入"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "用户名无效"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "已在模式中"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "组太多"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "无效的组"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "用户未在组中"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "组名太长"
 
-#: src/protocols/msn/error.c:89
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "缺少必需域"
 
-#: src/protocols/msn/error.c:107
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "服务暂时不可用"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "命令已禁用"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "文件操作错误"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport 未验证"
 
-#: src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "未期待"
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/error.c:199
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/error.c:207
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/error.c:211
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: src/protocols/msn/error.c:218
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "无效的票证"
 
-#: src/protocols/msn/error.c:222
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:80
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:189
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:238
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6157,92 +6405,96 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:268
+#: src/protocols/msn/msn.c:313
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:270
+#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2361
+#: src/protocols/yahoo/yahoo.c:2740 src/protocols/yahoo/yahoo.c:2854
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2726
 #: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
-#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2363
+#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2855
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
-#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
+#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2371
+#: src/protocols/yahoo/yahoo.c:2750 src/protocols/yahoo/yahoo.c:2859
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
-#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2375
+#: src/protocols/yahoo/yahoo.c:2754 src/protocols/yahoo/yahoo.c:2861
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
 #: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:395
+#: src/protocols/msn/msn.c:482
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:400
+#: src/protocols/msn/msn.c:487
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:404
+#: src/protocols/msn/msn.c:491
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:408
+#: src/protocols/msn/msn.c:495
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:501
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:419
+#: src/protocols/msn/msn.c:506
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:439
+#: src/protocols/msn/msn.c:529
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:447
+#: src/protocols/msn/msn.c:539
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:548
+msgid "Update Buddy Icon"
+msgstr "更新好友图标"
+
+#: src/protocols/msn/msn.c:585
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6250,103 +6502,106 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:805
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
-"允许列表未作任何更改。"
-
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
-msgid "Invalid MSN screen name"
-msgstr "无效的 MSN 用户名"
-
-#: src/protocols/msn/msn.c:842
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
-"屏蔽列表未作任何更改。"
-
-#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr "<html><body><b>获取个人资料出错</b></body></html>"
+#: src/protocols/msn/msn.c:1135 src/protocols/msn/msn.c:1148
+#: src/protocols/msn/msn.c:1154 src/protocols/yahoo/yahoo_profile.c:638
+#: src/protocols/yahoo/yahoo_profile.c:651
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/msn/msn.c:1135
+msgid "MSN ID"
+msgstr "MSN ID"
+
+#: src/protocols/msn/msn.c:1143 src/protocols/yahoo/yahoo_profile.c:646
+#: src/protocols/zephyr/zephyr.c:560
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>别名:</b> %s<br>"
+
+#: src/protocols/msn/msn.c:1220 src/protocols/msn/msn.c:1544
+#: src/protocols/yahoo/yahoo_profile.c:738
+#: src/protocols/yahoo/yahoo_profile.c:826
+msgid "Error retrieving profile"
+msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
+#: src/protocols/msn/msn.c:1291 src/protocols/oscar/oscar.c:4870
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3066
+#: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
+#: src/protocols/msn/msn.c:1298 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3074
+#: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
+#: src/protocols/msn/msn.c:1307 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
+#: src/protocols/msn/msn.c:1314 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
+#: src/protocols/msn/msn.c:1322 src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
-#: src/protocols/msn/msn.c:1452
+#: src/protocols/msn/msn.c:1339 src/protocols/msn/msn.c:1345
+#: src/protocols/msn/msn.c:1352 src/protocols/msn/msn.c:1360
+#: src/protocols/msn/msn.c:1367
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
-#: src/protocols/msn/msn.c:1481
+#: src/protocols/msn/msn.c:1376 src/protocols/msn/msn.c:1382
+#: src/protocols/msn/msn.c:1389 src/protocols/msn/msn.c:1396
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
-#: src/protocols/msn/msn.c:1503
+#: src/protocols/msn/msn.c:1405 src/protocols/msn/msn.c:1411
+#: src/protocols/msn/msn.c:1418
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
-#: src/protocols/yahoo/yahoo.c:3113
+#: src/protocols/msn/msn.c:1427 src/protocols/msn/msn.c:1433
+#: src/protocols/yahoo/yahoo_profile.c:1059
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
+#: src/protocols/msn/msn.c:1441 src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1452 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s 的用户信息不可用"
-
-#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1463 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1463 src/protocols/yahoo/yahoo_profile.c:1113
+msgid "Profile URL"
+msgstr "配置文件 URL"
+
+#: src/protocols/msn/msn.c:1545 src/protocols/yahoo/yahoo_profile.c:1132
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1614
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1619
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6361,77 +6616,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
+#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1721 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1730
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/nexus.c:56
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr "无法连接到服务器"
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "无法写入 MSN Nexus 服务器。"
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus 服务器返回了无效的重定向信息。"
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
 
-#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr "正在请求发送密码"
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
 #: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:355
-msgid "Protocol not supported"
-msgstr "协议不支持"
-
-#: src/protocols/msn/notification.c:386
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
-
-#: src/protocols/msn/notification.c:392
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "您已经被断开。MSN 服务器目前维护中。"
-
-#: src/protocols/msn/notification.c:527
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
-
-#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "用户 %s(%s) 想要将您添加为好友。"
-
-#: src/protocols/msn/notification.c:1351
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr "您 %s 的 MSN 好友列表临时不可用。请稍候再试一次。"
-
-#: src/protocols/msn/notification.c:1612
-msgid "Unable to transfer to notification server"
-msgstr "无法传送到通知服务器。"
-
-#: src/protocols/msn/notification.c:1799
+#: src/protocols/msn/notification.c:1069
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6453,46 +6671,57 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:210
+#: src/protocols/msn/notification.c:1134
+msgid "Syncing with server"
+msgstr "正在与服务器同步"
+
+#: src/protocols/msn/servconn.c:46
 #, c-format
 msgid "Unable to connect to %s server"
 msgstr "无法连接到 %s 服务器"
 
-#: src/protocols/msn/servconn.c:214
+#: src/protocols/msn/servconn.c:50
 #, c-format
 msgid "Error writing to %s server"
 msgstr "从 %s 服务器读取时出错"
 
-#: src/protocols/msn/servconn.c:218
-#, c-format
-msgid ""
-"Error reading from %s server. Lastcommand was:\n"
-" %s"
-msgstr ""
-"从 %s 服务器读取时出错。上个命令是:\n"
-" %s"
-
-#: src/protocols/msn/servconn.c:222
+#: src/protocols/msn/servconn.c:54
+#, c-format
+msgid "Error reading from %s server"
+msgstr "从 %s 服务器读取时出错"
+
+#: src/protocols/msn/servconn.c:58
 #, c-format
 msgid "Unknown error from %s server"
 msgstr "%s 服务器的未知错误"
 
-#: src/protocols/msn/servconn.c:315
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr "账户 %s 的 MSN 错误"
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
-#: src/protocols/msn/switchboard.c:121
+#: src/protocols/msn/switchboard.c:201
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:130
+#: src/protocols/msn/switchboard.c:209
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/switchboard.c:264
-msgid "An MSN message may not have been received."
-msgstr "MSN 消息可能没有收到。"
+#: src/protocols/msn/userlist.c:86
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
+
+#: src/protocols/msn/userlist.c:94
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "用户 %s 想要将 %s 添加为好友。"
 
 #: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
@@ -6536,8 +6765,8 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
-#: src/protocols/toc/toc.c:1274
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6156
+#: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6640,8 +6869,7 @@
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
-msgstr ""
-"您的账户已经被禁用,原因是输错密码的次数太多"
+msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
 
 #: src/protocols/novell/nmuser.c:2094
 msgid "You cannot add the same person twice to a conversation"
@@ -6740,7 +6968,7 @@
 #: 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)。"
+msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
 #: src/protocols/novell/novell.c:779
 #, c-format
@@ -6865,7 +7093,7 @@
 msgstr "此会议已关筹。不会再送出消息。"
 
 #: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/oscar/oscar.c:6458 src/protocols/yahoo/yahoo.c:2383
 msgid "Offline"
 msgstr "离线"
 
@@ -7008,12 +7236,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1527
 #: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6762
 msgid "Get File"
 msgstr "获取文件"
 
@@ -7085,18 +7313,18 @@
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
-#: src/protocols/oscar/oscar.c:6625
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:6651
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:6649
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
-#: src/protocols/oscar/oscar.c:6624
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:6650
 msgid "Occupied"
 msgstr "琐事缠身"
 
@@ -7157,11 +7385,11 @@
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3311
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:869
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
@@ -7196,8 +7424,9 @@
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:210
+#: src/protocols/yahoo/yahoo_filexfer.c:219
+#: src/protocols/yahoo/yahoo_filexfer.c:229
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -7209,7 +7438,7 @@
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
@@ -7260,16 +7489,16 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:3117
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:3303
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3285
+#: src/protocols/oscar/oscar.c:3306
 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 "
@@ -7278,42 +7507,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3342
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3350
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3330
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3381
 #, 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:3365 src/protocols/oscar/oscar.c:3367
+#: src/protocols/oscar/oscar.c:3386 src/protocols/oscar/oscar.c:3388
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
-#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
-#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
-#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
-#: src/protocols/oscar/oscar.c:6097
+#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3547 src/protocols/oscar/oscar.c:3901
+#: src/protocols/oscar/oscar.c:3961 src/protocols/oscar/oscar.c:6077
+#: src/protocols/oscar/oscar.c:6123
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3423
+#: src/protocols/oscar/oscar.c:3444
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7322,11 +7551,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:6083
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3526
+#: src/protocols/oscar/oscar.c:3547
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7336,17 +7565,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3548
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3534
+#: src/protocols/oscar/oscar.c:3555
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3542
+#: src/protocols/oscar/oscar.c:3563
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7359,7 +7588,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3550
+#: src/protocols/oscar/oscar.c:3571
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7372,7 +7601,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7385,32 +7614,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3579
+#: src/protocols/oscar/oscar.c:3600
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3585
+#: src/protocols/oscar/oscar.c:3606
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3610
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3674
+#: src/protocols/oscar/oscar.c:3695
 #, 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:3683
+#: src/protocols/oscar/oscar.c:3704
 #, 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:3692
+#: src/protocols/oscar/oscar.c:3713
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7418,77 +7647,82 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3701
+#: src/protocols/oscar/oscar.c:3722
 #, 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:3710
+#: src/protocols/oscar/oscar.c:3731
 #, 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:3719
+#: src/protocols/oscar/oscar.c:3740
 #, 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:3780
+#: src/protocols/oscar/oscar.c:3797 src/protocols/oscar/oscar.c:4021
+#, c-format
+msgid "Info for %s"
+msgstr "%s 的信息"
+
+#: src/protocols/oscar/oscar.c:3802
 #, 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:3839
+#: src/protocols/oscar/oscar.c:3863
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3864
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3875
+#: src/protocols/oscar/oscar.c:3899
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3981
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3960
+#: src/protocols/oscar/oscar.c:3984
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/oscar/oscar.c:3988 src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4072
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4258
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4450
+#: src/protocols/oscar/oscar.c:4476
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4451
+#: src/protocols/oscar/oscar.c:4477
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7496,166 +7730,166 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4540
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4516
+#: src/protocols/oscar/oscar.c:4542
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4547
+#: src/protocols/oscar/oscar.c:4573
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
+#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
+#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1555
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:4856
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4847
+#: src/protocols/oscar/oscar.c:4873
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4851
+#: src/protocols/oscar/oscar.c:4877
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4882
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4864
+#: src/protocols/oscar/oscar.c:4890
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:4898
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4899
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4900
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4875
+#: src/protocols/oscar/oscar.c:4901
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4903
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4909
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4933
+#: src/protocols/oscar/oscar.c:4959
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:4980
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4984
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4975
+#: src/protocols/oscar/oscar.c:5001
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:5022
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5024
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5026
+#: src/protocols/oscar/oscar.c:5052
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5055
 #, 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:5032
+#: src/protocols/oscar/oscar.c:5058
 #, 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:5035
+#: src/protocols/oscar/oscar.c:5061
 #, 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:5038
+#: src/protocols/oscar/oscar.c:5064
 #, 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:5041
+#: src/protocols/oscar/oscar.c:5067
 #, 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:5044
+#: src/protocols/oscar/oscar.c:5070
 #, 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:5047
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5083
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7664,25 +7898,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5084 src/protocols/oscar/oscar.c:5091
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5128
+#: src/protocols/oscar/oscar.c:5154
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5301
+#: src/protocols/oscar/oscar.c:5327
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5302
+#: src/protocols/oscar/oscar.c:5328
 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 "
@@ -7691,7 +7925,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5329
+#: src/protocols/oscar/oscar.c:5355
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7701,19 +7935,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5334
+#: src/protocols/oscar/oscar.c:5360
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:5376 src/protocols/oscar/oscar.c:6656
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5394
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5369
+#: src/protocols/oscar/oscar.c:5395
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7722,7 +7956,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5435
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7734,11 +7968,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5440
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5500
+#: src/protocols/oscar/oscar.c:5526
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7748,16 +7982,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5527 src/protocols/oscar/oscar.c:5944
+#: src/protocols/oscar/oscar.c:5957
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5637
+#: src/protocols/oscar/oscar.c:5663
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5638
+#: src/protocols/oscar/oscar.c:5664
 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 "
@@ -7766,13 +8000,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
-#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
-#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
+#: src/protocols/oscar/oscar.c:5840 src/protocols/oscar/oscar.c:5841
+#: src/protocols/oscar/oscar.c:5846 src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:6002 src/protocols/oscar/oscar.c:6007
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5917
+#: src/protocols/oscar/oscar.c:5943
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7780,11 +8014,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5943 src/protocols/oscar/oscar.c:5956
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5956
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7794,18 +8028,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6038
 #, 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:6018
+#: src/protocols/oscar/oscar.c:6044
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6077
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7815,17 +8049,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6093
+#: src/protocols/oscar/oscar.c:6119
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6094
+#: src/protocols/oscar/oscar.c:6120
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6097
+#: src/protocols/oscar/oscar.c:6123
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7835,71 +8069,71 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6124
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
+#: src/protocols/oscar/oscar.c:6161 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6183
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6247
+#: src/protocols/oscar/oscar.c:6273
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6404
+#: src/protocols/oscar/oscar.c:6430
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6688
+#: src/protocols/oscar/oscar.c:6714
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6732
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6738
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6750
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6773
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:6803
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6778
+#: src/protocols/oscar/oscar.c:6804
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6785
+#: src/protocols/oscar/oscar.c:6811
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6837
+#: src/protocols/oscar/oscar.c:6863
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6882
+#: src/protocols/oscar/oscar.c:6908
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6885
+#: src/protocols/oscar/oscar.c:6911
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6886
+#: src/protocols/oscar/oscar.c:6912
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7907,75 +8141,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6903
+#: src/protocols/oscar/oscar.c:6929
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6930
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:6931
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6922
+#: src/protocols/oscar/oscar.c:6948
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6949
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7030
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7009
+#: src/protocols/oscar/oscar.c:7035
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7015
+#: src/protocols/oscar/oscar.c:7041
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:7020
+#: src/protocols/oscar/oscar.c:7046
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7051
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7029
+#: src/protocols/oscar/oscar.c:7055
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7038
+#: src/protocols/oscar/oscar.c:7064
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7042
+#: src/protocols/oscar/oscar.c:7068
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7072
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7076
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7083
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7063
+#: src/protocols/oscar/oscar.c:7089
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7068
+#: src/protocols/oscar/oscar.c:7094
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -7990,73 +8224,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7209 src/protocols/oscar/oscar.c:7211
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7204
+#: src/protocols/oscar/oscar.c:7230
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7209
+#: src/protocols/oscar/oscar.c:7235
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
-#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
 #: src/protocols/silc/ft.c:340
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "用户 %s 未出现于网络中"
 
-#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
-#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
-#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: src/protocols/silc/buddy.c:49
+#: src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "无法执行密钥协议"
 
-#: src/protocols/silc/buddy.c:106
+#: src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr "密钥协议中发生了错误"
 
-#: src/protocols/silc/buddy.c:110
+#: src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
 msgstr "密钥协议失败"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
 msgstr "密钥协议时超时"
 
-#: src/protocols/silc/buddy.c:120
+#: src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
 msgstr "密钥协议已中止"
 
-#: src/protocols/silc/buddy.c:125
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
 msgstr "密钥协议已经开始"
 
-#: src/protocols/silc/buddy.c:130
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement cannot be started with yourself"
 msgstr "无法与您自己进行密钥协议"
 
-#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
-#: src/protocols/silc/buddy.c:500
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
 msgstr "远程用户已经从网络中消失了"
 
-#: src/protocols/silc/buddy.c:284
+#: src/protocols/silc/buddy.c:288
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
 
-#: src/protocols/silc/buddy.c:288
+#: src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8067,59 +8301,59 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/protocols/silc/buddy.c:301
+#: src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
 msgstr "密钥协议请求"
 
-#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
-#: src/protocols/silc/buddy.c:451
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
 msgid "IM With Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:410
+#: src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
 
-#: src/protocols/silc/buddy.c:452
+#: src/protocols/silc/buddy.c:459
 msgid "Set IM Password"
 msgstr "设定聊天密码"
 
-#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
 #: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
 #: src/protocols/silc/ops.c:1092
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1650
 msgid "Show Public Key"
 msgstr "显示公钥"
 
-#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:991
 #: src/protocols/silc/chat.c:218
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
 #: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
 #: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
 #: src/protocols/silc/ops.c:999
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
-#: src/protocols/silc/buddy.c:722
+#: src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: src/protocols/silc/buddy.c:725
+#: src/protocols/silc/buddy.c:732
 msgid ""
 "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."
@@ -8127,199 +8361,199 @@
 "除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令来获取公"
 "钥。"
 
-#: src/protocols/silc/buddy.c:1025
+#: src/protocols/silc/buddy.c:1034
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s 好友未出现于网络中"
 
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1037
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要添加好友,您必须导入他/她的公钥。请按[导入]以导入公钥。"
 
-#: src/protocols/silc/buddy.c:1031
+#: src/protocols/silc/buddy.c:1040
 msgid "Import..."
 msgstr "导入..."
 
-#: src/protocols/silc/buddy.c:1118
+#: src/protocols/silc/buddy.c:1127
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: src/protocols/silc/buddy.c:1120
+#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "发现了多个用户使用同样的公钥。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: src/protocols/silc/buddy.c:1122
+#: src/protocols/silc/buddy.c:1131
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: src/protocols/silc/buddy.c:1396
+#: src/protocols/silc/buddy.c:1405
 msgid "Detached"
 msgstr "已脱离"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "多动"
 
-#: src/protocols/silc/buddy.c:1408
+#: src/protocols/silc/buddy.c:1417
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492
 #: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494
 #: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496
 #: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498
 #: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500
 #: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502
 #: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504
 #: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506
 #: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508
 #: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510
 #: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/buddy.c:1512
 #: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1471
+#: src/protocols/silc/buddy.c:1480
 msgid "Modes"
 msgstr "模式"
 
-#: src/protocols/silc/buddy.c:1481
+#: src/protocols/silc/buddy.c:1490
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1511
+#: src/protocols/silc/buddy.c:1520
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1516
+#: src/protocols/silc/buddy.c:1525
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1524
+#: src/protocols/silc/buddy.c:1533
 msgid "Paging"
 msgstr "寻呼"
 
-#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:637
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:639
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:641
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/buddy.c:1537
+#: src/protocols/silc/buddy.c:1546
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1542
+#: src/protocols/silc/buddy.c:1551
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1544
+#: src/protocols/silc/buddy.c:1553
 msgid "Computer"
 msgstr "计算机"
 
-#: src/protocols/silc/buddy.c:1548
+#: src/protocols/silc/buddy.c:1557
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/buddy.c:1550
+#: src/protocols/silc/buddy.c:1559
 msgid "Terminal"
 msgstr "终端"
 
-#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/buddy.c:1570 src/protocols/silc/silc.c:674
 #: src/protocols/silc/silc.c:676
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1576
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1626
-msgid "Reset IM Key"
-msgstr "重置聊天密钥"
-
-#: src/protocols/silc/buddy.c:1631
-msgid "IM with Key Exchange"
-msgstr "带密钥交换开聊"
-
 #: src/protocols/silc/buddy.c:1635
+msgid "Reset IM Key"
+msgstr "重置聊天密钥"
+
+#: src/protocols/silc/buddy.c:1640
+msgid "IM with Key Exchange"
+msgstr "带密钥交换开聊"
+
+#: src/protocols/silc/buddy.c:1644
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1646
+#: src/protocols/silc/buddy.c:1655
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1651
+#: src/protocols/silc/buddy.c:1660
 msgid "Send File..."
 msgstr "发送文件..."
 
-#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1665 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8626,11 +8860,11 @@
 msgid "Channels"
 msgstr "频道"
 
-#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:292
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:293
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
@@ -8988,114 +9222,119 @@
 msgid "Key Length"
 msgstr "密钥长度"
 
-#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:290
+#, c-format
+msgid "%d bits"
+msgstr "%d 位"
+
+#: src/protocols/silc/util.c:297 src/protocols/silc/util.c:298
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: src/protocols/toc/toc.c:166
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:567
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:573
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:579
+#: src/protocols/toc/toc.c:550
 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."
@@ -9103,37 +9342,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:581
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息: %s"
 
-#: src/protocols/toc/toc.c:604
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:644
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:714
+#: src/protocols/toc/toc.c:692
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:902
+#: src/protocols/toc/toc.c:887
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:891
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:892
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -9143,43 +9382,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1417
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1553
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1675
+#: src/protocols/toc/toc.c:1660
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1711
+#: src/protocols/toc/toc.c:1696
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
-#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
+#: src/protocols/toc/toc.c:1741 src/protocols/toc/toc.c:1781
+#: src/protocols/toc/toc.c:1905 src/protocols/toc/toc.c:1993
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1953
+#: src/protocols/toc/toc.c:1938
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2053
+#: src/protocols/toc/toc.c:2038
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2072
 #, 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:2094
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -9195,15 +9434,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2180
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2199
+#: src/protocols/toc/toc.c:2184
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9291,42 +9530,42 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:307
+#: src/protocols/yahoo/yahoo.c:300
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:749
+#: src/protocols/yahoo/yahoo.c:742
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:767
+#: src/protocols/yahoo/yahoo.c:760
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:802
+#: src/protocols/yahoo/yahoo.c:795
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:868
+#: src/protocols/yahoo/yahoo.c:861
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:871
+#: src/protocols/yahoo/yahoo.c:864
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:874
+#: src/protocols/yahoo/yahoo.c:867
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1601
+#: src/protocols/yahoo/yahoo.c:1618
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9336,11 +9575,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1604
+#: src/protocols/yahoo/yahoo.c:1621
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1694
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9348,76 +9587,76 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1680
+#: src/protocols/yahoo/yahoo.c:1697
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1730
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1733
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1719
+#: src/protocols/yahoo/yahoo.c:1736
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "您的账户已锁定,请登录到 Yahoo 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1722
+#: src/protocols/yahoo/yahoo.c:1739
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的错误代码 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1796
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1781
+#: src/protocols/yahoo/yahoo.c:1798
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:1963 src/protocols/yahoo/yahoo.c:2094
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
-#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2226
+#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2744
+#: src/protocols/yahoo/yahoo.c:2856
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/yahoo/yahoo.c:2775
+#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2746
+#: src/protocols/yahoo/yahoo.c:2857
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
-#: src/protocols/yahoo/yahoo.c:2776
+#: src/protocols/yahoo/yahoo.c:2369 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/yahoo/yahoo.c:2858
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:2373 src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2860
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
-#: src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2377 src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/yahoo/yahoo.c:2862
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2457 src/protocols/yahoo/yahoo.c:2484
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2426
+#: src/protocols/yahoo/yahoo.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -9426,76 +9665,30 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2576
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2580
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2562
+#: src/protocols/yahoo/yahoo.c:2640
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2571
+#: src/protocols/yahoo/yahoo.c:2649
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2659
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2585
+#: src/protocols/yahoo/yahoo.c:2663
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:2973
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
-
-#: src/protocols/yahoo/yahoo.c:2996
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr "<b>抱歉,目前不支持非英语的个人资料。</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
-#: src/protocols/yahoo/yahoo.c:3095
-msgid "Hobbies"
-msgstr "嗜好"
-
-#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
-msgid "Latest News"
-msgstr "最新新闻"
-
-#: src/protocols/yahoo/yahoo.c:3121
-msgid "Home Page"
-msgstr "主页"
-
-#: src/protocols/yahoo/yahoo.c:3133
-msgid "Cool Link 1"
-msgstr "酷链接 1"
-
-#: src/protocols/yahoo/yahoo.c:3137
-msgid "Cool Link 2"
-msgstr "酷链接 2"
-
-#: src/protocols/yahoo/yahoo.c:3139
-msgid "Cool Link 3"
-msgstr "酷链接 3"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -9507,27 +9700,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
+#: src/protocols/yahoo/yahoo.c:3178 src/protocols/yahoo/yahoo.c:3180
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3199
+msgid "Yahoo Japan"
+msgstr "Yahoo 日本"
+
+#: src/protocols/yahoo/yahoo.c:3202
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3205
+msgid "Japan Pager host"
+msgstr "日本寻呼主机"
+
+#: src/protocols/yahoo/yahoo.c:3208
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3211
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3214
+msgid "Japan File transfer host"
+msgstr "日本文件传送主机"
+
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3220
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
@@ -9537,6 +9742,62 @@
 "(1,048,576 bytes)."
 msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
 
+#: src/protocols/yahoo/yahoo_profile.c:638
+#: src/protocols/yahoo/yahoo_profile.c:953
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:771
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
+
+#: src/protocols/yahoo/yahoo_profile.c:773
+#: src/protocols/yahoo/yahoo_profile.c:821
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
+
+#: src/protocols/yahoo/yahoo_profile.c:819
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/yahoo/yahoo_profile.c:1034
+#: src/protocols/yahoo/yahoo_profile.c:1038
+msgid "Hobbies"
+msgstr "嗜好"
+
+#: src/protocols/yahoo/yahoo_profile.c:1048
+#: src/protocols/yahoo/yahoo_profile.c:1052
+msgid "Latest News"
+msgstr "最新新闻"
+
+#: src/protocols/yahoo/yahoo_profile.c:1073
+msgid "Home Page"
+msgstr "主页"
+
+#: src/protocols/yahoo/yahoo_profile.c:1088
+msgid "Cool Link 1"
+msgstr "酷链接 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1093
+msgid "Cool Link 2"
+msgstr "酷链接 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1097
+msgid "Cool Link 3"
+msgstr "酷链接 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s 的用户信息不可用"
+
 #: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -9596,11 +9857,6 @@
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:560
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>别名:</b> %s<br>"
-
 #: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
@@ -9665,29 +9921,30 @@
 msgid "Exposure"
 msgstr "暴露"
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:853
+#: src/proxy.c:845
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:857
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1596
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1596
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:177
 msgid "Custom"
 msgstr "自定义"
 
@@ -9698,61 +9955,66 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:60
+#: src/server.c:63
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:917
+#: src/server.c:511
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s 现在叫做 %s。\n"
+
+#: src/server.c:932
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:931
+#: src/server.c:946
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1111 src/server.c:1121
+#: src/server.c:1167 src/server.c:1177
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1134
+#: src/server.c:1190
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1150
+#: src/server.c:1206
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1152
+#: src/server.c:1208
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1167
+#: src/server.c:1222
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/server.c:1181
+#: src/server.c:1234
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1192 src/server.c:1200
+#: src/server.c:1245 src/server.c:1253
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1214
+#: src/server.c:1267
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1264
+#: src/server.c:1329
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -9761,11 +10023,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1267
+#: src/server.c:1332
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1377
+#: src/server.c:1442
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -9774,12 +10036,12 @@
 "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 "%s"
 
-#: src/server.c:1381
+#: src/server.c:1446
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 
-#: src/server.c:1387
+#: src/server.c:1452
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -9788,7 +10050,7 @@
 #. * makes it slightly less boring ;)
 #: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
-msgstr "烦着呢,别理我"
+msgstr "抱歉,我现在不在。请稍候再与我联系。"
 
 #: src/stock.c:86
 msgid "_Alias"
@@ -9806,42 +10068,42 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2132
+#: src/util.c:2353
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2135
+#: src/util.c:2356
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
+#: src/util.c:2389
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
+#: src/util.c:2397
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
+#: src/util.c:2405
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2527
+#: src/util.c:2792
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
 msgstr "正在移动 Gaim 设置..."
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
 msgstr "正在将 Gaim 用户设置移动到:"
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "提示"