changeset 10291:3f09e34b0928

[gaim-migrate @ 11468] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 02 Dec 2004 04:26:07 +0000
parents 9384f4492872
children e6206904848a
files po/ChangeLog po/zh_CN.po
diffstat 2 files changed, 2009 insertions(+), 2099 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Dec 02 00:50:16 2004 +0000
+++ b/po/ChangeLog	Thu Dec 02 04:26:07 2004 +0000
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 2.0.0:
+	* Chinese (Simplified) translation updated (Funda Wang)
 	* English (Canadian) translation updated (Adam Weinberger)
 
 version 1.0.2 (10/19/2004):
--- a/po/zh_CN.po	Thu Dec 02 00:50:16 2004 +0000
+++ b/po/zh_CN.po	Thu Dec 02 04:26:07 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-04 00:00-0400\n"
-"PO-Revision-Date: 2004-10-05 11:55+0800\n"
+"POT-Creation-Date: 2004-12-02 09:52+0800\n"
+"PO-Revision-Date: 2004-12-02 10:12+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"
@@ -144,66 +144,67 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:138 src/gtkaccount.c:738 src/gtkaccount.c:2164
+#: plugins/docklet/docklet.c:140
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:141
+#: plugins/docklet/docklet.c:143
 msgid "New Message..."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:142
+#: plugins/docklet/docklet.c:144
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:178
+#: plugins/docklet/docklet.c:181
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:186 src/gtkprefs.c:1811 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:166 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1004 src/protocols/jabber/jabber.c:974
-#: src/protocols/msn/msn.c:488 src/protocols/novell/novell.c:2806
-#: src/protocols/novell/novell.c:2923 src/protocols/novell/novell.c:2975
-#: src/protocols/oscar/oscar.c:674 src/protocols/oscar/oscar.c:6654
-#: src/protocols/oscar/oscar.c:6873 src/protocols/silc/buddy.c:1384
-#: src/protocols/silc/silc.c:52 src/protocols/zephyr/zephyr.c:2224
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
+#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987
+#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
+#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
+#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
+#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2226
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:194
+#: plugins/docklet/docklet.c:197
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:203
+#: plugins/docklet/docklet.c:206
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:210 src/gtkft.c:628
+#: plugins/docklet/docklet.c:213 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:211 src/gtkaccount.c:2345
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:212 src/gtkprefs.c:2509
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:221
-msgid "Signoff"
+#: plugins/docklet/docklet.c:224
+msgid "Log Out"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:225
+#: plugins/docklet/docklet.c:228
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:538
+#: plugins/docklet/docklet.c:553
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:542
+#: plugins/docklet/docklet.c:557
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -213,19 +214,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:568
+#: plugins/docklet/docklet.c:583
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:571
+#: plugins/docklet/docklet.c:586
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:573
+#: plugins/docklet/docklet.c:588
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -282,7 +283,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:224
+#: plugins/filectl.c:249
 msgid "Gaim File Control"
 msgstr "Gaim 文件控制"
 
@@ -290,7 +291,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:227 plugins/filectl.c:229
+#: plugins/filectl.c:252 plugins/filectl.c:254
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
 
@@ -353,19 +354,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 演示插件"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:93
+#: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "一个范例插件 - 参看描述。"
 
 #. *  description
-#: plugins/gaiminc.c:95
+#: plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -429,81 +430,68 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:134
-#: plugins/gevolution/assoc-buddy.c:72
-msgid "Local Addressbook"
-msgstr "本地地址簿"
-
-#: plugins/gevolution/add_buddy_dialog.c:144
-#: plugins/gevolution/add_buddy_dialog.c:155
-#: plugins/gevolution/assoc-buddy.c:82 plugins/gevolution/assoc-buddy.c:93
-#: src/gtkblist.c:3078 src/gtkprefs.c:988 src/gtkprefs.c:1825
-#: src/protocols/jabber/jabber.c:922
-msgid "None"
-msgstr "无"
-
-#: plugins/gevolution/add_buddy_dialog.c:188
-#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2142
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:599
-#: src/protocols/msn/msn.c:1423 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/add_buddy_dialog.c:132
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
+#: src/protocols/msn/msn.c:1503 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:199
+#: plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:480
+#: plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:493
-#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7177
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:564
-#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4043
-#: src/gtkblist.c:4388
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4024
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:590
-#: plugins/gevolution/assoc-buddy.c:484
+#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:607
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:368
+#: plugins/gevolution/assoc-buddy.c:341
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:447
+#: plugins/gevolution/assoc-buddy.c:429
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:448
+#: plugins/gevolution/assoc-buddy.c:430
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:501
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:90
-#: src/blist.c:769 src/blist.c:976 src/blist.c:1920 src/gtkblist.c:3862
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
+#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3844
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -522,7 +510,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:624
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:623
 msgid "Account"
 msgstr "账户"
 
@@ -544,42 +532,42 @@
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:272
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:296
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:316
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:580
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:351
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:363
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:383
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "电子邮件:"
 
@@ -698,68 +686,68 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:601
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:612
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:619
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:627
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:634
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:653
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:661
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:669
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:674
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:681
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:689
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:697
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:706
+#: plugins/notify.c:704
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -769,7 +757,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:796
+#: plugins/notify.c:794
 msgid "Message Notification"
 msgstr "邮件通知"
 
@@ -777,7 +765,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:799 plugins/notify.c:801
+#: plugins/notify.c:797 plugins/notify.c:799
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
 
@@ -901,35 +889,35 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:414
+#: plugins/spellchk.c:415
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:438
+#: plugins/spellchk.c:439
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:450
+#: plugins/spellchk.c:451
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:476
+#: plugins/spellchk.c:477
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:483
+#: plugins/spellchk.c:484
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:497
+#: plugins/spellchk.c:498
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:539
+#: plugins/spellchk.c:540
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:541 plugins/spellchk.c:542
+#: plugins/spellchk.c:542 plugins/spellchk.c:543
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -957,7 +945,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:318
 msgid "NSS"
 msgstr "NSS"
 
@@ -965,7 +953,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:320 plugins/ssl/ssl-nss.c:322
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
 
@@ -987,35 +975,35 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#: plugins/statenotify.c:38
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
 
-#: plugins/statenotify.c:45
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 回来了。"
 
-#: plugins/statenotify.c:52
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 打起瞌睡。"
 
-#: plugins/statenotify.c:59
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 睡醒了。"
 
-#: plugins/statenotify.c:70
+#: plugins/statenotify.c:74
 msgid "Notify When"
 msgstr "通知情况"
 
-#: plugins/statenotify.c:73
+#: plugins/statenotify.c:77
 msgid "Buddy Goes _Away"
 msgstr "好友离开(_A)"
 
-#: plugins/statenotify.c:76
+#: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
 msgstr "好友瞌睡(_I)"
 
@@ -1025,7 +1013,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:116
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
@@ -1033,7 +1021,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:119 plugins/statenotify.c:122
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1065,19 +1053,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/timestamp.c:186
+#: plugins/timestamp.c:183
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:193
+#: plugins/timestamp.c:190
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:200
+#: plugins/timestamp.c:197
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/timestamp.c:206
+#: plugins/timestamp.c:203
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -1087,7 +1075,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:271
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1095,7 +1083,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:274 plugins/timestamp.c:276
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
@@ -1119,7 +1107,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421 src/gtkprefs.c:937
+#: plugins/win32/transparency/win2ktrans.c:421
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -1170,8 +1158,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3121
-#: src/gtkprefs.c:2423
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3113
+#: src/gtkprefs.c:2178
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1190,8 +1178,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:981
-#: src/gtkprefs.c:2424 src/protocols/msn/msn.c:1760
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
+#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1840
 msgid "Conversations"
 msgstr "对话"
 
@@ -1207,7 +1195,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/account.c:294 src/protocols/jabber/jabber.c:1030
+#: src/account.c:294 src/protocols/jabber/jabber.c:1043
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
@@ -1239,46 +1227,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:359 src/connection.c:192 src/gtkblist.c:2407
-#: src/gtkdialogs.c:385 src/gtkdialogs.c:527 src/gtkdialogs.c:583
-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1077
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:230
-#: src/protocols/msn/msn.c:245 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:275 src/protocols/oscar/oscar.c:3525
-#: src/protocols/oscar/oscar.c:3619 src/protocols/oscar/oscar.c:6964
-#: src/protocols/oscar/oscar.c:7056 src/protocols/oscar/oscar.c:7108
+#: src/account.c:359 src/connection.c:192 src/gtkblist.c:2415
+#: src/gtkdialogs.c:372 src/gtkdialogs.c:515 src/gtkdialogs.c:571
+#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
+#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
+#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1693 src/protocols/silc/silc.c:713
-#: src/protocols/yahoo/yahoo.c:2870 src/protocols/yahoo/yahoo.c:2879
-#: src/request.h:1245
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
+#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
+#: src/request.h:1244
 msgid "OK"
 msgstr "确定"
 
 #: src/account.c:360 src/account.c:398 src/connection.c:193
-#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2408
-#: src/gtkblist.c:4426 src/gtkconn.c:168 src/gtkdialogs.c:386
-#: src/gtkdialogs.c:528 src/gtkdialogs.c:584 src/gtkdialogs.c:682
-#: src/gtkdialogs.c:704 src/gtkdialogs.c:724 src/gtkdialogs.c:760
-#: src/gtkdialogs.c:820 src/gtkdialogs.c:862 src/gtkdialogs.c:897
-#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599
-#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
-#: src/protocols/jabber/buddy.c:517 src/protocols/jabber/chat.c:772
-#: src/protocols/jabber/jabber.c:668 src/protocols/jabber/jabber.c:1078
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:231
-#: src/protocols/msn/msn.c:246 src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:276 src/protocols/msn/msn.c:293
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:3483
-#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3563
-#: src/protocols/oscar/oscar.c:3620 src/protocols/oscar/oscar.c:6965
-#: src/protocols/oscar/oscar.c:7057 src/protocols/oscar/oscar.c:7109
-#: src/protocols/oscar/oscar.c:7178 src/protocols/silc/buddy.c:461
+#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2416
+#: src/gtkblist.c:4411 src/gtkconn.c:168 src/gtkdialogs.c:373
+#: src/gtkdialogs.c:516 src/gtkdialogs.c:572 src/gtkdialogs.c:670
+#: src/gtkdialogs.c:692 src/gtkdialogs.c:712 src/gtkdialogs.c:748
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:852 src/gtkdialogs.c:890
+#: src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:588 src/gtkprivacy.c:601
+#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
+#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
+#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
+#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
+#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
+#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
+#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7190 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
 #: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1694 src/protocols/silc/silc.c:714
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2871
-#: src/protocols/yahoo/yahoo.c:2880 src/request.h:1245 src/request.h:1255
+#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
+#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "取消"
 
@@ -1287,22 +1275,22 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:397 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:516
+#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:809 src/gtkft.c:158 src/protocols/jabber/buddy.c:572
-#: src/protocols/jabber/buddy.c:994 src/protocols/jabber/buddy.c:1011
-#: src/protocols/novell/novell.c:2818
+#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
+#: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:675
+#: src/blist.c:681
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1339
+#: src/blist.c:1352
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1314,18 +1302,18 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1348
+#: src/blist.c:1361
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:2051
+#: src/blist.c:2064
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "分析您的好友列表时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
 
-#: src/blist.c:2054
+#: src/blist.c:2067
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1347,75 +1335,89 @@
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
-#: src/conversation.c:229
-msgid "Unable to send message. The message is too large."
-msgstr "无法发送消息。消息太大。"
-
-#: src/conversation.c:237
+#: src/conversation.c:236
+msgid "Unable to send message: The message is too large."
+msgstr "无法发送消息: 消息太大。"
+
+#: src/conversation.c:239
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "无法给 %s 发送消息。"
+
+#: src/conversation.c:240
+msgid "The message is too large."
+msgstr "消息太长。"
+
+#: src/conversation.c:249
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1953
+#: src/conversation.c:252
+#, c-format
+msgid "Unable to send messge to %s."
+msgstr "无法给 %s 发送消息。"
+
+#: src/conversation.c:2005
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1956
+#: src/conversation.c:2008
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2104
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2055
+#: src/conversation.c:2107
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2096
+#: src/conversation.c:2148
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2098
+#: src/conversation.c:2150
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2219
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2169
+#: src/conversation.c:2221
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2574
+#: src/conversation.c:2626
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2576
+#: src/conversation.c:2628
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1361
+#: src/conversation.c:2630 src/gtkprefs.c:1287
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2580
+#: src/conversation.c:2632
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2582
+#: src/conversation.c:2634
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:147
+#: src/ft.c:148 src/protocols/msn/msn.c:370
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1424,7 +1426,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:151
+#: src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1433,7 +1435,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:155
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1442,30 +1444,30 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:187
+#: src/ft.c:188
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:197
+#: src/ft.c:198
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:204
+#: src/ft.c:205
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:258
+#: src/ft.c:260
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:299
+#: src/ft.c:302
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:303
+#: src/ft.c:306
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1476,37 +1478,37 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:356
+#: src/ft.c:359
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:374
+#: src/ft.c:377
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:866
+#: src/ft.c:870
 #, c-format
 msgid "Transfer of %s complete"
 msgstr "%s 传送完成"
 
-#: src/ft.c:913
+#: src/ft.c:918
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:963
+#: src/ft.c:970
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1012
+#: src/ft.c:1020
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:1014
+#: src/ft.c:1022
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1519,7 +1521,7 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gaim-remote.c:103
+#: src/gaim-remote.c:104
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1538,6 +1540,7 @@
 "       -t, --to=SCREENNAME      Select a target for command\n"
 "       -p, --protocol=PROTO     Specify protocol to use\n"
 "       -f, --from=SCREENNAME    Specify screen name to use\n"
+"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "用法: %s 命令 [选项] [URI]\n"
@@ -1554,24 +1557,25 @@
 "       -t, --to=用户名          选择命令的目标\n"
 "       -p, --protocol=协议      指定要使用的协议\n"
 "       -f, --from=用户名        指定要使用的用户名\n"
+"       -s, --session=会话       指定要使用的 Gaim 会话\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:185 src/gaim-remote.c:203 src/gaim-remote.c:223
-msgid ""
-"Gaim not running (on session 0)\n"
+#: src/gaim-remote.c:193
+#, c-format
+msgid ""
+"Gaim not running (on session %d)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
-"Gaim 未运行(会话 0)\n"
+"Gaim 未运行(会话 %d)\n"
 "是否装入了“远程控制”插件?\n"
 
-#: src/gaim-remote.c:259
+#: src/gaim-remote.c:280
 msgid ""
 "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 "greater than 9999 chars\n"
-msgstr ""
-"参数不够(-t、-f、-p 和 -m 都需要),或者参数超过了 9999 个字符\n"
-
-#: src/gaim-remote.c:270
+msgstr "参数不够(-t、-f、-p 和 -m 都需要),或者参数超过了 9999 个字符\n"
+
+#: src/gaim-remote.c:291
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1611,7 +1615,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:290
+#: src/gaim-remote.c:311
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1619,7 +1623,7 @@
 "\n"
 "关闭 Gaim 的运行副本\n"
 
-#: src/gaim-remote.c:294
+#: src/gaim-remote.c:315
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1627,7 +1631,7 @@
 "\n"
 "将全部账户都设为“离开”默认消息。\n"
 
-#: src/gaim-remote.c:298
+#: src/gaim-remote.c:319
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1635,11 +1639,13 @@
 "\n"
 "将全部账户设为未离开。\n"
 
-#: src/gaim-remote.c:302
+#: src/gaim-remote.c:323
 msgid ""
 "\n"
 "Send instant message\n"
-msgstr "\n发送即时消息\n"
+msgstr ""
+"\n"
+"发送即时消息\n"
 
 #: src/gtkaccount.c:325
 #, c-format
@@ -1661,7 +1667,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4015
+#: src/gtkaccount.c:647 src/gtkblist.c:3996
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1669,7 +1675,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4029 src/gtkblist.c:4374
+#: src/gtkaccount.c:725 src/gtkblist.c:4010 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "别名:"
 
@@ -1677,6 +1683,10 @@
 msgid "Remember password"
 msgstr "记住密码"
 
+#: src/gtkaccount.c:738
+msgid "Auto log in"
+msgstr "自动登录"
+
 #. Build the user options frame.
 #: src/gtkaccount.c:785
 msgid "User Options"
@@ -1722,7 +1732,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1164
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -1738,15 +1748,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1158
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1185
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1203
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -1754,7 +1764,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1240
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -1776,7 +1786,7 @@
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:667
+#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674
 msgid "Register"
 msgstr "注册"
 
@@ -1785,11 +1795,11 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2013 src/gtkrequest.c:246
+#: src/gtkaccount.c:2013 src/gtkrequest.c:263
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4170
+#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
 msgid "Screen Name"
 msgstr "用户名"
 
@@ -1806,15 +1816,19 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:271 src/protocols/irc/irc.c:158
-#: src/protocols/jabber/buddy.c:1000 src/protocols/jabber/jabber.c:962
-#: src/protocols/msn/msn.c:480 src/protocols/oscar/oscar.c:680
-#: src/protocols/oscar/oscar.c:6863 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3097
-#: src/protocols/zephyr/zephyr.c:2217
+#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
+#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
+#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2219
 msgid "Online"
 msgstr "在线"
 
+#: src/gtkaccount.c:2164
+msgid "Auto Log In"
+msgstr "自动登录"
+
 #: src/gtkaccount.c:2172
 msgid "Protocol"
 msgstr "协议"
@@ -1843,243 +1857,243 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2509 src/gtkblist.c:4425 src/gtkconv.c:1500
-#: src/gtkconv.c:3828 src/gtkconv.c:3899 src/gtkrequest.c:247
-#: src/protocols/oscar/oscar.c:3797 src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2509 src/gtkblist.c:4410 src/gtkconv.c:1474
+#: src/gtkconv.c:3788 src/gtkconv.c:3859 src/gtkrequest.c:264
+#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:793
+#: src/gtkblist.c:809
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:830
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:825 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:841 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1097
+#: src/gtkblist.c:1113
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1100
+#: src/gtkblist.c:1116
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1106
+#: src/gtkblist.c:1122
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1112
+#: src/gtkblist.c:1128
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1114 src/gtkblist.c:1211
+#: src/gtkblist.c:1130 src/gtkblist.c:1227
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1124
+#: src/gtkblist.c:1140
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1126
+#: src/gtkblist.c:1142
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1128
+#: src/gtkblist.c:1144
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1131 src/gtkdialogs.c:758 src/gtkdialogs.c:759
+#: src/gtkblist.c:1147 src/gtkdialogs.c:746 src/gtkdialogs.c:747
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:1219 src/gtkblist.c:1233
+#: src/gtkblist.c:1151 src/gtkblist.c:1235 src/gtkblist.c:1249
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1137 src/gtkblist.c:1221 src/gtkblist.c:1238
+#: src/gtkblist.c:1153 src/gtkblist.c:1237 src/gtkblist.c:1254
 #: src/gtkconn.c:364
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1183
+#: src/gtkblist.c:1199
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1185
+#: src/gtkblist.c:1201
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1187
+#: src/gtkblist.c:1203
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1189
+#: src/gtkblist.c:1205
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1207 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1223 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/stock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1235 src/gtkblist.c:1260
+#: src/gtkblist.c:1251 src/gtkblist.c:1276
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1265
+#: src/gtkblist.c:1281
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1482 src/gtkblist.c:1492 src/gtkblist.c:3251
-#: src/gtkblist.c:3254
+#: src/gtkblist.c:1498 src/gtkblist.c:1508 src/gtkblist.c:3255
+#: src/gtkblist.c:3258
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:1933 src/gtkconv.c:4495 src/gtkpounce.c:316
+#: src/gtkblist.c:1949 src/gtkconv.c:4354 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2359
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2360
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2361
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2362
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2363
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2365
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2366
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2367
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2368
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2369
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2363
-msgid "/Buddies/_Signoff"
-msgstr "/好友(B)/登出(_S)"
-
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2371
+msgid "/Buddies/_Log Out"
+msgstr "/好友(B)/登出(_L)"
+
+#: src/gtkblist.c:2372
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2375
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2376
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2377
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2378
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2379
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2373
+#: src/gtkblist.c:2381
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2382
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2383
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2376
+#: src/gtkblist.c:2384
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2377
+#: src/gtkblist.c:2385
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2378
+#: src/gtkblist.c:2386
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2380
+#: src/gtkblist.c:2388
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2391
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2384
+#: src/gtkblist.c:2392
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2385
+#: src/gtkblist.c:2393
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2386
+#: src/gtkblist.c:2394
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:2412
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:2412
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:2413
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2434
+#: src/gtkblist.c:2442
 #, c-format
 msgid ""
 "\n"
@@ -2088,7 +2102,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2096,12 +2110,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2523
+#: src/gtkblist.c:2531
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2539
+#: src/gtkblist.c:2547
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2109,7 +2123,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2540
+#: src/gtkblist.c:2548
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2117,7 +2131,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2541
+#: src/gtkblist.c:2549
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2125,7 +2139,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2542
+#: src/gtkblist.c:2550
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2133,7 +2147,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2543
+#: src/gtkblist.c:2551
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2141,7 +2155,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2544
+#: src/gtkblist.c:2552
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2149,7 +2163,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2544
+#: src/gtkblist.c:2552
 msgid ""
 "\n"
 "<b>Idle</b>"
@@ -2157,7 +2171,7 @@
 "\n"
 "<b>瞌睡</b>"
 
-#: src/gtkblist.c:2546
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2165,7 +2179,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2548
+#: src/gtkblist.c:2556
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2173,7 +2187,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2549
+#: src/gtkblist.c:2557
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2181,7 +2195,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2550
+#: src/gtkblist.c:2558
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2189,88 +2203,93 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2855
+#: src/gtkblist.c:2860
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2857
+#: src/gtkblist.c:2862
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2860
+#: src/gtkblist.c:2865
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:2868
+#: src/gtkblist.c:2873
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2872
+#: src/gtkblist.c:2877
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2994
+#: src/gtkblist.c:3004
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2997
+#: src/gtkblist.c:3007
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3000
+#: src/gtkblist.c:3010
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3080
+#: src/gtkblist.c:3066 src/gtkprefs.c:917 src/gtkprefs.c:1774
+#: src/protocols/jabber/jabber.c:935
+msgid "None"
+msgstr "无"
+
+#: src/gtkblist.c:3068
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3081
+#: src/gtkblist.c:3069
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3070
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3146
+#: src/gtkblist.c:3141
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3153
+#: src/gtkblist.c:3148
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3156
+#: src/gtkblist.c:3151
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3159
+#: src/gtkblist.c:3154
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3247
+#: src/gtkblist.c:3251
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3249
+#: src/gtkblist.c:3253
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3969 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3950 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2800
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3993
+#: src/gtkblist.c:3974
 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. "
@@ -2280,39 +2299,39 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4053 src/gtkblist.c:4354
+#: src/gtkblist.c:4034 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4287
+#: src/gtkblist.c:4272
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4303
+#: src/gtkblist.c:4288
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4320
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4344
+#: src/gtkblist.c:4329
 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:4422
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4423
+#: src/gtkblist.c:4408
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4999 src/gtkblist.c:5096
+#: src/gtkblist.c:4983 src/gtkblist.c:5080
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2321,18 +2340,18 @@
 msgstr "完成。"
 
 #: src/gtkconn.c:157
-msgid "Signon: "
+msgid "Logging in: "
 msgstr "登入:"
 
 #: src/gtkconn.c:203
-msgid "Signon"
+msgid "Logging In"
 msgstr "登入"
 
 #: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:364 src/gtkconn.c:597
+#: src/gtkconn.c:364 src/gtkconn.c:596
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
@@ -2353,32 +2372,32 @@
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:575
+#: src/gtkconn.c:570
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:602
+#: src/gtkconn.c:601
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:632
+#: src/gtkconn.c:631
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:327
+#: src/gtkconv.c:317
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:326
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:360
+#: src/gtkconv.c:350
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:363
+#: src/gtkconv.c:353
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2386,419 +2405,419 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:435
+#: src/gtkconv.c:425
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:442
+#: src/gtkconv.c:432
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:447
+#: src/gtkconv.c:437
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:454
+#: src/gtkconv.c:444
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:457
+#: src/gtkconv.c:447
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:461
+#: src/gtkconv.c:451
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:698 src/gtkconv.c:724
+#: src/gtkconv.c:685 src/gtkconv.c:711
 msgid "That buddy is not on the same protocol as this chat"
 msgstr "该好友不在此聊天的协议中"
 
-#: src/gtkconv.c:718
+#: src/gtkconv.c:705
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:772
+#: src/gtkconv.c:759
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: src/gtkconv.c:789
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:823
+#: src/gtkconv.c:810
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:843
+#: src/gtkconv.c:830
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:899 src/gtkconv.c:2599 src/gtkdebug.c:182
+#: src/gtkconv.c:886 src/gtkconv.c:2557 src/gtkdebug.c:179
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:904
+#: src/gtkconv.c:891
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:918
+#: src/gtkconv.c:905
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:1003 src/gtkdebug.c:131
+#: src/gtkconv.c:990 src/gtkdebug.c:128
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1029 src/gtkdebug.c:159
+#: src/gtkconv.c:1016 src/gtkdebug.c:156
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1448
+#: src/gtkconv.c:1435
 msgid "IM"
 msgstr "开聊"
 
 #. Send File button
-#: src/gtkconv.c:1457 src/gtkconv.c:3821 src/protocols/oscar/oscar.c:595
+#: src/gtkconv.c:1441 src/gtkconv.c:3781 src/protocols/oscar/oscar.c:598
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1466
+#: src/gtkconv.c:1448
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1468 src/gtkprefs.c:812
+#: src/gtkconv.c:1451 src/gtkprefs.c:781
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1477 src/gtkconv.c:3842
+#: src/gtkconv.c:1456 src/gtkconv.c:3802
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1486
-msgid "Get Away Msg"
+#: src/gtkconv.c:1462
+msgid "Get Away Message"
 msgstr "获得离开消息"
 
 #. Remove button
-#: src/gtkconv.c:1498 src/gtkconv.c:3835 src/gtkconv.c:3906
-#: src/gtkrequest.c:248
+#: src/gtkconv.c:1471 src/gtkconv.c:3795 src/gtkconv.c:3866
+#: src/gtkrequest.c:265
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2607
+#: src/gtkconv.c:2565
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2628
+#: src/gtkconv.c:2586
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2658
+#: src/gtkconv.c:2616
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2663
+#: src/gtkconv.c:2621
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2669
+#: src/gtkconv.c:2627
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:2994
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3002
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3105
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3598
+#: src/gtkconv.c:3558
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3600
+#: src/gtkconv.c:3560
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3565
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3607
+#: src/gtkconv.c:3567
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3608
+#: src/gtkconv.c:3568
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3570
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3574
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3615
+#: src/gtkconv.c:3575
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3577
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3619
+#: src/gtkconv.c:3579
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3621
+#: src/gtkconv.c:3581
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3586
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3588
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3590
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3632
+#: src/gtkconv.c:3592
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3639
+#: src/gtkconv.c:3599
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3604
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3608
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3649
+#: src/gtkconv.c:3609
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3610
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3651
+#: src/gtkconv.c:3611
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3612
 msgid "/Options/Show T_imestamps"
 msgstr "/选项/显示时间戳(_I)"
 
-#: src/gtkconv.c:3694
+#: src/gtkconv.c:3654
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3699
+#: src/gtkconv.c:3659
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3663
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3709
+#: src/gtkconv.c:3669
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3713
+#: src/gtkconv.c:3673
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
+#: src/gtkconv.c:3677
+msgid "/Conversation/Invite..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: src/gtkconv.c:3683
+msgid "/Conversation/Alias..."
+msgstr "/对话(C)/别名(L)..."
+
+#: src/gtkconv.c:3687
+msgid "/Conversation/Block..."
+msgstr "/对话(C)/屏蔽(B)..."
+
+#: src/gtkconv.c:3691
+msgid "/Conversation/Add..."
+msgstr "/对话(C)/添加(A)..."
+
+#: src/gtkconv.c:3695
+msgid "/Conversation/Remove..."
+msgstr "/对话(C)/删除(R)..."
+
+#: src/gtkconv.c:3701
+msgid "/Conversation/Insert Link..."
+msgstr "/对话(C)/插入链接(K)..."
+
+#: src/gtkconv.c:3705
+msgid "/Conversation/Insert Image..."
+msgstr "/对话(C)/插入图像(I)..."
+
+#: src/gtkconv.c:3711
+msgid "/Options/Enable Logging"
+msgstr "/选项(O)/允许记录(L)"
+
+#: src/gtkconv.c:3714
+msgid "/Options/Enable Sounds"
+msgstr "/选项(O)/允许声音(S)"
+
 #: src/gtkconv.c:3717
-msgid "/Conversation/Invite..."
-msgstr "/对话(C)/邀请(V)..."
-
-#: src/gtkconv.c:3723
-msgid "/Conversation/Alias..."
-msgstr "/对话(C)/别名(L)..."
-
-#: src/gtkconv.c:3727
-msgid "/Conversation/Block..."
-msgstr "/对话(C)/屏蔽(B)..."
-
-#: src/gtkconv.c:3731
-msgid "/Conversation/Add..."
-msgstr "/对话(C)/添加(A)..."
-
-#: src/gtkconv.c:3735
-msgid "/Conversation/Remove..."
-msgstr "/对话(C)/删除(R)..."
-
-#: src/gtkconv.c:3741
-msgid "/Conversation/Insert Link..."
-msgstr "/对话(C)/插入链接(K)..."
-
-#: src/gtkconv.c:3745
-msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/插入图像(I)..."
-
-#: src/gtkconv.c:3751
-msgid "/Options/Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
-
-#: src/gtkconv.c:3754
-msgid "/Options/Enable Sounds"
-msgstr "/选项(O)/允许声音(S)"
-
-#: src/gtkconv.c:3757
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3760
+#: src/gtkconv.c:3720
 msgid "/Options/Show Timestamps"
 msgstr "/选项/显示时间戳(I)"
 
 #. The buttons, from left to right
 #. Block button
-#: src/gtkconv.c:3814 src/gtkprivacy.c:623 src/gtkprivacy.c:634
+#: src/gtkconv.c:3774 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3815
+#: src/gtkconv.c:3775
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3822
+#: src/gtkconv.c:3782
 msgid "Send a file to the user"
 msgstr "给用户发送文件"
 
-#: src/gtkconv.c:3829
+#: src/gtkconv.c:3789
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3836
+#: src/gtkconv.c:3796
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3843 src/gtkconv.c:4178
+#: src/gtkconv.c:3803 src/gtkconv.c:4124
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Send button
-#: src/gtkconv.c:3849 src/gtkconv.c:3913
+#: src/gtkconv.c:3809 src/gtkconv.c:3873
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:3850 src/gtkconv.c:3914
+#: src/gtkconv.c:3810 src/gtkconv.c:3874
 msgid "Send message"
 msgstr "发送消息"
 
 #. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3892
+#: src/gtkconv.c:3852
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3893
+#: src/gtkconv.c:3853
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:3860
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3907
+#: src/gtkconv.c:3867
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:4031
+#: src/gtkconv.c:3991
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4094
+#: src/gtkconv.c:4040
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:4101
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:4167
+#: src/gtkconv.c:4113
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4786
+#: src/gtkconv.c:4632
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5319 src/gtkconv.c:5348 src/gtkconv.c:5444 src/gtkconv.c:5502
+#: src/gtkconv.c:5167 src/gtkconv.c:5196 src/gtkconv.c:5292 src/gtkconv.c:5350
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6071 src/gtkconv.c:6074
+#: src/gtkconv.c:5923 src/gtkconv.c:5926
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkconv.c:6446
+#: src/gtkconv.c:6247
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6449
+#: src/gtkconv.c:6250
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6452
+#: src/gtkconv.c:6253
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6456
+#: src/gtkconv.c:6257
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:197
+#: src/gtkdebug.c:194
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:247
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:285
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:291
 msgid "Timestamps"
 msgstr "时间戳"
 
@@ -2819,7 +2838,7 @@
 msgstr "Win32 移植"
 
 #: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:70 src/gtkdialogs.c:72
 msgid "developer"
 msgstr "开发者"
 
@@ -2827,180 +2846,179 @@
 msgid "support"
 msgstr "支持"
 
-#: src/gtkdialogs.c:76
+#: src/gtkdialogs.c:77
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/gtkdialogs.c:77
-msgid "former lead developer"
-msgstr "先前领导开发者"
-
 #: src/gtkdialogs.c:78
-msgid "former maintainer"
-msgstr "先前维护者"
+msgid "former lead developer"
+msgstr "先前领导开发者"
 
 #: src/gtkdialogs.c:79
+msgid "former maintainer"
+msgstr "先前维护者"
+
+#: src/gtkdialogs.c:80
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/gtkdialogs.c:80
-msgid "original author"
-msgstr "原作者"
-
 #: src/gtkdialogs.c:81
+msgid "original author"
+msgstr "原作者"
+
+#: src/gtkdialogs.c:82
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:86 src/gtkdialogs.c:123
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:125
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:126 src/gtkdialogs.c:127
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+#: src/gtkdialogs.c:89 src/gtkdialogs.c:128
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:89
+#: src/gtkdialogs.c:90
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:90
+#: src/gtkdialogs.c:91
+msgid "Australian English"
+msgstr "澳大利亚英语"
+
+#: src/gtkdialogs.c:92
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:93
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:129
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+#: src/gtkdialogs.c:95 src/gtkdialogs.c:130
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:96 src/gtkdialogs.c:131
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:98
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:99
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:98
+#: src/gtkdialogs.c:100
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:133
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:134
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:103
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:135
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:105
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:106
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/gtkdialogs.c:105
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:133
-msgid "Polish"
-msgstr "波兰语"
-
 #: src/gtkdialogs.c:107
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:136
+msgid "Polish"
+msgstr "波兰语"
+
+#: src/gtkdialogs.c:109
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:110
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:111
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:137 src/gtkdialogs.c:138
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:113
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:114
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:140
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:116
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:116
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:117
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:118
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:124
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:139
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:138
+#: src/gtkdialogs.c:141
 msgid "Chinese"
 msgstr "中文"
 
-#: src/gtkdialogs.c:180
+#: src/gtkdialogs.c:182
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:195
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#: src/gtkdialogs.c:216
+#: src/gtkdialogs.c:205
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3010,69 +3028,69 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
 "成,并以 GPL 许可协议发行。<BR><BR>"
 
-#: src/gtkdialogs.c:225
+#: src/gtkdialogs.c:214
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/gtkdialogs.c:230
+#: src/gtkdialogs.c:219
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:245
+#: src/gtkdialogs.c:234
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:261
+#: src/gtkdialogs.c:249
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:276
+#: src/gtkdialogs.c:264
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:296
+#: src/gtkdialogs.c:284
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:367 src/gtkdialogs.c:509 src/gtkdialogs.c:564
+#: src/gtkdialogs.c:354 src/gtkdialogs.c:497 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/gtkdialogs.c:373 src/gtkdialogs.c:515 src/gtkdialogs.c:570
+#: src/gtkdialogs.c:360 src/gtkdialogs.c:503 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:380
+#: src/gtkdialogs.c:367
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:382
+#: src/gtkdialogs.c:369
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:522
+#: src/gtkdialogs.c:510
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:524
+#: src/gtkdialogs.c:512
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:578
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:580
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:620
+#: src/gtkdialogs.c:608
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:641
+#: src/gtkdialogs.c:629
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3084,45 +3102,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:650
+#: src/gtkdialogs.c:638
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:657
+#: src/gtkdialogs.c:645
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:678
+#: src/gtkdialogs.c:666
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:679
+#: src/gtkdialogs.c:667
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:681 src/gtkdialogs.c:703 src/gtkdialogs.c:723
-#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:669 src/gtkdialogs.c:691 src/gtkdialogs.c:711
+#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:699
+#: src/gtkdialogs.c:687
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:701
+#: src/gtkdialogs.c:689
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:708
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:709
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:755
+#: src/gtkdialogs.c:743
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3131,35 +3149,35 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:815
+#: src/gtkdialogs.c:805
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:818 src/gtkdialogs.c:819
+#: src/gtkdialogs.c:808 src/gtkdialogs.c:809
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:857
+#: src/gtkdialogs.c:847
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:860 src/gtkdialogs.c:861
+#: src/gtkdialogs.c:850 src/gtkdialogs.c:851
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:891
+#: src/gtkdialogs.c:884
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:895 src/gtkdialogs.c:896
+#: src/gtkdialogs.c:888 src/gtkdialogs.c:889
 msgid "Remove Chat"
 msgstr "删除聊天"
 
@@ -3271,177 +3289,177 @@
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkimhtml.c:615
+#: src/gtkimhtml.c:533
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1060
+#: src/gtkimhtml.c:1016
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1061
+#: src/gtkimhtml.c:1017
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1266
+#: src/gtkimhtml.c:1234
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1278
+#: src/gtkimhtml.c:1246
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1288
+#: src/gtkimhtml.c:1256
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2838
+#: src/gtkimhtml.c:2814
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2846
+#: src/gtkimhtml.c:2822
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2923 src/gtkimhtml.c:2935
+#: src/gtkimhtml.c:2899 src/gtkimhtml.c:2911
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2963
+#: src/gtkimhtml.c:2939
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:164
+#: src/gtkimhtmltoolbar.c:177
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:239
+#: src/gtkimhtmltoolbar.c:255
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:312
+#: src/gtkimhtmltoolbar.c:329
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:395
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:406
+#: src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:410
+#: src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:419
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:488
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:662
+#: src/gtkimhtmltoolbar.c:700 src/gtkimhtmltoolbar.c:778
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:677
+#: src/gtkimhtmltoolbar.c:792
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:880
+#: src/gtkimhtmltoolbar.c:971
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:891
+#: src/gtkimhtmltoolbar.c:982
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:902
+#: src/gtkimhtmltoolbar.c:993
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:1009
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:930
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:947
+#: src/gtkimhtmltoolbar.c:1038
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:959
+#: src/gtkimhtmltoolbar.c:1050
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:971
+#: src/gtkimhtmltoolbar.c:1062
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1077
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:1087
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1007
+#: src/gtkimhtmltoolbar.c:1098
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:302
+#: src/gtklog.c:303
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
 #. Window **********
-#: src/gtklog.c:395 src/gtklog.c:411
+#: src/gtklog.c:391 src/gtklog.c:407
 msgid "System Log"
 msgstr "系统日志"
 
 #. Descriptive label
-#: src/gtknotify.c:216
+#: src/gtknotify.c:218
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:230
+#: src/gtknotify.c:232
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:241
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:244
+#: src/gtknotify.c:246
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3452,7 +3470,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:260
+#: src/gtknotify.c:262
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3463,22 +3481,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:419
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "浏览器命令 <b>%s</b> 无效。"
 
-#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
-#: src/gtknotify.c:581
+#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
+#: src/gtknotify.c:570
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:442 src/gtknotify.c:455
+#: src/gtknotify.c:431 src/gtknotify.c:444
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "调用 <b>%s</b> 出错: %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:571
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
@@ -3492,7 +3510,7 @@
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:894
+#: src/gtkpounce.c:391 src/gtkpounce.c:901
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
@@ -3588,382 +3606,346 @@
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:901
+#: src/gtkpounce.c:908
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:959
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:979
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:981
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:983
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:984
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:431
+#: src/gtkprefs.c:398
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:433
+#: src/gtkprefs.c:400
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:632
 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:702
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:709 src/gtkprefs.c:2179 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:750 src/protocols/jabber/chat.c:761
+#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:774
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:778
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:782
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:784
 msgid "Ignore font _faces"
 msgstr "忽略字体(_F)"
 
-#: src/gtkprefs.c:817
+#: src/gtkprefs.c:786
 msgid "Ignore font si_zes"
 msgstr "较大字体(_Z)"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:789
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:791
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:801
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:804
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:894
-msgid "Send Message"
-msgstr "发送消息"
-
-#: src/gtkprefs.c:895
-msgid "Enter _sends message"
-msgstr "回车键发送消息(_S)"
-
-#: src/gtkprefs.c:897
-msgid "C_ontrol-Enter sends message"
-msgstr "Ctrl+回车键发送消息(_O)"
-
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:904
-msgid "Insertions"
-msgstr "插入"
-
-#: src/gtkprefs.c:905
-msgid "Control-{B/I/U} changes _formatting"
-msgstr "Ctrl+{B/I/U} 更改格式(_F)"
-
-#: src/gtkprefs.c:907
-msgid "Control-(number) _inserts smileys"
-msgstr "Ctrl+数字键插入笑脸(_I)"
-
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:858
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:867
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:938
-msgid "_Raise window on events"
-msgstr "发生事件时激活窗口(_R)"
-
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:872
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:942 src/gtkprefs.c:1004
+#: src/gtkprefs.c:873 src/gtkprefs.c:933
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:875
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:946
+#: src/gtkprefs.c:877
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
+#: src/gtkprefs.c:879
+msgid "_Automatically expand contacts"
+msgstr "自动展开联系人(_A)"
+
+#: src/gtkprefs.c:912
+msgid "Show _buttons as:"
+msgstr "将按钮显示为(_B):"
+
+#: src/gtkprefs.c:914
+msgid "Pictures"
+msgstr "图片"
+
+#: src/gtkprefs.c:915
+msgid "Text"
+msgstr "文字"
+
+#: src/gtkprefs.c:916
+msgid "Pictures and text"
+msgstr "图片和文字"
+
+#: src/gtkprefs.c:923
+msgid "Enable \"_slash\" commands"
+msgstr "允许斜线开头的命令(_S)"
+
+#: src/gtkprefs.c:926
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "将未知的斜线命令发送为消息(_S)"
+
+#: src/gtkprefs.c:929
+msgid "Show _formatting toolbar"
+msgstr "显示格式工具栏(_F)"
+
+#: src/gtkprefs.c:931
+msgid "Show _aliases in tabs/titles"
+msgstr "在标签/标题中显示别名(_A)"
+
+#: src/gtkprefs.c:935
+msgid "Enable buddy ic_on animation"
+msgstr "启用好友图标动画(_O)"
+
+#: src/gtkprefs.c:937
+msgid "_Notify buddies that you are typing to them"
+msgstr "提醒好友您正在打字给他们(_N)"
+
+#: src/gtkprefs.c:939
+msgid "_Raise IM window on events"
+msgstr "发生事件时激活对话窗口(_R)"
+
+#: src/gtkprefs.c:942
+msgid "Raise chat _window on events"
+msgstr "发生事件时激活聊天窗口(_W)"
+
+#. All the tab options!
+#: src/gtkprefs.c:946
+msgid "Tab Options"
+msgstr "标签选项"
+
 #: src/gtkprefs.c:948
-msgid "Dim i_dle buddies"
-msgstr "显示睡着的好友(_D)"
-
-#: src/gtkprefs.c:950
-msgid "_Automatically expand contacts"
-msgstr "自动展开联系人(_A)"
-
-#: src/gtkprefs.c:983
-msgid "Show _buttons as:"
-msgstr "将按钮显示为(_B):"
-
-#: src/gtkprefs.c:985
-msgid "Pictures"
-msgstr "图片"
-
-#: src/gtkprefs.c:986
-msgid "Text"
-msgstr "文字"
-
-#: src/gtkprefs.c:987
-msgid "Pictures and text"
-msgstr "图片和文字"
-
-#: src/gtkprefs.c:994
-msgid "Enable \"_slash\" commands"
-msgstr "允许斜线开头的命令(_S)"
-
-#: src/gtkprefs.c:997
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "将未知的斜线命令发送为消息(_S)"
-
-#: src/gtkprefs.c:1000
-msgid "Show _formatting toolbar"
-msgstr "显示格式工具栏(_F)"
-
-#: src/gtkprefs.c:1002
-msgid "Show _aliases in tabs/titles"
-msgstr "在标签/标题中显示别名(_A)"
-
-#: src/gtkprefs.c:1006
-msgid "Enable buddy ic_on animation"
-msgstr "启用好友图标动画(_O)"
-
-#: src/gtkprefs.c:1008
-msgid "_Notify buddies that you are typing to them"
-msgstr "提醒好友您正在打字给他们(_N)"
-
-#: src/gtkprefs.c:1010
-msgid "_Raise IM window on events"
-msgstr "发生事件时激活对话窗口(_R)"
-
-#: src/gtkprefs.c:1013
-msgid "Raise chat _window on events"
-msgstr "发生事件时激活聊天窗口(_W)"
-
-#: src/gtkprefs.c:1015
-msgid "Use _multi-colored screen names in chats"
-msgstr "在聊天中使用多种颜色来区分用户名(_M)"
-
-#. All the tab options!
-#: src/gtkprefs.c:1019
-msgid "Tab Options"
-msgstr "标签选项"
-
-#: src/gtkprefs.c:1021
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:962
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:965
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:967
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:968
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:1043
+#: src/gtkprefs.c:969
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:970
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:976
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:1101 src/protocols/oscar/oscar.c:746
-#: src/protocols/oscar/oscar.c:5036
+#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
+#: src/protocols/oscar/oscar.c:5045
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1029
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1112
+#: src/gtkprefs.c:1038
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1062
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1139
+#: src/gtkprefs.c:1065
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1142
+#: src/gtkprefs.c:1068
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1075
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1156
+#: src/gtkprefs.c:1082
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1160
+#: src/gtkprefs.c:1086
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1148
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1204
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1205
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1206
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1281
+#: src/gtkprefs.c:1207
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1208
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1209
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1284
+#: src/gtkprefs.c:1210
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1285
+#: src/gtkprefs.c:1211
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1212
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1295
+#: src/gtkprefs.c:1221
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1346
+#: src/gtkprefs.c:1272
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1276
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1283
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1359
+#: src/gtkprefs.c:1285
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1286
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1288
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1302
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3972,75 +3954,75 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1339
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1416
+#: src/gtkprefs.c:1342
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1345
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1347
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1424
+#: src/gtkprefs.c:1350
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1426
+#: src/gtkprefs.c:1352
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1429
-msgid "Log when buddies _sign on/sign off"
-msgstr "记录好友的登入/登出(_S)"
-
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1355
+msgid "Log when buddies log in/log _out"
+msgstr "记录好友的登入/登出(_O)"
+
+#: src/gtkprefs.c:1361
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1441
+#: src/gtkprefs.c:1367
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1447
-msgid "Log your _own signons/idleness/awayness"
-msgstr "记录您自己的登入/瞌睡/离开(_O)"
-
-#: src/gtkprefs.c:1583
+#: src/gtkprefs.c:1373
+msgid "Log your own _signons/idleness/awayness"
+msgstr "记录您自己的登入/瞌睡/离开(_S)"
+
+#: src/gtkprefs.c:1509
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1561
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1636
+#: src/gtkprefs.c:1562
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1564
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1566
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1573
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1574
 msgid "No sounds"
 msgstr "无声音"
 
-#: src/gtkprefs.c:1656
+#: src/gtkprefs.c:1582
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4049,102 +4031,102 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1683
+#: src/gtkprefs.c:1609
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1610
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1686
+#: src/gtkprefs.c:1612
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1696
+#: src/gtkprefs.c:1622
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1747
+#: src/gtkprefs.c:1673
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1754
+#: src/gtkprefs.c:1680
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1699
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1777
+#: src/gtkprefs.c:1703
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1781
+#: src/gtkprefs.c:1707
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:1761
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1764
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1766
 msgid "Never"
 msgstr "从不"
 
-#: src/gtkprefs.c:1818
+#: src/gtkprefs.c:1767
 msgid "When away"
 msgstr "离开时"
 
-#: src/gtkprefs.c:1819
+#: src/gtkprefs.c:1768
 msgid "When away and idle"
 msgstr "离开和瞌睡时"
 
-#: src/gtkprefs.c:1822 src/protocols/msn/msn.c:459
-#: src/protocols/msn/msn.c:1276 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2812 src/protocols/oscar/oscar.c:4183
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:1358 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
+#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1772
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1775
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1829
+#: src/gtkprefs.c:1778
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1831
+#: src/gtkprefs.c:1780
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1839
+#: src/gtkprefs.c:1788
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1840
+#: src/gtkprefs.c:1789
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1844
+#: src/gtkprefs.c:1793
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1852
+#: src/gtkprefs.c:1801
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1921
+#: src/gtkprefs.c:1859
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4159,7 +4141,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1926
+#: src/gtkprefs.c:1864
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4174,63 +4156,55 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2135
+#: src/gtkprefs.c:2073
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2149
+#: src/gtkprefs.c:2087
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2197
+#: src/gtkprefs.c:2135
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2388
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: src/gtkprefs.c:2422
+#: src/gtkprefs.c:2177
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2180
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2426
+#: src/gtkprefs.c:2181
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2427
+#: src/gtkprefs.c:2182
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2183
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2429
+#: src/gtkprefs.c:2184
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2434
+#: src/gtkprefs.c:2189
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2437
+#: src/gtkprefs.c:2192
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2438
+#: src/gtkprefs.c:2193
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2439
-msgid "Away Messages"
-msgstr "离开消息"
-
-#: src/gtkprefs.c:2442
+#: src/gtkprefs.c:2196
 msgid "Plugins"
 msgstr "插件"
 
@@ -4254,63 +4228,63 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1495
+#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:399
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:628
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4318,42 +4292,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:464
-#: src/protocols/msn/msn.c:1291 src/protocols/novell/novell.c:1898
-#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:116
-#: src/request.h:1236
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
+#: src/request.h:1235
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:464
-#: src/protocols/msn/msn.c:1291 src/protocols/novell/novell.c:1899
-#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:117
-#: src/request.h:1236
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
+#: src/request.h:1235
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:244
+#: src/gtkrequest.c:261
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:318
+#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1398
+#: src/gtkrequest.c:1479
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkrequest.c:1399
+#: src/gtkrequest.c:1480
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1437 src/gtkrequest.c:1458
+#: src/gtkrequest.c:1518 src/gtkrequest.c:1539
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1438 src/gtkrequest.c:1459
+#: src/gtkrequest.c:1519 src/gtkrequest.c:1540
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4424,15 +4398,88 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/log.c:109
+#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "装入 %s 时发生了下列错误: %s。"
+
+#: src/gtkutils.c:1401 src/gtkutils.c:1426
+msgid "Failed to load image"
+msgstr "装入图像失败"
+
+#: src/gtkutils.c:1487
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "无法发送文件夹 %s。"
+
+#: src/gtkutils.c:1489
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
+
+#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+msgid "You have dragged an image"
+msgstr "您拖曳了图像"
+
+#: src/gtkutils.c:1517
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
+
+#: src/gtkutils.c:1521 src/gtkutils.c:1536
+msgid "Set as buddy icon"
+msgstr "设置为好友头像"
+
+#: src/gtkutils.c:1522 src/gtkutils.c:1537
+msgid "Send image file"
+msgstr "发送图像文件"
+
+#: src/gtkutils.c:1523 src/gtkutils.c:1537
+msgid "Insert in message"
+msgstr "在消息中插入"
+
+#: src/gtkutils.c:1526
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "您是否想要将其设置为此用户的头像?"
+
+#: src/gtkutils.c:1531
+msgid ""
+"You can send this image as a file transfer orembed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
+
+#: src/gtkutils.c:1533
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: src/gtkutils.c:1587
+msgid "Cannot send launcher"
+msgstr "无法发送启动器"
+
+#: src/gtkutils.c:1587
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr "您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而非启动器自身。"
+
+#: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:533
+#: src/log.c:528
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:596
+#: src/log.c:591
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4441,7 +4488,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:598
+#: src/log.c:593
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4450,25 +4497,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:649 src/log.c:779
+#: src/log.c:644 src/log.c:774
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:659 src/log.c:791
+#: src/log.c:654 src/log.c:786
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:663
+#: src/log.c:658
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:724
+#: src/log.c:719
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:795
+#: src/log.c:790
 msgid "Plain text"
 msgstr "纯文本"
 
@@ -4498,8 +4545,8 @@
 msgstr "首选项(_R)"
 
 #: src/main.c:291
-msgid "_Sign on"
-msgstr "登入(_S)"
+msgid "_Log in"
+msgstr "登入(_L)"
 
 #. full help text
 #: src/main.c:513
@@ -4540,11 +4587,11 @@
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/main.c:841
+#: src/main.c:895
 msgid "Unable to load preferences"
 msgstr "无法装入首选项"
 
-#: src/main.c:841
+#: src/main.c:895
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -4553,33 +4600,33 @@
 "Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。请使"
 "用首选项窗口重新配置您的设置。"
 
-#: src/plugin.c:289
+#: src/plugin.c:304
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:294 src/plugin.c:322
+#: src/plugin.c:309 src/plugin.c:337
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:318
+#: src/plugin.c:333
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: src/prefs.c:113
+#: src/prefs.c:114
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:162
-#: src/protocols/msn/msn.c:484 src/protocols/msn/state.c:29
+#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
+#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2803
-#: src/protocols/novell/novell.c:2922 src/protocols/novell/novell.c:2973
-#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:6868
-#: src/protocols/yahoo/yahoo.c:3100
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
+#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
+#: src/protocols/yahoo/yahoo.c:3128
 msgid "Available"
 msgstr "可用"
 
@@ -4591,9 +4638,9 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:678
-#: src/protocols/oscar/oscar.c:6878 src/protocols/yahoo/yahoo.c:2627
-#: src/protocols/yahoo/yahoo.c:3144
+#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:3172
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4609,14 +4656,14 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1718
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
 #: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:107
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
+#: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4636,197 +4683,199 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:232 src/protocols/oscar/oscar.c:3986
+#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:233 src/protocols/gg/gg.c:1074
-#: src/protocols/napster/napster.c:405 src/protocols/oscar/oscar.c:3990
-#: src/protocols/oscar/oscar.c:4212 src/protocols/silc/ops.c:1086
-#: src/protocols/silc/ops.c:1149 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
+#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1137
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/protocols/gg/gg.c:267 src/protocols/irc/irc.c:154
-#: src/protocols/jabber/buddy.c:998 src/protocols/jabber/jabber.c:957
-#: src/protocols/msn/msn.c:476 src/protocols/novell/novell.c:2815
-#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:6664
-#: src/protocols/oscar/oscar.c:6858 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3094
+#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
+#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
+#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
+#: src/protocols/yahoo/yahoo.c:3122
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/gg/gg.c:277 src/protocols/gg/gg.c:283
-#: src/protocols/gg/gg.c:289 src/protocols/gg/gg.c:295
-#: src/protocols/gg/gg.c:301 src/protocols/gg/gg.c:307
-#: src/protocols/gg/gg.c:313 src/protocols/irc/irc.c:167
-#: src/protocols/jabber/jabber.c:957 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/jabber.c:969 src/protocols/jabber/jabber.c:975
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:987
-#: src/protocols/novell/novell.c:2826 src/protocols/yahoo/yahoo.c:3106
-#: src/protocols/yahoo/yahoo.c:3140 src/protocols/zephyr/zephyr.c:2225
+#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
+#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
+#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
+#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
+#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
+#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
+#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2227
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:327
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:480
+#: src/protocols/gg/gg.c:481
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:487
+#: src/protocols/gg/gg.c:488
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:737 src/protocols/napster/napster.c:487
-#: src/protocols/napster/napster.c:518 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2294
-#: src/protocols/yahoo/yahoo.c:2357 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
+#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
+#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
+#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:753
+#: src/protocols/gg/gg.c:754
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:756
+#: src/protocols/gg/gg.c:757
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:759
+#: src/protocols/gg/gg.c:760
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:762
+#: src/protocols/gg/gg.c:763
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:772
+#: src/protocols/gg/gg.c:773
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:790 src/protocols/gg/gg.c:881
+#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:838
+#: src/protocols/gg/gg.c:839
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:850
+#: src/protocols/gg/gg.c:851
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:855
+#: src/protocols/gg/gg.c:856
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:858
+#: src/protocols/gg/gg.c:859
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:905
+#: src/protocols/gg/gg.c:906
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:981
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:985
+#: src/protocols/gg/gg.c:986
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1011
+#: src/protocols/gg/gg.c:1012
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1016 src/protocols/oscar/oscar.c:5028
+#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1020 src/protocols/jabber/jabber.c:614
-#: src/protocols/oscar/oscar.c:5039 src/protocols/silc/ops.c:808
+#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1025 src/protocols/jabber/jabber.c:619
-#: src/protocols/oscar/oscar.c:5040 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1029 src/protocols/gg/gg.c:1774
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5029
-#: src/protocols/silc/ops.c:1206
+#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1036 src/protocols/gg/gg.c:1039
+#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1045 src/protocols/gg/gg.c:1047
-#: src/protocols/gg/gg.c:1049
+#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
+#: src/protocols/gg/gg.c:1050
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1053 src/protocols/jabber/jabber.c:629
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5091
+#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
+#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1096
+#: src/protocols/gg/gg.c:1097
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1104
+#: src/protocols/gg/gg.c:1105
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1166
+#: src/protocols/gg/gg.c:1167
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1175
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1182
+#: src/protocols/gg/gg.c:1183
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1191
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1200
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1207
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1325
+#: src/protocols/gg/gg.c:1326
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1327
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4834,77 +4883,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1355
+#: src/protocols/gg/gg.c:1356
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1357
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1429
+#: src/protocols/gg/gg.c:1430
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1430 src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1452
+#: src/protocols/gg/gg.c:1453
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1503
+#: src/protocols/gg/gg.c:1504
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1505
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1538
+#: src/protocols/gg/gg.c:1539
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1539
+#: src/protocols/gg/gg.c:1540
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1555
+#: src/protocols/gg/gg.c:1556
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1560 src/protocols/jabber/jabber.c:1091
+#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
 #: src/protocols/toc/toc.c:1571
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1564
+#: src/protocols/gg/gg.c:1565
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1568
+#: src/protocols/gg/gg.c:1569
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1572
+#: src/protocols/gg/gg.c:1573
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1605
+#: src/protocols/gg/gg.c:1606
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1607
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4921,23 +4970,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1753 src/protocols/gg/gg.c:1755
+#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1309
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
 #: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1017
+#: src/protocols/silc/silc.c:1018
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
 #: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/silc/silc.c:1022
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4969,51 +5018,51 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:409
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
-#: src/protocols/irc/irc.c:178
+#: src/protocols/irc/irc.c:181
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:190 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:195 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:227
+#: src/protocols/irc/irc.c:230
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:246 src/protocols/toc/toc.c:199
-#, c-format
-msgid "Signon: %s"
-msgstr "登录名: %s"
-
-#: src/protocols/irc/irc.c:255
+#: src/protocols/irc/irc.c:249
+#, c-format
+msgid "Logging in: %s"
+msgstr "登入: %s"
+
+#: src/protocols/irc/irc.c:258
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:298
-#: src/protocols/oscar/oscar.c:1685 src/protocols/oscar/oscar.c:1752
+#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:406 src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:561 src/protocols/silc/chat.c:1373
+#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
 #: src/protocols/yahoo/yahoochat.c:1398
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1168 src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
 msgid "Topic"
 msgstr "话题"
 
@@ -5025,40 +5074,39 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:671
+#: src/protocols/irc/irc.c:674
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:672
+#: src/protocols/irc/irc.c:675
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:691 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1608 src/protocols/napster/napster.c:672
-#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1130
+#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:694 src/protocols/jabber/jabber.c:1629
-#: src/protocols/msn/msn.c:1883 src/protocols/napster/napster.c:677
-#: src/protocols/silc/silc.c:1603 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642
+#: src/protocols/msn/msn.c:1963 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:697 src/protocols/oscar/oscar.c:7505
-#: src/protocols/zephyr/zephyr.c:2857
-msgid "Encoding"
+#: src/protocols/irc/irc.c:700
+msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:700 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:589 src/protocols/silc/buddy.c:1450
-#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
+#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:703
+#: src/protocols/irc/irc.c:706
 msgid "Real name"
 msgstr "真名"
 
@@ -5091,18 +5139,17 @@
 
 #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
 #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1276 src/protocols/msn/msn.c:1289
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/msn/msn.c:1358 src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "目前位于"
 
@@ -5182,75 +5229,75 @@
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:633
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:654
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:785
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:827
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:902
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:903 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:939
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:109
+#: src/protocols/irc/parse.c:110
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:111
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:112
 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
+#: src/protocols/irc/parse.c:113
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5259,13 +5306,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 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
+#: src/protocols/irc/parse.c:115
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5273,7 +5320,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5281,136 +5328,131 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 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
+#: src/protocols/irc/parse.c:118
 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
+#: src/protocols/irc/parse.c:119
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 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
+#: src/protocols/irc/parse.c:121
 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
+#: src/protocols/irc/parse.c:122
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1439
+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 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
+#: src/protocols/irc/parse.c:125
 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
+#: src/protocols/irc/parse.c:126
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127
 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
+#: src/protocols/irc/parse.c:128
 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
+#: src/protocols/irc/parse.c:129
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 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
+#: src/protocols/irc/parse.c:132
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133
 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
+#: src/protocols/irc/parse.c:134
 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
+#: src/protocols/irc/parse.c:135
 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
+#: src/protocols/irc/parse.c:136
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:242
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr "(转换此信息出错。请检查账户编辑器中的“编码”选项)"
-
-#: src/protocols/irc/parse.c:394
+#: src/protocols/irc/parse.c:414
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:415
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:415
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1582
-#: src/protocols/toc/toc.c:189 src/protocols/toc/toc.c:597
-#: src/protocols/toc/toc.c:613 src/protocols/toc/toc.c:690
+#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
+#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
+#: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "已断开连接。"
 
@@ -5437,191 +5479,193 @@
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:386
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:606
-#: src/protocols/silc/ops.c:804
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:619
-#: src/protocols/silc/ops.c:816
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:623
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:637
-#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1266
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:820
-#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1114
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
+#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1348
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
 #: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:649
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:665
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:661
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:669
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:673
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:677
-#: src/protocols/jabber/jabber.c:639
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/jabber.c:646
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:682
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:693
-#: src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:749
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:711
-#: src/protocols/jabber/buddy.c:719 src/protocols/silc/silc.c:658
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
+#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:744
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
+#: src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:747
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:640
-#: src/protocols/oscar/oscar.c:5064
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
+#: src/protocols/oscar/oscar.c:5073
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:511 src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:513
+#: src/protocols/jabber/buddy.c:561
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:555
+#: src/protocols/jabber/buddy.c:604
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/buddy.c:572
-#: src/protocols/jabber/buddy.c:583 src/protocols/jabber/jabber.c:936
-#: src/protocols/msn/msn.c:457 src/protocols/novell/novell.c:2825
-#: src/protocols/novell/novell.c:2829 src/protocols/oscar/oscar.c:728
-#: src/protocols/oscar/oscar.c:734 src/protocols/oscar/oscar.c:736
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949
+#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
+#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:1611
+#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:627 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:645 src/protocols/jabber/jabber.c:624
-#: src/protocols/oscar/oscar.c:5082 src/protocols/oscar/oscar.c:5090
-#: src/protocols/silc/ops.c:848
+#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
+#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:706
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:763
+#: src/protocols/jabber/buddy.c:812
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:763
+#: src/protocols/jabber/buddy.c:812
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:779
+#: src/protocols/jabber/buddy.c:834
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:1016
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:949
+#: src/protocols/jabber/buddy.c:1019
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:956
+#: src/protocols/jabber/buddy.c:1026
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:962
+#: src/protocols/jabber/buddy.c:1032
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:970
+#: src/protocols/jabber/buddy.c:1040
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:996 src/protocols/jabber/jabber.c:944
+#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1002 src/protocols/jabber/jabber.c:968
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1006 src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1008 src/protocols/jabber/jabber.c:986
-#: src/protocols/oscar/oscar.c:668 src/protocols/oscar/oscar.c:6898
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6363
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
 #: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "房间(_R):"
@@ -5685,12 +5729,9 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:669 src/protocols/jabber/chat.c:680
-msgid "Roomlist Error"
-msgstr "房间列表错误"
-
 #: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
-msgid "Error retreiving roomlist"
+#: src/protocols/silc/ops.c:1239
+msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
 #: src/protocols/jabber/chat.c:729
@@ -5713,423 +5754,423 @@
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:207 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
 #: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
 #: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:245 src/protocols/jabber/jabber.c:265
+#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:325
+#: src/protocols/jabber/jabber.c:328
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:328
+#: src/protocols/jabber/jabber.c:331
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:371 src/protocols/jabber/jabber.c:700
+#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:399 src/protocols/jabber/jabber.c:727
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:737
+#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
 #: src/protocols/trepia/trepia.c:1073
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:434
+#: src/protocols/jabber/jabber.c:441
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:445 src/protocols/jabber/jabber.c:446
+#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:557 src/protocols/jabber/jabber.c:558
+#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1065
+#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:604
+#: src/protocols/jabber/jabber.c:611
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5084
-#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:661
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:662
+#: src/protocols/jabber/jabber.c:669
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:666
+#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:787 src/protocols/msn/msn.c:644
-#: src/protocols/napster/napster.c:511 src/protocols/novell/novell.c:2158
-#: src/protocols/oscar/oscar.c:1756 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2488 src/protocols/zephyr/zephyr.c:1492
+#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
+#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
+#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1493
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:791
+#: src/protocols/jabber/jabber.c:804
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:797
+#: src/protocols/jabber/jabber.c:810
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:806
+#: src/protocols/jabber/jabber.c:819
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:878 src/protocols/jabber/jabber.c:1188
-#: src/protocols/jabber/jabber.c:1229 src/protocols/jabber/jabber.c:1262
-#: src/protocols/oscar/oscar.c:734 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:911
+#: src/protocols/jabber/jabber.c:924
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/jabber.c:926
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:915
+#: src/protocols/jabber/jabber.c:928
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:931
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:920
+#: src/protocols/jabber/jabber.c:933
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:937
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jabber.c:968
-#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jabber.c:980
-#: src/protocols/jabber/jabber.c:986
+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:999
 msgid "Priority"
 msgstr "优先级"
 
-#: src/protocols/jabber/jabber.c:1008
+#: src/protocols/jabber/jabber.c:1021
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1009
+#: src/protocols/jabber/jabber.c:1022
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1013 src/protocols/jabber/jabber.c:1014
+#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1070
+#: src/protocols/jabber/jabber.c:1083
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1075 src/protocols/jabber/jabber.c:1076
+#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1076
+#: src/protocols/jabber/jabber.c:1089
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1086 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1181
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1183
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1185
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1187
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1189
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1193
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1195
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1184
+#: src/protocols/jabber/jabber.c:1197
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1186
+#: src/protocols/jabber/jabber.c:1199
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1203
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1192
+#: src/protocols/jabber/jabber.c:1205
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1209
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1211
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1213
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1215
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1217
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1219
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1221
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1228
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1230
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1233
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1236
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1239
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1244
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1246
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1250
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1252
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1255
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1244 src/protocols/silc/ops.c:1513
+#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1259
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1261
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1263
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1267
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1269
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1258
+#: src/protocols/jabber/jabber.c:1271
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1260
+#: src/protocols/jabber/jabber.c:1273
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1264
+#: src/protocols/jabber/jabber.c:1277
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1279
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:1281
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1283
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1285
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1287
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1289
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1293
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1282
+#: src/protocols/jabber/jabber.c:1295
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1297
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1299
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1353
+#: src/protocols/jabber/jabber.c:1366
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1405
+#: src/protocols/jabber/jabber.c:1418
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1448
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1457
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1449
+#: src/protocols/jabber/jabber.c:1462
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1468
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1461
+#: src/protocols/jabber/jabber.c:1474
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1467
+#: src/protocols/jabber/jabber.c:1480
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1473
+#: src/protocols/jabber/jabber.c:1486
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1479
+#: src/protocols/jabber/jabber.c:1492
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1484
+#: src/protocols/jabber/jabber.c:1497
 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:1499
+#: src/protocols/jabber/jabber.c:1512
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -6143,24 +6184,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1586 src/protocols/jabber/jabber.c:1588
+#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1614
+#: src/protocols/jabber/jabber.c:1627
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1619
+#: src/protocols/jabber/jabber.c:1632
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/jabber.c:1637
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1633 src/protocols/silc/silc.c:1599
+#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6197,49 +6238,49 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:205
+#: src/protocols/jabber/presence.c:255
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:208
+#: src/protocols/jabber/presence.c:258
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:213 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3725 src/protocols/oscar/oscar.c:6292
+#: src/protocols/jabber/presence.c:264 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:214 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3727 src/protocols/oscar/oscar.c:6293
+#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:261 src/protocols/jabber/presence.c:262
+#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:263
+#: src/protocols/jabber/presence.c:314
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:265
+#: src/protocols/jabber/presence.c:316
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:267
+#: src/protocols/jabber/presence.c:318
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:297
+#: src/protocols/jabber/presence.c:355
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:300
+#: src/protocols/jabber/presence.c:358
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -6253,15 +6294,15 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/cmdproc.c:345
+#: src/protocols/msn/cmdproc.c:358
 msgid "Miscellaneous error"
 msgstr "杂项错误"
 
-#: src/protocols/msn/cmdproc.c:348
+#: src/protocols/msn/cmdproc.c:361
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/cmdproc.c:350
+#: src/protocols/msn/cmdproc.c:363
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
@@ -6361,7 +6402,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:195
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6454,8 +6495,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2189
-#: src/protocols/silc/ops.c:1502 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
+#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6489,35 +6530,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:118
+#: src/protocols/msn/msn.c:116
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:224
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:225
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:241
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:256
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:271
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:284
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:285
 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?"
@@ -6525,24 +6566,24 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:289
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:290
 msgid "Disallow"
 msgstr "禁止"
 
+#: src/protocols/msn/msn.c:313
+msgid "Send a mobile message."
+msgstr "发送移动消息。"
+
 #: src/protocols/msn/msn.c:315
-msgid "Send a mobile message."
-msgstr "发送移动消息。"
-
-#: src/protocols/msn/msn.c:317
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:457 src/protocols/msn/msn.c:462
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -6551,70 +6592,74 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:462 src/protocols/msn/msn.c:1289
+#: src/protocols/msn/msn.c:512
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:492 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2609 src/protocols/yahoo/yahoo.c:3111
+#: src/protocols/msn/msn.c:515
+msgid "Blocked"
+msgstr "被屏蔽"
+
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:496 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2809 src/protocols/novell/novell.c:2924
-#: src/protocols/novell/novell.c:2978 src/protocols/silc/buddy.c:1388
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2611
-#: src/protocols/yahoo/yahoo.c:3114
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
+#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3142
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:500 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3126
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:504 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3132
+#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:508 src/protocols/zephyr/zephyr.c:2220
+#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2222
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:520
+#: src/protocols/msn/msn.c:574
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:525
+#: src/protocols/msn/msn.c:579
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:583
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:533
+#: src/protocols/msn/msn.c:587
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:593
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:544
+#: src/protocols/msn/msn.c:598
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:567
+#: src/protocols/msn/msn.c:621
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:577
+#: src/protocols/msn/msn.c:631
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:667
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6622,91 +6667,91 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:1259 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1127
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1266 src/protocols/msn/msn.c:1624
+#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1704
 #: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1354
+#: src/protocols/msn/msn.c:1434
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1359 src/protocols/msn/msn.c:1611
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1691
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1430 src/protocols/oscar/oscar.c:5069
+#: src/protocols/msn/msn.c:1510 src/protocols/oscar/oscar.c:5078
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1437 src/protocols/oscar/oscar.c:5056
+#: src/protocols/msn/msn.c:1517 src/protocols/oscar/oscar.c:5065
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1446 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1453 src/protocols/novell/novell.c:1452
+#: src/protocols/msn/msn.c:1533 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1461 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1541 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1478 src/protocols/msn/msn.c:1484
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1499
-#: src/protocols/msn/msn.c:1506
+#: src/protocols/msn/msn.c:1558 src/protocols/msn/msn.c:1564
+#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1579
+#: src/protocols/msn/msn.c:1586
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1521
-#: src/protocols/msn/msn.c:1528 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608 src/protocols/msn/msn.c:1615
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1544 src/protocols/msn/msn.c:1550
-#: src/protocols/msn/msn.c:1557
+#: src/protocols/msn/msn.c:1624 src/protocols/msn/msn.c:1630
+#: src/protocols/msn/msn.c:1637
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1646 src/protocols/msn/msn.c:1652
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1580 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1660 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1591 src/protocols/silc/ops.c:844
+#: src/protocols/msn/msn.c:1671 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1693
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1614
+#: src/protocols/msn/msn.c:1694
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6715,21 +6760,21 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1698
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: src/protocols/msn/msn.c:1624 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1704 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
-#: src/protocols/msn/msn.c:1765
+#: src/protocols/msn/msn.c:1845
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1770
+#: src/protocols/msn/msn.c:1850
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6743,15 +6788,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1857 src/protocols/msn/msn.c:1859
+#: src/protocols/msn/msn.c:1937 src/protocols/msn/msn.c:1939
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1878 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1958 src/protocols/trepia/trepia.c:1298
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1887
+#: src/protocols/msn/msn.c:1967
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6772,11 +6817,18 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2483
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:1095
+#: src/protocols/msn/notification.c:723
+#, 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:1119
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6798,7 +6850,7 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/notification.c:1160
+#: src/protocols/msn/notification.c:1185
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
@@ -6822,12 +6874,7 @@
 msgid "Unknown error from %s server"
 msgstr "%s 服务器的未知错误"
 
-#: src/protocols/msn/servconn.c:72
-#, c-format
-msgid "MSN error for account %s"
-msgstr "账户 %s 的 MSN 错误"
-
-#: src/protocols/msn/servconn.c:346
+#: src/protocols/msn/servconn.c:351
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
@@ -6835,68 +6882,93 @@
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/switchboard.c:172
+#: src/protocols/msn/switchboard.c:197
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:180
+#: src/protocols/msn/switchboard.c:216
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/switchboard.c:485
+msgid "Message could not be sent, not allowed while invisible"
+msgstr "消息未发出,隐身时不允许"
+
+#: src/protocols/msn/switchboard.c:488
+msgid "Message could not be sent because the user is offline"
+msgstr "消息未发出,因为用户处于离线状态"
+
+#: src/protocols/msn/switchboard.c:491
+msgid "Message could not be sent because a connection error occured"
+msgstr "消息未发出,因为发生了连接错误"
+
+#: src/protocols/msn/switchboard.c:494
+msgid "Message could not be sent for an unknown reason"
+msgstr "消息未发出,原因未知"
+
+#: src/protocols/msn/switchboard.c:499
+#, c-format
+msgid ""
+"%s:\n"
+"%s"
+msgstr ""
+"%s:\n"
+"%s"
+
+#: 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:93
+#: src/protocols/msn/userlist.c:95
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "用户 %s 想要将 %s 添加为好友。"
 
-#: src/protocols/napster/napster.c:242
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:256
+#: src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:319
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:330
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:338
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:396
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:434
+#: src/protocols/napster/napster.c:433
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:440
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6910,7 +6982,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
+#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -7044,112 +7116,112 @@
 msgid "Login failed (%s)."
 msgstr "登录失败(%s)。"
 
-#: src/protocols/novell/novell.c:230
+#: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:379
+#: src/protocols/novell/novell.c:381
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:405
+#: src/protocols/novell/novell.c:407
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "无法发送消息(%s)。"
 
-#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "无法邀请用户(%s)。"
 
-#: src/protocols/novell/novell.c:515
+#: src/protocols/novell/novell.c:517
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:520
+#: src/protocols/novell/novell.c:522
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "无法发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:567
+#: src/protocols/novell/novell.c:569
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:615
+#: src/protocols/novell/novell.c:617
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:688
+#: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "无法获得用户 %s 的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
-#: src/protocols/novell/novell.c:781
+#: src/protocols/novell/novell.c:783
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "无法将“%s”添加到您的好友列表中(%s)。"
 
-#: src/protocols/novell/novell.c:834
+#: src/protocols/novell/novell.c:836
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "无法将 %s 添加到您的许可列表中(%s)。"
 
-#: src/protocols/novell/novell.c:902
+#: src/protocols/novell/novell.c:904
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1627
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
 
-#: src/protocols/novell/novell.c:997
+#: src/protocols/novell/novell.c:999
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1666
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1450
+#: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
 msgstr "电话号码"
 
-#: src/protocols/novell/novell.c:1454
-msgid "Department"
-msgstr "部门"
-
 #: src/protocols/novell/novell.c:1456
+msgid "Department"
+msgstr "部门"
+
+#: src/protocols/novell/novell.c:1458
 msgid "Personal Title"
 msgstr "个人称谓"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1462 src/protocols/oscar/oscar.c:5042
-#: src/protocols/oscar/oscar.c:5049
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5058
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/novell/novell.c:1478
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr "用户 ID"
 
@@ -7160,46 +7232,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1492
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1513
+#: src/protocols/novell/novell.c:1515
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1617
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1642
+#: src/protocols/novell/novell.c:1644
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1672
+#: src/protocols/novell/novell.c:1674
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1706
+#: src/protocols/novell/novell.c:1708
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1721
+#: src/protocols/novell/novell.c:1723
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1856
+#: src/protocols/novell/novell.c:1858
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1883
+#: src/protocols/novell/novell.c:1885
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1884
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7210,15 +7282,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1888
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1994
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:2045
+#: src/protocols/novell/novell.c:2050
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7228,25 +7300,25 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2143
+#: src/protocols/novell/novell.c:2148
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2165
+#: src/protocols/novell/novell.c:2170
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2469
+#: src/protocols/novell/novell.c:2474
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2925 src/protocols/novell/novell.c:2981
+#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3375
+#: src/protocols/novell/novell.c:3380
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -7260,292 +7332,292 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3474 src/protocols/novell/novell.c:3476
+#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3495
+#: src/protocols/novell/novell.c:3500
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3499
+#: src/protocols/novell/novell.c:3504
 msgid "Server port"
 msgstr "服务器端口"
 
+#: src/protocols/oscar/oscar.c:190
+msgid "Invalid error"
+msgstr "无效错误"
+
 #: src/protocols/oscar/oscar.c:191
-msgid "Invalid error"
-msgstr "无效错误"
-
-#: src/protocols/oscar/oscar.c:192
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:192
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:193
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:195
 msgid "Service unavailable"
 msgstr "服务不可用"
 
+#: src/protocols/oscar/oscar.c:196
+msgid "Service not defined"
+msgstr "服务未定义"
+
 #: src/protocols/oscar/oscar.c:197
-msgid "Service not defined"
-msgstr "服务未定义"
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
+msgid "Not supported by host"
+msgstr "主机不支持"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Not supported by host"
-msgstr "主机不支持"
-
-#: src/protocols/oscar/oscar.c:200
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:200
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:202
 msgid "Responses lost"
 msgstr "响应丢失"
 
+#: src/protocols/oscar/oscar.c:203
+msgid "Request denied"
+msgstr "请求被禁止"
+
 #: src/protocols/oscar/oscar.c:204
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Busted SNAC payload"
+msgstr "SNAC 有效负载激增"
 
 #: src/protocols/oscar/oscar.c:205
-msgid "Busted SNAC payload"
-msgstr "SNAC 有效负载激增"
+msgid "Insufficient rights"
+msgstr "权限不够"
 
 #: src/protocols/oscar/oscar.c:206
-msgid "Insufficient rights"
-msgstr "权限不够"
-
-#: src/protocols/oscar/oscar.c:207
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:207
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:208
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:209
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
+#: src/protocols/oscar/oscar.c:210
+msgid "No match"
+msgstr "无匹配"
+
 #: src/protocols/oscar/oscar.c:211
-msgid "No match"
-msgstr "无匹配"
+msgid "List overflow"
+msgstr "列表溢出"
 
 #: src/protocols/oscar/oscar.c:212
-msgid "List overflow"
-msgstr "列表溢出"
+msgid "Request ambiguous"
+msgstr "请求含糊"
 
 #: src/protocols/oscar/oscar.c:213
-msgid "Request ambiguous"
-msgstr "请求含糊"
-
-#: src/protocols/oscar/oscar.c:214
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:214
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:402 src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:583
+#: src/protocols/oscar/oscar.c:586
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:589
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:589 src/protocols/silc/silc.c:656
+#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/oscar/oscar.c:7005
+#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:599
+#: src/protocols/oscar/oscar.c:602
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:605
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:608
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:608
+#: src/protocols/oscar/oscar.c:611
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:611
+#: src/protocols/oscar/oscar.c:614
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:614
+#: src/protocols/oscar/oscar.c:617
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:620
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:623
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:626
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:629
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:629
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:632
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
 
 #: src/protocols/oscar/oscar.c:635
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:638
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:641
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:645
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:648
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:651
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:6888
+#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:670 src/protocols/oscar/oscar.c:6903
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:672 src/protocols/oscar/oscar.c:6893
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:676
+#: src/protocols/oscar/oscar.c:679
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:752
+#: src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:761
+#: src/protocols/oscar/oscar.c:764
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:896
+#: src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:898
+#: src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:905
+#: src/protocols/oscar/oscar.c:909
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:982 src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1063
+#: src/protocols/oscar/oscar.c:1067
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1480
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1490
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1520
+#: src/protocols/oscar/oscar.c:1525
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1524
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1528 src/protocols/oscar/oscar.c:3482
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/toc/toc.c:881
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:1619
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1695
+#: src/protocols/oscar/oscar.c:1700
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1709
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7555,46 +7627,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1740
+#: src/protocols/oscar/oscar.c:1745
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1843 src/protocols/oscar/oscar.c:2281
+#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1851
+#: src/protocols/oscar/oscar.c:1856
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1964 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1969
+#: src/protocols/oscar/oscar.c:1974
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2041
+#: src/protocols/oscar/oscar.c:2046
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2166 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2171
+#: src/protocols/oscar/oscar.c:2176
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2175
+#: src/protocols/oscar/oscar.c:2180
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2185
 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."
@@ -7602,21 +7674,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2190
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2216
+#: src/protocols/oscar/oscar.c:2221
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2288
+#: src/protocols/oscar/oscar.c:2293
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2324 src/protocols/oscar/oscar.c:2354
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
+#: src/protocols/oscar/oscar.c:2448
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7624,20 +7696,20 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2327 src/protocols/oscar/oscar.c:2357
+#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2451
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3473
+#: src/protocols/oscar/oscar.c:3481
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3476
+#: src/protocols/oscar/oscar.c:3484
 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 "
@@ -7646,41 +7718,41 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3515
+#: src/protocols/oscar/oscar.c:3523
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3523
+#: src/protocols/oscar/oscar.c:3531
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3524
+#: src/protocols/oscar/oscar.c:3532
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:3562
 #, 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:3559 src/protocols/oscar/oscar.c:3561
+#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3609 src/protocols/oscar/oscar.c:3611
-#: src/protocols/oscar/oscar.c:3618 src/protocols/oscar/oscar.c:3715
-#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6284
-#: src/protocols/oscar/oscar.c:6330
+#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
+#: src/protocols/oscar/oscar.c:6338
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3625
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3715
+#: src/protocols/oscar/oscar.c:3723
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7689,11 +7761,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3723 src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3735
+#: src/protocols/oscar/oscar.c:3743
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7703,17 +7775,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3736
+#: src/protocols/oscar/oscar.c:3744
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3743
+#: src/protocols/oscar/oscar.c:3751
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3751
+#: src/protocols/oscar/oscar.c:3759
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7726,7 +7798,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3759
+#: src/protocols/oscar/oscar.c:3767
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7739,7 +7811,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:3775
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7752,32 +7824,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3788
+#: src/protocols/oscar/oscar.c:3796
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3794
+#: src/protocols/oscar/oscar.c:3802
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3798
+#: src/protocols/oscar/oscar.c:3806
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3890
 #, 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:3891
+#: src/protocols/oscar/oscar.c:3899
 #, 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:3900
+#: src/protocols/oscar/oscar.c:3908
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7785,93 +7857,93 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3917
 #, 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:3918
+#: src/protocols/oscar/oscar.c:3926
 #, 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:3927
+#: src/protocols/oscar/oscar.c:3935
 #, 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:3981 src/protocols/oscar/oscar.c:4211
-#: src/protocols/silc/ops.c:1085 src/protocols/silc/ops.c:1147
+#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:4047
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4056
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4083
+#: src/protocols/oscar/oscar.c:4092
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4083 src/protocols/oscar/oscar.c:4088
-#: src/protocols/oscar/oscar.c:4146 src/protocols/oscar/oscar.c:4150
+#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
+#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4086
+#: src/protocols/oscar/oscar.c:4095
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4146
+#: src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4149
+#: src/protocols/oscar/oscar.c:4158
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4180
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4174
+#: src/protocols/oscar/oscar.c:4184
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4178 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4262
+#: src/protocols/oscar/oscar.c:4273
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4448
+#: src/protocols/oscar/oscar.c:4459
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4668
+#: src/protocols/oscar/oscar.c:4679
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4669
+#: src/protocols/oscar/oscar.c:4680
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7879,158 +7951,158 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4738
+#: src/protocols/oscar/oscar.c:4747
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4740
+#: src/protocols/oscar/oscar.c:4749
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4771
+#: src/protocols/oscar/oscar.c:4780
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5054 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5056 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5056 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5081
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5076
+#: src/protocols/oscar/oscar.c:5085
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5090
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5085 src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5098
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5097
+#: src/protocols/oscar/oscar.c:5106
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5107
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5108
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5109
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5111
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5121
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5161
+#: src/protocols/oscar/oscar.c:5170
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:5182
+#: src/protocols/oscar/oscar.c:5191
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5186
+#: src/protocols/oscar/oscar.c:5195
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:5203
+#: src/protocols/oscar/oscar.c:5212
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5224
+#: src/protocols/oscar/oscar.c:5233
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/oscar/oscar.c:5235
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5257
+#: src/protocols/oscar/oscar.c:5266
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:5269
 #, 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:5263
+#: src/protocols/oscar/oscar.c:5272
 #, 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:5266
+#: src/protocols/oscar/oscar.c:5275
 #, 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:5269
+#: src/protocols/oscar/oscar.c:5278
 #, 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:5272
+#: src/protocols/oscar/oscar.c:5281
 #, 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:5275
+#: src/protocols/oscar/oscar.c:5284
 #, 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:5278
+#: src/protocols/oscar/oscar.c:5287
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5288
+#: src/protocols/oscar/oscar.c:5297
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8039,25 +8111,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5289 src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5294
+#: src/protocols/oscar/oscar.c:5303
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5370
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:5505
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5506
 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 "
@@ -8066,7 +8138,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8076,15 +8148,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/oscar/oscar.c:5538
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:5569
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5564
+#: src/protocols/oscar/oscar.c:5570
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8093,7 +8165,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5612
+#: src/protocols/oscar/oscar.c:5615
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8105,11 +8177,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5617
+#: src/protocols/oscar/oscar.c:5620
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5693
+#: src/protocols/oscar/oscar.c:5700
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8119,16 +8191,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5695 src/protocols/oscar/oscar.c:6150
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
+#: src/protocols/oscar/oscar.c:6172
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5856
+#: src/protocols/oscar/oscar.c:5864
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5857
+#: src/protocols/oscar/oscar.c:5865
 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 "
@@ -8137,13 +8209,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6047 src/protocols/oscar/oscar.c:6208
-#: src/protocols/oscar/oscar.c:6209 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
+#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
+#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:6156
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8151,11 +8223,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6148 src/protocols/oscar/oscar.c:6162
+#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6162
+#: src/protocols/oscar/oscar.c:6170
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8165,18 +8237,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6245
+#: src/protocols/oscar/oscar.c:6253
 #, 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:6251
+#: src/protocols/oscar/oscar.c:6259
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6292
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8186,17 +8258,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6326
+#: src/protocols/oscar/oscar.c:6334
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6327
+#: src/protocols/oscar/oscar.c:6335
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6330
+#: src/protocols/oscar/oscar.c:6338
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8206,76 +8278,76 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6339
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6368 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6414
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6503
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6638
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6961
+#: src/protocols/oscar/oscar.c:6973
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:6962
+#: src/protocols/oscar/oscar.c:6974
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:6993
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6987
+#: src/protocols/oscar/oscar.c:6999
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7011
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7016
+#: src/protocols/oscar/oscar.c:7028
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7058
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7047
+#: src/protocols/oscar/oscar.c:7059
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7054
+#: src/protocols/oscar/oscar.c:7066
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7118
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7151
+#: src/protocols/oscar/oscar.c:7163
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7154
+#: src/protocols/oscar/oscar.c:7166
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7155
+#: src/protocols/oscar/oscar.c:7167
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8283,71 +8355,71 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7172
+#: src/protocols/oscar/oscar.c:7184
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7173
+#: src/protocols/oscar/oscar.c:7185
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7174
+#: src/protocols/oscar/oscar.c:7186
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7255 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7260
+#: src/protocols/oscar/oscar.c:7272
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7265 src/protocols/silc/silc.c:806
+#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7270
+#: src/protocols/oscar/oscar.c:7282
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7274
+#: src/protocols/oscar/oscar.c:7286
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7295
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7299
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7291
+#: src/protocols/oscar/oscar.c:7303
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7295
+#: src/protocols/oscar/oscar.c:7307
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7302
+#: src/protocols/oscar/oscar.c:7314
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7308
+#: src/protocols/oscar/oscar.c:7320
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7313
+#: src/protocols/oscar/oscar.c:7325
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7382
+#: src/protocols/oscar/oscar.c:7394
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7385
+#: src/protocols/oscar/oscar.c:7397
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8361,18 +8433,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7478 src/protocols/oscar/oscar.c:7480
+#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7499
+#: src/protocols/oscar/oscar.c:7511
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7502
+#: src/protocols/oscar/oscar.c:7514
 msgid "Auth port"
 msgstr "认证端口"
 
+#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2860
+msgid "Encoding"
+msgstr "编码"
+
 #: 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:338
@@ -8456,12 +8532,12 @@
 msgstr "设定聊天密码"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
+#: src/protocols/silc/ops.c:1286
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
@@ -8474,14 +8550,14 @@
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
-#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
-#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1102
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
@@ -8556,91 +8632,91 @@
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:631
+#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:633
+#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "用户模式"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:699 src/protocols/silc/silc.c:701
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "地理位置"
 
@@ -8660,7 +8736,7 @@
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1411
+#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8768,7 +8844,7 @@
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1691
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
 msgid "Passphrase"
 msgstr "密码句"
 
@@ -8865,11 +8941,11 @@
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:909
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:910
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -8896,7 +8972,7 @@
 msgstr "密钥协议失败"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer sessions does not exist"
+msgid "File transfer session does not exist"
 msgstr "文件传送会话不存在"
 
 #: src/protocols/silc/ft.c:206
@@ -8919,150 +8995,142 @@
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
-#: src/protocols/silc/ops.c:357
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
 
-#: src/protocols/silc/ops.c:423
+#: src/protocols/silc/ops.c:425
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:427
+#: src/protocols/silc/ops.c:429
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:460
+#: src/protocols/silc/ops.c:462
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:468
+#: src/protocols/silc/ops.c:470
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:497
+#: src/protocols/silc/ops.c:499
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
 
-#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
-#: src/protocols/silc/ops.c:537
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
-#: src/protocols/silc/ops.c:568
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:614
+#: src/protocols/silc/ops.c:616
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:801
+#: src/protocols/silc/ops.c:803
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:824
+#: src/protocols/silc/ops.c:826
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:828
+#: src/protocols/silc/ops.c:830
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:832
+#: src/protocols/silc/ops.c:834
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:836
+#: src/protocols/silc/ops.c:838
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:840
+#: src/protocols/silc/ops.c:842
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:859
+#: src/protocols/silc/ops.c:861
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:864
+#: src/protocols/silc/ops.c:866
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:912
+#: src/protocols/silc/ops.c:914
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:1082
+#: src/protocols/silc/ops.c:1084
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1157 src/protocols/silc/silc.c:798
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1157
+#: src/protocols/silc/ops.c:1159
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1168
+#: src/protocols/silc/ops.c:1170
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1206
+#: src/protocols/silc/ops.c:1202
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: src/protocols/silc/ops.c:1243
-msgid "Roomlist"
-msgstr "房间列表"
-
-#: src/protocols/silc/ops.c:1243
-msgid "Cannot get room list"
-msgstr "无法获取房间列表"
-
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1287
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1318
+#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1301
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1336 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
 msgid "Server Statistics"
 msgstr "服务器统计"
 
-#: src/protocols/silc/ops.c:1337
+#: src/protocols/silc/ops.c:1333
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1342
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
-#: src/protocols/silc/ops.c:1368
+#: src/protocols/silc/ops.c:1364
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9097,97 +9165,97 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1387
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: src/protocols/silc/ops.c:1399 src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1399
+#: src/protocols/silc/ops.c:1395
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1400
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: src/protocols/silc/ops.c:1412
+#: src/protocols/silc/ops.c:1408
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1489
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1498
+#: src/protocols/silc/ops.c:1494
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1507
+#: src/protocols/silc/ops.c:1503
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1542
+#: src/protocols/silc/ops.c:1538
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1602 src/protocols/silc/ops.c:1649
-#: src/protocols/silc/silc.c:188
+#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
+#: src/protocols/silc/silc.c:192
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1604
+#: src/protocols/silc/ops.c:1600
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1651
+#: src/protocols/silc/ops.c:1647
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1692
+#: src/protocols/silc/ops.c:1688
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1720
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1723
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1729
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1735
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1743
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1754
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -9216,48 +9284,48 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "校验公钥"
 
-#: src/protocols/silc/pk.c:118
+#: src/protocols/silc/pk.c:119
 msgid "View..."
 msgstr "查看..."
 
-#: src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "不支持的公钥类型"
 
-#: src/protocols/silc/silc.c:148
+#: src/protocols/silc/silc.c:152
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/protocols/silc/silc.c:180
+#: src/protocols/silc/silc.c:184
 msgid "Cannot initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
-#: src/protocols/silc/silc.c:191
+#: src/protocols/silc/silc.c:195
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: src/protocols/silc/silc.c:263
+#: src/protocols/silc/silc.c:267
 msgid "Out of memory"
 msgstr "内存溢出"
 
 #. Progress
-#: src/protocols/silc/silc.c:297
+#: src/protocols/silc/silc.c:301
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:627
+#: src/protocols/silc/silc.c:631
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:654
+#: src/protocols/silc/silc.c:658
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9265,43 +9333,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:671
+#: src/protocols/silc/silc.c:675
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:678
+#: src/protocols/silc/silc.c:682
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:691
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:694
+#: src/protocols/silc/silc.c:698
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:707 src/protocols/silc/silc.c:708
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:709
+#: src/protocols/silc/silc.c:713
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9310,186 +9378,182 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:749 src/protocols/silc/silc.c:755
-#: src/protocols/silc/silc.c:1158
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
+#: src/protocols/silc/silc.c:1159
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:749
+#: src/protocols/silc/silc.c:753
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:750 src/protocols/silc/silc.c:1153
+#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:793
+#: src/protocols/silc/silc.c:797
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:802
+#: src/protocols/silc/silc.c:806
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:874
+#: src/protocols/silc/silc.c:879
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:983
-msgid "Failed to leave channel"
-msgstr "离开频道失败"
-
-#: src/protocols/silc/silc.c:1029
+#: src/protocols/silc/silc.c:1030
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1110
+#: src/protocols/silc/silc.c:1111
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1212
+#: src/protocols/silc/silc.c:1213
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1217
+#: src/protocols/silc/silc.c:1218
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1220
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1233
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1262
+#: src/protocols/silc/silc.c:1263
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1325
+#: src/protocols/silc/silc.c:1326
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1330
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1334
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1338
+#: src/protocols/silc/silc.c:1339
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1343
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1347
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1350 src/protocols/zephyr/zephyr.c:2561
+#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2564
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1354
+#: src/protocols/silc/silc.c:1355
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1359
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1362
+#: src/protocols/silc/silc.c:1363
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1367
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1371
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1409
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1413
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1417
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1421
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1425
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1429
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1433
+#: src/protocols/silc/silc.c:1434
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1438
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9497,39 +9561,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1449
+#: src/protocols/silc/silc.c:1450
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1454
+#: src/protocols/silc/silc.c:1455
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1459
+#: src/protocols/silc/silc.c:1460
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1463
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1467
+#: src/protocols/silc/silc.c:1468
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1472
+#: src/protocols/silc/silc.c:1473
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1475
+#: src/protocols/silc/silc.c:1476
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1480
+#: src/protocols/silc/silc.c:1481
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1485
+#: src/protocols/silc/silc.c:1486
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9542,40 +9606,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1574
+#: src/protocols/silc/silc.c:1575
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1576
+#: src/protocols/silc/silc.c:1577
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1606
+#: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1612
+#: src/protocols/silc/silc.c:1613
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1617
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1621
+#: src/protocols/silc/silc.c:1622
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1624
+#: src/protocols/silc/silc.c:1625
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1627
+#: src/protocols/silc/silc.c:1628
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1630
+#: src/protocols/silc/silc.c:1631
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -9671,6 +9735,11 @@
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
+#: src/protocols/toc/toc.c:199
+#, c-format
+msgid "Signon: %s"
+msgstr "登录名: %s"
+
 #: src/protocols/toc/toc.c:481
 #, c-format
 msgid "Unable to write file %s."
@@ -9963,42 +10032,42 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:395
+#: src/protocols/yahoo/yahoo.c:400
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:870
+#: src/protocols/yahoo/yahoo.c:884
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:889
+#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
 msgid "Buzz!!"
-msgstr "Buzz!!"
-
-#: src/protocols/yahoo/yahoo.c:934
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:948
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:1001
+#: src/protocols/yahoo/yahoo.c:1015
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:1004
+#: src/protocols/yahoo/yahoo.c:1018
 #, 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:1007
+#: src/protocols/yahoo/yahoo.c:1021
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1768
+#: src/protocols/yahoo/yahoo.c:1782
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10008,11 +10077,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1771
+#: src/protocols/yahoo/yahoo.c:1785
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1843
+#: src/protocols/yahoo/yahoo.c:1858
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10020,19 +10089,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1846
+#: src/protocols/yahoo/yahoo.c:1861
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: src/protocols/yahoo/yahoo.c:1895
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1891
+#: src/protocols/yahoo/yahoo.c:1906
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1892
+#: src/protocols/yahoo/yahoo.c:1907
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10043,88 +10112,96 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1900
+#: src/protocols/yahoo/yahoo.c:1915
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1903
+#: src/protocols/yahoo/yahoo.c:1918
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1906
+#: src/protocols/yahoo/yahoo.c:1921
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1960
+#: src/protocols/yahoo/yahoo.c:1975
 #, 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:1963
+#: src/protocols/yahoo/yahoo.c:1978
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoo.c:2325
+#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
 #: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2347 src/protocols/yahoo/yahoo.c:2457
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2517
+#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
 #: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2613 src/protocols/yahoo/yahoo.c:3117
+#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3120
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3123
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3129
+#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3135
+#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2706 src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2833
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2838
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2868
+#: src/protocols/yahoo/yahoo.c:2890
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2877
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2909
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/yahoo/yahoo.c:2913
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
+#: src/protocols/yahoo/yahoo.c:3473
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+
+#: src/protocols/yahoo/yahoo.c:3477
+msgid "buzz: Buzz a contact to get their attention"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10135,47 +10212,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3460 src/protocols/yahoo/yahoo.c:3462
+#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3481
+#: src/protocols/yahoo/yahoo.c:3578
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3484
+#: src/protocols/yahoo/yahoo.c:3581
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3487
+#: src/protocols/yahoo/yahoo.c:3584
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3490
+#: src/protocols/yahoo/yahoo.c:3587
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3493
+#: src/protocols/yahoo/yahoo.c:3590
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3496
+#: src/protocols/yahoo/yahoo.c:3593
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:3596
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3502
+#: src/protocols/yahoo/yahoo.c:3599
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3505
+#: src/protocols/yahoo/yahoo.c:3602
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3508
+#: src/protocols/yahoo/yahoo.c:3605
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
@@ -10340,78 +10417,78 @@
 msgid "Unable send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1130
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1132
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1421 src/protocols/zephyr/zephyr.c:1422
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:2238
+#: src/protocols/zephyr/zephyr.c:2240
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:2244
+#: src/protocols/zephyr/zephyr.c:2246
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:2250
+#: src/protocols/zephyr/zephyr.c:2252
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:2261
+#: src/protocols/zephyr/zephyr.c:2263
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:2566
+#: src/protocols/zephyr/zephyr.c:2569
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2571
+#: src/protocols/zephyr/zephyr.c:2574
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2576
+#: src/protocols/zephyr/zephyr.c:2579
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2581
+#: src/protocols/zephyr/zephyr.c:2584
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2586
+#: src/protocols/zephyr/zephyr.c:2589
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2592
+#: src/protocols/zephyr/zephyr.c:2595
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
 
-#: src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/zephyr/zephyr.c:2600
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2603
+#: src/protocols/zephyr/zephyr.c:2606
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2609
+#: src/protocols/zephyr/zephyr.c:2612
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10419,7 +10496,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2615
+#: src/protocols/zephyr/zephyr.c:2618
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10427,15 +10504,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:2620
+#: src/protocols/zephyr/zephyr.c:2623
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2726
+#: src/protocols/zephyr/zephyr.c:2729
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:2729
+#: src/protocols/zephyr/zephyr.c:2732
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10449,51 +10526,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2812 src/protocols/zephyr/zephyr.c:2814
+#: src/protocols/zephyr/zephyr.c:2815 src/protocols/zephyr/zephyr.c:2817
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:2839
+#: src/protocols/zephyr/zephyr.c:2842
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2842
-msgid "Export to .zephyr.subs"
-msgstr "导出到 .zephyr.subs"
-
 #: src/protocols/zephyr/zephyr.c:2845
+msgid "Export to .zephyr.subs"
+msgstr "导出到 .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:2848
 msgid "Import from .anyone"
 msgstr "从 .anyone 导入"
 
-#: src/protocols/zephyr/zephyr.c:2848
+#: src/protocols/zephyr/zephyr.c:2851
 msgid "Import from .zephyr.subs"
 msgstr "从 .zephyr.subs 导入"
 
-#: src/protocols/zephyr/zephyr.c:2851
+#: src/protocols/zephyr/zephyr.c:2854
 msgid "Realm"
 msgstr "域"
 
-#: src/protocols/zephyr/zephyr.c:2854
+#: src/protocols/zephyr/zephyr.c:2857
 msgid "Exposure"
 msgstr "暴露"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:870
+#: src/proxy.c:953
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:874
+#: src/proxy.c:957
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10502,7 +10579,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1255
+#: src/request.h:1254
 msgid "Accept"
 msgstr "接受"
 
@@ -10510,22 +10587,22 @@
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:474
+#: src/server.c:471
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: src/server.c:898
+#: src/server.c:895
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:912
+#: src/server.c:909
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1165
+#: src/server.c:1164
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10534,31 +10611,31 @@
 "%s 邀请了 %s 加入聊天室 %s:\n"
 "<b>%s</b>"
 
-#: src/server.c:1169
+#: src/server.c:1168
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: src/server.c:1175
+#: src/server.c:1174
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/status.c:552
+#: src/status.c:553
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:557
+#: src/status.c:558
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1154
+#: src/status.c:1269
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/status.c:1170
+#: src/status.c:1285
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
@@ -10591,195 +10668,27 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2383
+#: src/util.c:2387
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2397
+#: src/util.c:2401
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2405
+#: src/util.c:2409
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2413
+#: src/util.c:2417
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2830
+#: src/util.c:2834
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
-#: src/win32/win32dep.c:273
-msgid "Moving Gaim Settings.."
-msgstr "正在移动 Gaim 设置..."
-
-#: src/win32/win32dep.c:276
-msgid "Moving Gaim user settings to: "
-msgstr "正在将 Gaim 用户设置移动到:"
-
-#: src/win32/win32dep.c:278
-msgid "Notification"
-msgstr "提示"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "重新连接时恢复离开状态"
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK 信号测试"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "测试看看所有的 UI 信号是否都工作正确。"
-
-#~ msgid "Away!"
-#~ msgstr "离开!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "编辑此消息"
-
-#~ msgid "I'm Back!"
-#~ msgstr "我回来了!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "您真的想要删除离开消息“%s”吗?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "删除离开消息"
-
-#~ msgid "New Away Message"
-#~ msgstr "新建离开消息"
-
-#~ msgid "Set All Away"
-#~ msgstr "全部设为离开"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "您不能保存空标题的离开消息"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "请给消息指定标题,或者不保存直接“使用”。"
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "您不能创建空的离开消息"
-
-#~ msgid "New away message"
-#~ msgstr "新建离开消息"
-
-#~ msgid "Away title: "
-#~ msgstr "离开标题:"
-
-#~ msgid "_Save"
-#~ msgstr "保存(_S)"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "保存并使用(_V)"
-
-#~ msgid "_Use"
-#~ msgstr "使用(_U)"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "向选中好友发送消息"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "获取选中好友的信息"
-
-#~ msgid "_Chat"
-#~ msgstr "聊天(_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "加入聊天室"
-
-#~ msgid "_Away"
-#~ msgstr "离开(_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "设置离开消息"
-
-#~ msgid "Warn"
-#~ msgstr "警告"
-
-#~ msgid "Warn the user"
-#~ msgstr "警告用户"
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim 与 ICQ 服务器通讯错误。"
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
-
-#~ msgid "Send message through server"
-#~ msgstr "通过服务器中转消息"
-
-#~ msgid "Connecting..."
-#~ msgstr "正在连接..."
-
-#~ msgid "Nick:"
-#~ msgstr "昵称:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim 用户"
-
-#~ msgid "Logged out"
-#~ msgstr "已登出"
-
-#~ msgid "Buddy list syncronization issue in %s (%s)"
-#~ msgstr "%s (%s) 的好友列表同步问题"
-
-#~ msgid ""
-#~ "%s on the local list is inside the group \"%s\" but not on the server "
-#~ "list. Do you want this buddy to be added?"
-#~ msgstr ""
-#~ "%s 出现于组“%s”的本地列表中,但并未出现于服务器列表。您想要添加此好友吗?"
-
-#~ msgid ""
-#~ "%s is on the local list but not on the server list. Do you want this "
-#~ "buddy to be added?"
-#~ msgstr "%s 位于本地列表但并未出现于服务器列表。您想要添加此好友吗?"
-
-#~ msgid "Not specified"
-#~ msgstr "未指定"
-
-#~ msgid "Visible"
-#~ msgstr "显身"
-
-#~ msgid "Available Message:"
-#~ msgstr "可用消息:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "我正在工作,渴望被打扰 - 呼我!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "设置可用消息..."
-
-#~ msgid "Custom"
-#~ msgstr "自定义"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s 登入了。"
-
-#~ msgid "%s signed on"
-#~ msgstr "%s 已登入"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s 登出了。"
-
-#~ msgid "%s signed off"
-#~ msgstr "%s 已登出"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s 刚刚被 %s 警告。\n"
-#~ "您新的警告级别是 %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "无名氏"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "抱歉,我现在不在。请稍候再与我联系。"