changeset 9848:f462f91edeb2

[gaim-migrate @ 10726] " After an account was disconnected or signed off, Gaim was not forgetting that it knew the password of the user while in the same application session. This patch causes gaim to blank the password for accounts that do not have "Remember password" set when an account is disconnected by request or forced." --Dave West our rationale for remembering them during that instance of gaim was that you probly do not want to have to type it in again if you are disconnected. after seeing numerous bug reports about people mis-typing their password and people afraid that someone else will sit down at their computer, i decided that this rationale isn't as compelling. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 24 Aug 2004 11:43:39 +0000
parents ab097ff50f5b
children c2736c61e31c
files po/ChangeLog po/zh_CN.po src/connection.c
diffstat 3 files changed, 1953 insertions(+), 1864 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Aug 24 05:16:35 2004 +0000
+++ b/po/ChangeLog	Tue Aug 24 11:43:39 2004 +0000
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 0.82cvs:
+	* Chinese (Simplified) translation updated (Funda Wang)
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (Canadian) translation updated (Adam Weinberger)
--- a/po/zh_CN.po	Tue Aug 24 05:16:35 2004 +0000
+++ b/po/zh_CN.po	Tue Aug 24 11:43:39 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-14 22:11-0400\n"
-"PO-Revision-Date: 2004-08-04 02:09+0800\n"
+"POT-Creation-Date: 2004-08-24 00:01-0400\n"
+"PO-Revision-Date: 2004-08-23 20:41+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"
@@ -51,45 +51,45 @@
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
 msgid "Mail Server"
 msgstr "邮件服务器"
 
-#: plugins/chkmail.c:132
+#: plugins/chkmail.c:136
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d 封新邮件/共 %d 封)"
 
-#: plugins/chkmail.c:195
+#: plugins/chkmail.c:199
 msgid "Check Mail"
 msgstr "检查邮件"
 
-#: plugins/chkmail.c:199
+#: plugins/chkmail.c:203
 msgid "Check email every X seconds.\n"
 msgstr "每隔 X 秒检查邮件。\n"
 
-#: plugins/contact_priority.c:82
+#: plugins/contact_priority.c:83
 msgid "Point values to use when..."
 msgstr "程序内部所用的权值,当..."
 
-#: plugins/contact_priority.c:91
+#: plugins/contact_priority.c:92
 msgid "Buddy is offline:"
 msgstr "好友离线:"
 
-#: plugins/contact_priority.c:105
+#: plugins/contact_priority.c:106
 msgid "Buddy is away:"
 msgstr "好友离开:"
 
-#: plugins/contact_priority.c:119
+#: plugins/contact_priority.c:120
 msgid "Buddy is idle:"
 msgstr "好友瞌睡:"
 
-#: plugins/contact_priority.c:133
+#: plugins/contact_priority.c:134
 msgid "Use last matching buddy"
 msgstr "使用最后一个匹配的好友"
 
 #. Explanation
-#: plugins/contact_priority.c:139
+#: plugins/contact_priority.c:140
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -101,7 +101,7 @@
 "使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为: 在线->瞌睡->离开+瞌睡->离"
 "线。"
 
-#: plugins/contact_priority.c:142
+#: plugins/contact_priority.c:143
 msgid "Point values to use for Account..."
 msgstr "账户的权值..."
 
@@ -112,20 +112,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:191
+#: plugins/contact_priority.c:192
 msgid "Contact Priority"
 msgstr "联系人优先级"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:194
+#: plugins/contact_priority.c:195
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "允许控制好友不同状态所对应的值。"
 
 #. *< description
-#: plugins/contact_priority.c:196
+#: plugins/contact_priority.c:197
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -146,69 +146,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:115 src/gtkaccount.c:737 src/gtkaccount.c:2158
+#: plugins/docklet/docklet.c:133 src/gtkaccount.c:738 src/gtkaccount.c:2160
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:118
+#: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:119
+#: plugins/docklet/docklet.c:137
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:150
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:154 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:180 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2770
-#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2939
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6502 src/protocols/oscar/oscar.c:6702
+#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2795
+#: src/protocols/novell/novell.c:2912 src/protocols/novell/novell.c:2964
+#: src/protocols/oscar/oscar.c:648 src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:6558 src/protocols/oscar/oscar.c:6758
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "离开"
 
 #. else...
-#: plugins/docklet/docklet.c:160 src/away.c:570
-#: src/protocols/oscar/oscar.c:5414 src/protocols/oscar/oscar.c:6710
+#: plugins/docklet/docklet.c:186 src/away.c:583
+#: src/protocols/oscar/oscar.c:5488 src/protocols/oscar/oscar.c:6766
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:168
+#: plugins/docklet/docklet.c:194
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:173 src/gtkft.c:612
+#: plugins/docklet/docklet.c:199 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:174 src/gtkaccount.c:2339
+#: plugins/docklet/docklet.c:200 src/gtkaccount.c:2341
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:175 src/gtkprefs.c:2484
+#: plugins/docklet/docklet.c:201 src/gtkprefs.c:2506
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:184
+#: plugins/docklet/docklet.c:210
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:188
+#: plugins/docklet/docklet.c:214
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:479
+#: plugins/docklet/docklet.c:505
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:483
+#: plugins/docklet/docklet.c:509
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -219,19 +219,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:507
+#: plugins/docklet/docklet.c:533
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:536
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:512
+#: plugins/docklet/docklet.c:538
 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, "
@@ -242,19 +242,19 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
-#: plugins/extplacement.c:75
+#: plugins/extplacement.c:76
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: plugins/extplacement.c:96
+#: plugins/extplacement.c:97
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: plugins/extplacement.c:101
+#: plugins/extplacement.c:102
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
-#: plugins/extplacement.c:107
+#: plugins/extplacement.c:108
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "按数字放置时分离即时消息和聊天窗口"
 
@@ -265,19 +265,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:126
+#: plugins/extplacement.c:127
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:128
+#: plugins/extplacement.c:129
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:130
+#: plugins/extplacement.c:131
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -440,81 +440,81 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:133
-#: plugins/gevolution/assoc-buddy.c:71
+#: plugins/gevolution/add_buddy_dialog.c:134
+#: plugins/gevolution/assoc-buddy.c:72
 msgid "Local Addressbook"
 msgstr "本地地址簿"
 
-#: plugins/gevolution/add_buddy_dialog.c:143
-#: plugins/gevolution/add_buddy_dialog.c:154
-#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3003 src/gtkprefs.c:956 src/gtkprefs.c:1008
-#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
+#: 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:2998 src/gtkprefs.c:959 src/gtkprefs.c:1011
+#: src/gtkprefs.c:1823 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "无"
 
-#: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
-#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/add_buddy_dialog.c:188
+#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2164
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:198
+#: plugins/gevolution/add_buddy_dialog.c:199
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:479
+#: plugins/gevolution/add_buddy_dialog.c:480
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6986
+#: plugins/gevolution/add_buddy_dialog.c:493
+#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7042
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4042
-#: src/gtkblist.c:4370
+#: plugins/gevolution/add_buddy_dialog.c:564
+#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4038
+#: src/gtkblist.c:4376
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:589
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/add_buddy_dialog.c:590
+#: plugins/gevolution/assoc-buddy.c:484
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:606
+#: plugins/gevolution/add_buddy_dialog.c:607
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:367
+#: plugins/gevolution/assoc-buddy.c:368
 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:446
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:447
+#: plugins/gevolution/assoc-buddy.c:448
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:500
+#: plugins/gevolution/assoc-buddy.c:501
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:774 src/blist.c:962 src/blist.c:1898 src/gtkblist.c:3861
+#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:89
+#: src/blist.c:774 src/blist.c:982 src/blist.c:1912 src/gtkblist.c:3857
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -533,7 +533,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "账户"
 
@@ -556,54 +556,54 @@
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:267
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:271
+#: plugins/gevolution/new_person_dialog.c:272
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:291
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:295
+#: plugins/gevolution/new_person_dialog.c:296
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:315
+#: plugins/gevolution/new_person_dialog.c:316
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:371
-#: src/gtkaccount.c:401 src/protocols/oscar/oscar.c:420
+#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:554
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:350
+#: plugins/gevolution/new_person_dialog.c:351
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:362
+#: plugins/gevolution/new_person_dialog.c:363
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:382
+#: plugins/gevolution/new_person_dialog.c:383
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#: plugins/history.c:88
+#: plugins/history.c:89
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:90
+#: plugins/history.c:91
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:91
+#: plugins/history.c:92
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -616,7 +616,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:80
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "离开后变为图标"
 
@@ -624,7 +624,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:83 plugins/iconaway.c:85
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
@@ -644,7 +644,7 @@
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:67 src/away.c:905
+#: plugins/idle.c:67 src/away.c:910
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -713,68 +713,68 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:600
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:604
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:611
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:618
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:626
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:633
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:652
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:660
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:668
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:673
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:680
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:688
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:696
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:705
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -785,7 +785,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:792
+#: plugins/notify.c:793
 msgid "Message Notification"
 msgstr "邮件通知"
 
@@ -793,7 +793,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:795 plugins/notify.c:797
+#: plugins/notify.c:796 plugins/notify.c:798
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
 
@@ -921,35 +921,35 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:412
+#: plugins/spellchk.c:413
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:436
+#: plugins/spellchk.c:437
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:448
+#: plugins/spellchk.c:449
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:474
+#: plugins/spellchk.c:475
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:481
+#: plugins/spellchk.c:482
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:495
+#: plugins/spellchk.c:496
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:535
+#: plugins/spellchk.c:536
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:537 plugins/spellchk.c:538
+#: plugins/spellchk.c:538 plugins/spellchk.c:539
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -1126,30 +1126,30 @@
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:388
-#: plugins/win32/transparency/win2ktrans.c:419
+#: plugins/win32/transparency/win2ktrans.c:387
+#: plugins/win32/transparency/win2ktrans.c:418
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:369
+#: plugins/win32/transparency/win2ktrans.c:368
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:380
+#: plugins/win32/transparency/win2ktrans.c:379
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
+#: plugins/win32/transparency/win2ktrans.c:404 src/gtkprefs.c:953
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:406
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1160,19 +1160,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:462
+#: plugins/win32/transparency/win2ktrans.c:461
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:465
+#: plugins/win32/transparency/win2ktrans.c:464
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:467
+#: plugins/win32/transparency/win2ktrans.c:466
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1183,288 +1183,57 @@
 "\n"
 "* 注意: 此插件需要 Win2000 或 WinXP。"
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:343
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:351
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3048
-#: src/gtkprefs.c:2394
+#: plugins/win32/winprefs/winprefs.c:361 src/gtkblist.c:3043
+#: src/gtkprefs.c:2416
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:362
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:366
 msgid "Docked _Buddy List is always on top"
 msgstr "停靠的好友列表常居顶端(_B)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
+#: plugins/win32/winprefs/winprefs.c:376
 msgid "_Keep Buddy List window on top"
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
-#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
+#: plugins/win32/winprefs/winprefs.c:381 src/gtkprefs.c:1004
+#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "对话"
 
-#: plugins/win32/winprefs/winprefs.c:383
+#: plugins/win32/winprefs/winprefs.c:382
 msgid "_Flash Window when messages are received"
 msgstr "收到信息时闪烁窗口(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:405
+#: plugins/win32/winprefs/winprefs.c:404
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
+#: plugins/win32/winprefs/winprefs.c:406 plugins/win32/winprefs/winprefs.c:407
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/about.c:64
-msgid "About Gaim"
-msgstr "关于 Gaim"
-
-#: src/about.c:78
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#: src/about.c:98
-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 "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-"Gaim 是模块化的即时通讯客户程序,同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
-"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
-"成,并以 GPL 许可协议发行。<BR><BR>"
-
-#: src/about.c:109
-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/about.c:114
-msgid "Active Developers"
-msgstr "当前开发者"
-
-#: src/about.c:115
-msgid "maintainer"
-msgstr "维护者"
-
-#: src/about.c:117
-msgid "lead developer"
-msgstr "领导开发者"
-
-#: src/about.c:120
-msgid "developer & webmaster"
-msgstr "开发者和网管"
-
-#: src/about.c:121
-msgid "win32 port"
-msgstr "Win32 移植"
-
-#: src/about.c:124 src/about.c:125 src/about.c:126 src/about.c:127
-msgid "developer"
-msgstr "开发者"
-
-#: src/about.c:128
-msgid "support"
-msgstr "支持"
-
-#: src/about.c:135
-msgid "Crazy Patch Writers"
-msgstr "疯狂补丁编写者"
-
-#: src/about.c:151
-msgid "Retired Developers"
-msgstr "退休开发者"
-
-#: src/about.c:152
-msgid "former libfaim maintainer"
-msgstr "先前 libfaim 维护者"
-
-#: src/about.c:153
-msgid "former lead developer"
-msgstr "先前领导开发者"
-
-#: src/about.c:156
-msgid "former maintainer"
-msgstr "先前维护者"
-
-#: src/about.c:157
-msgid "former Jabber developer"
-msgstr "先前 Jabber 开发者"
-
-#: src/about.c:158
-msgid "original author"
-msgstr "原作者"
-
-#: src/about.c:161
-msgid "hacker and designated driver [lazy bum]"
-msgstr "骇客和专属驱动程序[lazy bum]"
-
-#: src/about.c:169
-msgid "Current Translators"
-msgstr "当前翻译者"
-
-#: src/about.c:170 src/about.c:209
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: src/about.c:171 src/about.c:210
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#: src/about.c:172 src/about.c:211
-msgid "Czech"
-msgstr "捷克语"
-
-#: src/about.c:173
-msgid "Danish"
-msgstr "丹麦语"
-
-#: src/about.c:174
-msgid "British English"
-msgstr "英国英语"
-
-#: src/about.c:175
-msgid "Canadian English"
-msgstr "加拿大英语"
-
-#: src/about.c:176 src/about.c:212
-msgid "German"
-msgstr "德语"
-
-#: src/about.c:177 src/about.c:213
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: src/about.c:178 src/about.c:214
-msgid "Finnish"
-msgstr "芬兰语"
-
-#: src/about.c:179 src/about.c:215
-msgid "French"
-msgstr "法语"
-
-#: src/about.c:180
-msgid "Hebrew"
-msgstr "希伯莱语"
-
-#: src/about.c:181
-msgid "Hindi"
-msgstr "印地语"
-
-#: src/about.c:182
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: src/about.c:183 src/about.c:216
-msgid "Italian"
-msgstr "意大利语"
-
-#: src/about.c:184 src/about.c:217
-msgid "Japanese"
-msgstr "日语"
-
-#: src/about.c:185
-msgid "Lithuanian"
-msgstr "立陶宛语"
-
-#: src/about.c:186 src/about.c:218
-msgid "Korean"
-msgstr "朝鲜语"
-
-#: src/about.c:187
-msgid "Dutch; Flemish"
-msgstr "荷兰语"
-
-#: src/about.c:188
-msgid "Macedonian"
-msgstr "马其顿语"
-
-#: src/about.c:189
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: src/about.c:190 src/about.c:219
-msgid "Polish"
-msgstr "波兰语"
-
-#: src/about.c:191
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: src/about.c:192
-msgid "Portuguese-Brazil"
-msgstr "巴西葡萄牙语"
-
-#: src/about.c:193
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#: src/about.c:194 src/about.c:220 src/about.c:221
-msgid "Russian"
-msgstr "俄语"
-
-#: src/about.c:195
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
-#: src/about.c:196
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#: src/about.c:197 src/about.c:223
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: src/about.c:198
-msgid "Vietnamese"
-msgstr "越南语"
-
-#: src/about.c:198
-msgid "and the Gnome-Vi Team"
-msgstr "及 Gnome 越南语团队"
-
-#: src/about.c:199
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
-#: src/about.c:200
-msgid "Traditional Chinese"
-msgstr "繁体中文"
-
-#: src/about.c:207
-msgid "Past Translators"
-msgstr "先前翻译者"
-
-#: src/about.c:208
-msgid "Amharic"
-msgstr "阿姆哈拉语"
-
-#: src/about.c:222
-msgid "Slovak"
-msgstr "斯洛伐克语"
-
-#: src/about.c:224
-msgid "Chinese"
-msgstr "中文"
-
 #: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
@@ -1497,47 +1266,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2377
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:262 src/gtkdialogs.c:315
-#: src/gtkrequest.c:241 src/protocols/jabber/jabber.c:1048
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2371
+#: src/gtkdialogs.c:384 src/gtkdialogs.c:526 src/gtkdialogs.c:579
+#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1048
 #: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
 #: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3359
-#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:6773
-#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6917
-#: src/protocols/oscar/oscar.c:7003 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:409
-#: src/protocols/silc/chat.c:447 src/protocols/silc/chat.c:710
-#: src/protocols/silc/ops.c:1072 src/protocols/silc/ops.c:1680
-#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2795
-#: src/protocols/yahoo/yahoo.c:2804 src/request.h:1243
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3472
+#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:6829
+#: src/protocols/oscar/oscar.c:6921 src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7059 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:1691
+#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2804
+#: src/protocols/yahoo/yahoo.c:2813 src/request.h:1243
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:343 src/account.c:381 src/away.c:353 src/connection.c:199
-#: src/gtkaccount.c:2008 src/gtkaccount.c:2504 src/gtkblist.c:2378
-#: src/gtkblist.c:4408 src/gtkconn.c:168 src/gtkdialogs.c:124
-#: src/gtkdialogs.c:263 src/gtkdialogs.c:316 src/gtkdialogs.c:404
-#: src/gtkdialogs.c:422 src/gtkdialogs.c:440 src/gtkdialogs.c:479
-#: src/gtkdialogs.c:535 src/gtkdialogs.c:581 src/gtkdialogs.c:600
-#: src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585 src/gtkprivacy.c:598
-#: src/gtkprivacy.c:623 src/gtkprivacy.c:634 src/gtkrequest.c:242
+#: src/account.c:343 src/account.c:381 src/away.c:366 src/connection.c:199
+#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2372
+#: src/gtkblist.c:4414 src/gtkconn.c:169 src/gtkdialogs.c:385
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:580 src/gtkdialogs.c:678
+#: src/gtkdialogs.c:700 src/gtkdialogs.c:720 src/gtkdialogs.c:756
+#: src/gtkdialogs.c:816 src/gtkdialogs.c:858 src/gtkdialogs.c:879
+#: 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/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
-#: src/protocols/jabber/chat.c:702 src/protocols/jabber/jabber.c:667
+#: src/protocols/jabber/chat.c:730 src/protocols/jabber/jabber.c:667
 #: src/protocols/jabber/jabber.c:1049 src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
 #: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
-#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1361
-#: src/protocols/oscar/oscar.c:3319 src/protocols/oscar/oscar.c:3360
-#: src/protocols/oscar/oscar.c:3397 src/protocols/oscar/oscar.c:3454
-#: src/protocols/oscar/oscar.c:6774 src/protocols/oscar/oscar.c:6866
-#: src/protocols/oscar/oscar.c:6918 src/protocols/oscar/oscar.c:6987
-#: src/protocols/oscar/oscar.c:7004 src/protocols/silc/buddy.c:461
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1495
+#: src/protocols/oscar/oscar.c:3432 src/protocols/oscar/oscar.c:3473
+#: src/protocols/oscar/oscar.c:3510 src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6922
+#: src/protocols/oscar/oscar.c:6974 src/protocols/oscar/oscar.c:7043
+#: src/protocols/oscar/oscar.c:7060 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:582 src/protocols/silc/chat.c:711
-#: src/protocols/silc/ops.c:1681 src/protocols/silc/silc.c:699
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2796
-#: src/protocols/yahoo/yahoo.c:2805 src/request.h:1243 src/request.h:1253
+#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1692 src/protocols/silc/silc.c:699
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2805
+#: src/protocols/yahoo/yahoo.c:2814 src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
@@ -1546,77 +1315,81 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:380 src/gtkrequest.c:248 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:739 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2782
+#: src/account.c:739 src/gtkft.c:158 src/gtkutils.c:591
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2807
 msgid "Unknown"
 msgstr "未知"
 
-#: src/away.c:231
+#: src/away.c:233
 msgid "Away!"
 msgstr "离开!"
 
-#: src/away.c:295
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "编辑此消息"
+
+#: src/away.c:308
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:349
+#: src/away.c:362
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "您真的想要删除离开消息“%s”吗?"
 
-#: src/away.c:351 src/away.c:442
+#: src/away.c:364 src/away.c:455
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:352 src/gtkconv.c:1378 src/gtkconv.c:3721 src/gtkconv.c:3825
-#: src/gtkrequest.c:247
+#: src/away.c:365 src/gtkconv.c:1400 src/gtkconv.c:3743 src/gtkconv.c:3814
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "删除"
 
-#: src/away.c:422
+#: src/away.c:435
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:638
+#: src/away.c:651
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/away.c:745
+#: src/away.c:758
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/away.c:747
+#: src/away.c:760
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/away.c:757
+#: src/away.c:770
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/away.c:822
+#: src/away.c:835
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/away.c:837
+#: src/away.c:850
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/away.c:893
+#: src/away.c:898
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/away.c:897
+#: src/away.c:902
 msgid "Sa_ve & Use"
 msgstr "保存并使用(_V)"
 
-#: src/away.c:901
+#: src/away.c:906
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -1624,7 +1397,7 @@
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1317
+#: src/blist.c:1337
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1636,18 +1409,18 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1326
+#: src/blist.c:1346
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:2029
+#: src/blist.c:2043
 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:2032
+#: src/blist.c:2046
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1665,9 +1438,9 @@
 msgstr "连接错误"
 
 #: src/connection.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for %s (%s)"
-msgstr "输入 %s 的密码"
+msgstr "输入 %s(%s) 的密码"
 
 #: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
@@ -1725,7 +1498,7 @@
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1377
+#: src/conversation.c:2578 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新建窗口"
 
@@ -1737,25 +1510,57 @@
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:125
-msgid "That file does not exist."
-msgstr "文件不存在。"
-
-#: src/ft.c:134
+#: src/ft.c:122
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"读取 %s 出错:\n"
+"%s。\n"
+
+#: src/ft.c:126
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"写入 %s 出错:\n"
+"%s。\n"
+
+#: src/ft.c:130
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"访问 %s出错:\n"
+"%s。\n"
+
+#: src/ft.c:161
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:194
+#: src/ft.c:171
+msgid "Cannot send a directory."
+msgstr "无法发送目录。"
+
+#: src/ft.c:178
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
+
+#: src/ft.c:232
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:229
+#: src/ft.c:267
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:233
+#: src/ft.c:271
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1766,22 +1571,22 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:285
+#: src/ft.c:322
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:298
-#, c-format
-msgid "%s was not found.\n"
-msgstr "%s 未找到。\n"
-
-#: src/ft.c:927
+#: src/ft.c:898
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s 取消了 %s 的传送"
+
+#: src/ft.c:948
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:929
+#: src/ft.c:950
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1794,7 +1599,7 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gaim-remote.c:65
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1820,12 +1625,15 @@
 "    选项:\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190 src/gaim-remote.c:206
-#: src/gaim-remote.c:222
-msgid "Gaim not running (on session 0)\n"
-msgstr "Gaim 未运行(会话 0)\n"
-
-#: src/gaim-remote.c:236
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"Gaim 未运行(会话 0)\n"
+"是否装入了“远程控制”插件?\n"
+
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1865,7 +1673,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:256
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1873,19 +1681,23 @@
 "\n"
 "关闭 Gaim 的运行副本\n"
 
-#: src/gaim-remote.c:260
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 msgstr ""
-
-#: src/gaim-remote.c:264
+"\n"
+"将全部账户都设为“离开”默认消息。\n"
+
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
 msgstr ""
-
-#: src/gtkaccount.c:324
+"\n"
+"将全部账户设为未离开。\n"
+
+#: src/gtkaccount.c:325
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1897,164 +1709,164 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:625
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:641
+#: src/gtkaccount.c:642 src/gtkft.c:555
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:646 src/gtkblist.c:4014
+#: src/gtkaccount.c:647 src/gtkblist.c:4010
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:719
+#: src/gtkaccount.c:720
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:724 src/gtkblist.c:4028 src/gtkblist.c:4356
+#: src/gtkaccount.c:725 src/gtkblist.c:4024 src/gtkblist.c:4362
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:728
+#: src/gtkaccount.c:729
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:784
+#: src/gtkaccount.c:785
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:797
+#: src/gtkaccount.c:798
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:806
+#: src/gtkaccount.c:807
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:895
+#: src/gtkaccount.c:896
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1031 src/gtkaccount.c:1078
+#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1037 src/gtkaccount.c:1085
+#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1043 src/gtkaccount.c:1092
+#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1049 src/gtkaccount.c:1099
+#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1055 src/gtkaccount.c:1106
+#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1061 src/gtkaccount.c:1113 src/gtkprefs.c:1180
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1152
+#: src/gtkaccount.c:1153
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1156
+#: src/gtkaccount.c:1157
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1172
+#: src/gtkaccount.c:1173
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1190 src/gtkprefs.c:1174
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1199 src/gtkprefs.c:1201
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1203 src/gtkprefs.c:1219
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1211
+#: src/gtkaccount.c:1212
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1584
+#: src/gtkaccount.c:1585
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1586
+#: src/gtkaccount.c:1587
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1610
+#: src/gtkaccount.c:1611
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1612
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1638 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:2003
+#: src/gtkaccount.c:2004
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2007 src/gtkrequest.c:245
+#: src/gtkaccount.c:2009 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2121 src/protocols/oscar/oscar.c:4000
+#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4114
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2145 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5494
-#: src/protocols/oscar/oscar.c:6701 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1362
-#: src/protocols/zephyr/zephyr.c:1374
+#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:6757 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2567 src/protocols/zephyr/zephyr.c:1365
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:2166
+#: src/gtkaccount.c:2168
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2479
+#: src/gtkaccount.c:2481
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2493
+#: src/gtkaccount.c:2495
 msgid ""
 "\n"
 "\n"
@@ -2064,45 +1876,45 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2497
+#: src/gtkaccount.c:2499
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2501
+#: src/gtkaccount.c:2503
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2503 src/gtkblist.c:4407 src/gtkconv.c:1380
-#: src/gtkconv.c:3714 src/gtkconv.c:3818 src/gtkrequest.c:246
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3628
-#: src/protocols/silc/chat.c:581
+#: src/gtkaccount.c:2505 src/gtkblist.c:4413 src/gtkconv.c:1402
+#: src/gtkconv.c:3736 src/gtkconv.c:3807 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3741
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:802
+#: src/gtkblist.c:792
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:823
+#: src/gtkblist.c:813
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:834 src/gtkpounce.c:410 src/gtkroomlist.c:353
+#: src/gtkblist.c:824 src/gtkpounce.c:411 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3200
+#: src/gtkblist.c:1119 src/gtkblist.c:3196
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1125 src/gtkblist.c:3190
+#: src/gtkblist.c:1122 src/gtkblist.c:3186
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1130
+#: src/gtkblist.c:1128
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
@@ -2114,12 +1926,12 @@
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
+#: src/gtkblist.c:1145 src/gtkblist.c:1226 src/gtkblist.c:1240
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
-#: src/gtkconn.c:360
+#: src/gtkblist.c:1147 src/gtkblist.c:1228 src/gtkblist.c:1245
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
@@ -2140,152 +1952,152 @@
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
-#: src/stock.c:87
+#: src/gtkblist.c:1216 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1222
+#: src/gtkblist.c:1218
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1246 src/gtkblist.c:1275
+#: src/gtkblist.c:1242 src/gtkblist.c:1267
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1280
+#: src/gtkblist.c:1272
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:313
+#: src/gtkblist.c:1919 src/gtkconv.c:4379 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2316
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2317
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2318
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2319
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2320
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2322
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2323
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2325
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2326
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2328
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2329
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2332
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2333
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
+#: src/gtkblist.c:2334
+msgid "/Tools/Buddy _Pounce"
+msgstr "/工具(T)/好友千里眼(_P)"
+
+#: src/gtkblist.c:2335
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具(T)/账户操作(_T)"
+
+#: src/gtkblist.c:2336
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具(T)/插件操作(_U)"
+
+#: src/gtkblist.c:2338
+msgid "/Tools/A_ccounts"
+msgstr "/工具(T)/账户(_C)"
+
+#: src/gtkblist.c:2339
+msgid "/Tools/_File Transfers"
+msgstr "/工具(T)/文件传送(_F)"
+
 #: src/gtkblist.c:2340
-msgid "/Tools/Buddy _Pounce"
-msgstr "/工具(T)/好友千里眼(_P)"
+msgid "/Tools/R_oom List"
+msgstr "/工具(T)/房间列表(_O)"
 
 #: src/gtkblist.c:2341
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具(T)/账户操作(_T)"
+msgid "/Tools/Pr_eferences"
+msgstr "/工具(T)/首选项(_E)"
 
 #: src/gtkblist.c:2342
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/工具(T)/插件操作(_U)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具(T)/隐私(_I)"
 
 #: src/gtkblist.c:2344
-msgid "/Tools/A_ccounts"
-msgstr "/工具(T)/账户(_C)"
-
-#: src/gtkblist.c:2345
-msgid "/Tools/_File Transfers"
-msgstr "/工具(T)/文件传送(_F)"
-
-#: src/gtkblist.c:2346
-msgid "/Tools/R_oom List"
-msgstr "/工具(T)/房间列表(_O)"
-
-#: src/gtkblist.c:2347
-msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
-
-#: src/gtkblist.c:2348
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
-
-#: src/gtkblist.c:2350
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2347
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2348
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2349
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2350
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2369
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:2397
 #, c-format
 msgid ""
 "\n"
@@ -2294,7 +2106,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2461
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2302,12 +2114,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2482
+#: src/gtkblist.c:2476
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2315,7 +2127,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2499
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2323,7 +2135,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2500
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2331,7 +2143,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2501
+#: src/gtkblist.c:2495
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2339,7 +2151,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2496
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2347,7 +2159,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2503
+#: src/gtkblist.c:2497
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2355,7 +2167,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2498
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2363,7 +2175,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2500
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2371,7 +2183,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2379,7 +2191,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2387,108 +2199,108 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2790
+#: src/gtkblist.c:2784
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2792
+#: src/gtkblist.c:2786
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2797
+#: src/gtkblist.c:2791
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2794
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2912
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2915
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2918
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3005
+#: src/gtkblist.c:3000
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3006
+#: src/gtkblist.c:3001
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3007
+#: src/gtkblist.c:3002
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3068
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3071
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3074
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3077
 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:3170
+#: src/gtkblist.c:3165
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3167
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3192
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
+#: src/gtkblist.c:3202
+msgid "Get information on the selected buddy"
+msgstr "获取选中好友的信息"
+
 #: src/gtkblist.c:3206
-msgid "Get information on the selected buddy"
-msgstr "获取选中好友的信息"
-
-#: src/gtkblist.c:3210
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3215
+#: src/gtkblist.c:3211
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3220
+#: src/gtkblist.c:3216
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3225
+#: src/gtkblist.c:3221
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3968 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3964 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:2725
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2734
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3992
+#: src/gtkblist.c:3988
 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. "
@@ -2498,59 +2310,63 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4052 src/gtkblist.c:4336
+#: src/gtkblist.c:4048 src/gtkblist.c:4342
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4275
+msgid "This protocol does not support chat rooms."
+msgstr "此协议不支持聊天室。"
+
+#: src/gtkblist.c:4291
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4302
+#: src/gtkblist.c:4308
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4326
+#: src/gtkblist.c:4332
 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:4404
+#: src/gtkblist.c:4410
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4405
+#: src/gtkblist.c:4411
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4972 src/gtkblist.c:5069
+#: src/gtkblist.c:4978 src/gtkblist.c:5075
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:158
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:204
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:215
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:360 src/gtkconn.c:592
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:556
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2563,32 +2379,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:558
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:597
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:627
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:314
+#: src/gtkconv.c:327
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:323
+#: src/gtkconv.c:336
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:347
+#: src/gtkconv.c:360
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:350
+#: src/gtkconv.c:363
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2596,455 +2412,687 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:434
-msgid ""
-"No such command. If you didn't mean to type a command, you can turn commands "
-"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
-"commands."
-msgstr ""
-"没有这样的命令。如果您本来并不想输入命令,您可以在工具->首选项->界面->转换->"
-"启用“斜线”命令中关闭命令。"
+#: src/gtkconv.c:435
+msgid "No such command."
+msgstr "没有这样的命令。"
 
 #: src/gtkconv.c:442
-msgid ""
-"Syntax Error:  You typed the wrong number of arguments to that command. If "
-"you didn't mean to type a command, you can turn commands off from Tools-"
-">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr ""
-"语法错误: 您为命令输入的参数个数不对。如果您本来并不想输入命令,您可以在工具-"
-">首选项->界面->转换->启用“斜线”命令中关闭命令。"
-
-#: src/gtkconv.c:449
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "系统错误: 您给命令传送的参数个数不对。"
+
+#: src/gtkconv.c:447
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:456
+#: src/gtkconv.c:454
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:457
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:463
+#: src/gtkconv.c:461
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:707
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:713
+#: src/gtkconv.c:735
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:734
+#: src/gtkconv.c:756
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:754
+#: src/gtkconv.c:776
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:791 src/gtkconv.c:2475 src/gtkdebug.c:181
+#: src/gtkconv.c:813 src/gtkconv.c:2498 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:796
+#: src/gtkconv.c:818
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:832
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:887 src/gtkdebug.c:130
+#: src/gtkconv.c:909 src/gtkdebug.c:131
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:913 src/gtkdebug.c:158
+#: src/gtkconv.c:935 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1328
+#: src/gtkconv.c:1350
 msgid "IM"
 msgstr "开聊"
 
 #. Send File button
-#: src/gtkconv.c:1337 src/gtkconv.c:3707 src/protocols/oscar/oscar.c:435
+#: src/gtkconv.c:1359 src/gtkconv.c:3729 src/protocols/oscar/oscar.c:569
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1346
+#: src/gtkconv.c:1368
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1348 src/gtkprefs.c:825
+#: src/gtkconv.c:1370 src/gtkprefs.c:828
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1357 src/gtkconv.c:3728
+#: src/gtkconv.c:1379 src/gtkconv.c:3750
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1366
+#: src/gtkconv.c:1388
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2506
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2527
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2534
+#: src/gtkconv.c:2557
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2539
+#: src/gtkconv.c:2562
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2545
+#: src/gtkconv.c:2568
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2929
+#: src/gtkconv.c:2938
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2946
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3040
+#: src/gtkconv.c:3049
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3500
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3493
+#: src/gtkconv.c:3502
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3498
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3509
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3510
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3512
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3516
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3508
+#: src/gtkconv.c:3517
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3519
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3521
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3514
-msgid "/Conversation/In_vite..."
-msgstr "/对话(C)/邀请(_V)..."
-
-#: src/gtkconv.c:3519
-msgid "/Conversation/A_lias..."
-msgstr "/对话(C)/别名(_L)..."
-
-#: src/gtkconv.c:3521
-msgid "/Conversation/_Block..."
-msgstr "/对话(C)/屏蔽(_B)..."
-
 #: src/gtkconv.c:3523
-msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
-
-#: src/gtkconv.c:3525
-msgid "/Conversation/_Remove..."
-msgstr "/对话(C)/删除(_R)..."
+msgid "/Conversation/In_vite..."
+msgstr "/对话(C)/邀请(_V)..."
+
+#: src/gtkconv.c:3528
+msgid "/Conversation/A_lias..."
+msgstr "/对话(C)/别名(_L)..."
 
 #: src/gtkconv.c:3530
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
+msgid "/Conversation/_Block..."
+msgstr "/对话(C)/屏蔽(_B)..."
 
 #: src/gtkconv.c:3532
+msgid "/Conversation/_Add..."
+msgstr "/对话(C)/添加(_A)..."
+
+#: src/gtkconv.c:3534
+msgid "/Conversation/_Remove..."
+msgstr "/对话(C)/删除(_R)..."
+
+#: src/gtkconv.c:3539
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/对话(C)/插入链接(_K)..."
+
+#: src/gtkconv.c:3541
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3546
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3550
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3551
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3543
+#: src/gtkconv.c:3552
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3553
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3545
+#: src/gtkconv.c:3554
 msgid "/Options/Show T_imestamps"
 msgstr "/选项/显示时间戳(_I)"
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3596
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3601
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3605
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3602
+#: src/gtkconv.c:3611
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3615
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3619
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3625
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3629
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3633
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3637
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3643
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3638
-msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/插入图像(I)..."
-
-#: src/gtkconv.c:3644
-msgid "/Options/Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
-
 #: src/gtkconv.c:3647
+msgid "/Conversation/Insert Image..."
+msgstr "/对话(C)/插入图像(I)..."
+
+#: src/gtkconv.c:3653
+msgid "/Options/Enable Logging"
+msgstr "/选项(O)/允许记录(L)"
+
+#: src/gtkconv.c:3656
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3659
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3662
 msgid "/Options/Show Timestamps"
 msgstr "/选项/显示时间戳(I)"
 
-#. From right to left...
-#. Send button
-#: src/gtkconv.c:3677 src/gtkconv.c:3679 src/gtkconv.c:3797 src/gtkconv.c:3799
-msgid "Send"
-msgstr "发送"
-
-#. Now, um, just kind of all over the place. Huh?
+#. The buttons, from left to right
 #. Warn button
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3715
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3696
+#: src/gtkconv.c:3716
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3700 src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkconv.c:3722 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3723
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3710
+#: src/gtkconv.c:3730
 msgid "Send a file to the user"
 msgstr "给用户发送文件"
 
-#: src/gtkconv.c:3717
+#: src/gtkconv.c:3737
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3744
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3731 src/gtkconv.c:4110
+#: src/gtkconv.c:3751 src/gtkconv.c:4086
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
+#. Send button
+#: src/gtkconv.c:3757 src/gtkconv.c:3821
+msgid "Send"
+msgstr "发送"
+
+#: src/gtkconv.c:3758 src/gtkconv.c:3822
+msgid "Send message"
+msgstr "发送消息"
+
+#. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:3800
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3814
+#: src/gtkconv.c:3801
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3821
+#: src/gtkconv.c:3808
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3828
+#: src/gtkconv.c:3815
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3963
+#: src/gtkconv.c:3939
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4026
+#: src/gtkconv.c:4002
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:4087
+#: src/gtkconv.c:4063
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:4099
+#: src/gtkconv.c:4075
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4695
+#: src/gtkconv.c:4669
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5228 src/gtkconv.c:5257 src/gtkconv.c:5353 src/gtkconv.c:5411
+#: src/gtkconv.c:5202 src/gtkconv.c:5231 src/gtkconv.c:5327 src/gtkconv.c:5385
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5969 src/gtkconv.c:5972
+#: src/gtkconv.c:5950 src/gtkconv.c:5953
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkconv.c:6344
+#: src/gtkconv.c:6325
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
+
+#: src/gtkconv.c:6328
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6347
+#: src/gtkconv.c:6331
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6351
+#: src/gtkconv.c:6335
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:196
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:249
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:287
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:293
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:244 src/gtkdialogs.c:296
+#: src/gtkdialogs.c:63
+msgid "maintainer"
+msgstr "维护者"
+
+#: src/gtkdialogs.c:64
+msgid "lead developer"
+msgstr "领导开发者"
+
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
+#: src/gtkdialogs.c:66
+msgid "win32 port"
+msgstr "Win32 移植"
+
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+msgid "developer"
+msgstr "开发者"
+
+#: src/gtkdialogs.c:71
+msgid "support"
+msgstr "支持"
+
+#: src/gtkdialogs.c:76
+msgid "former libfaim maintainer"
+msgstr "先前 libfaim 维护者"
+
+#: src/gtkdialogs.c:77
+msgid "former lead developer"
+msgstr "先前领导开发者"
+
+#: src/gtkdialogs.c:78
+msgid "former maintainer"
+msgstr "先前维护者"
+
+#: src/gtkdialogs.c:79
+msgid "former Jabber developer"
+msgstr "先前 Jabber 开发者"
+
+#: src/gtkdialogs.c:80
+msgid "original author"
+msgstr "原作者"
+
+#: src/gtkdialogs.c:81
+msgid "hacker and designated driver [lazy bum]"
+msgstr "骇客和专属驱动程序[lazy bum]"
+
+#: src/gtkdialogs.c:86 src/gtkdialogs.c:123
+msgid "Bulgarian"
+msgstr "保加利亚语"
+
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+msgid "Catalan"
+msgstr "加泰罗尼亚语"
+
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+msgid "Czech"
+msgstr "捷克语"
+
+#: src/gtkdialogs.c:89
+msgid "Danish"
+msgstr "丹麦语"
+
+#: src/gtkdialogs.c:90
+msgid "British English"
+msgstr "英国英语"
+
+#: src/gtkdialogs.c:91
+msgid "Canadian English"
+msgstr "加拿大英语"
+
+#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+msgid "German"
+msgstr "德语"
+
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+msgid "French"
+msgstr "法语"
+
+#: src/gtkdialogs.c:96
+msgid "Hebrew"
+msgstr "希伯莱语"
+
+#: src/gtkdialogs.c:97
+msgid "Hindi"
+msgstr "印地语"
+
+#: src/gtkdialogs.c:98
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+msgid "Italian"
+msgstr "意大利语"
+
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+msgid "Japanese"
+msgstr "日语"
+
+#: src/gtkdialogs.c:101
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+msgid "Korean"
+msgstr "朝鲜语"
+
+#: src/gtkdialogs.c:103
+msgid "Dutch; Flemish"
+msgstr "荷兰语"
+
+#: src/gtkdialogs.c:104
+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 "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/gtkdialogs.c:108
+msgid "Portuguese-Brazil"
+msgstr "巴西葡萄牙语"
+
+#: src/gtkdialogs.c:109
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+msgid "Russian"
+msgstr "俄语"
+
+#: src/gtkdialogs.c:111
+msgid "Serbian"
+msgstr "塞尔维亚语"
+
+#: src/gtkdialogs.c:112
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: src/gtkdialogs.c:114
+msgid "Vietnamese"
+msgstr "越南语"
+
+#: src/gtkdialogs.c:114
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh 及 Gnome 越南语团队"
+
+#: src/gtkdialogs.c:115
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/gtkdialogs.c:116
+msgid "Traditional Chinese"
+msgstr "繁体中文"
+
+#: src/gtkdialogs.c:122
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: src/gtkdialogs.c:136
+msgid "Slovak"
+msgstr "斯洛伐克语"
+
+#: src/gtkdialogs.c:138
+msgid "Chinese"
+msgstr "中文"
+
+#: src/gtkdialogs.c:180
+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
+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 "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"Gaim 是模块化的即时通讯客户程序,同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
+"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
+"成,并以 GPL 许可协议发行。<BR><BR>"
+
+#: src/gtkdialogs.c:225
+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
+msgid "Active Developers"
+msgstr "当前开发者"
+
+#: src/gtkdialogs.c:245
+msgid "Crazy Patch Writers"
+msgstr "疯狂补丁编写者"
+
+#: src/gtkdialogs.c:260
+msgid "Retired Developers"
+msgstr "退休开发者"
+
+#: src/gtkdialogs.c:275
+msgid "Current Translators"
+msgstr "当前翻译者"
+
+#: src/gtkdialogs.c:295
+msgid "Past Translators"
+msgstr "先前翻译者"
+
+#: src/gtkdialogs.c:366 src/gtkdialogs.c:508 src/gtkdialogs.c:560
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:250 src/gtkdialogs.c:302
+#: src/gtkdialogs.c:372 src/gtkdialogs.c:514 src/gtkdialogs.c:566
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:379
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:381
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:257
+#: src/gtkdialogs.c:521
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:523
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:310
+#: src/gtkdialogs.c:574
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:312
+#: src/gtkdialogs.c:576
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名。"
 
-#: src/gtkdialogs.c:346
+#: src/gtkdialogs.c:616
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:365
+#: src/gtkdialogs.c:637
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3056,45 +3104,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:374
+#: src/gtkdialogs.c:646
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:381
+#: src/gtkdialogs.c:653
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:400
+#: src/gtkdialogs.c:674
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:401
+#: src/gtkdialogs.c:675
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:403 src/gtkdialogs.c:421 src/gtkdialogs.c:439
-#: src/gtkrequest.c:249 src/protocols/silc/chat.c:572
+#: src/gtkdialogs.c:677 src/gtkdialogs.c:699 src/gtkdialogs.c:719
+#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:417
+#: src/gtkdialogs.c:695
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:419
+#: src/gtkdialogs.c:697
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:436
+#: src/gtkdialogs.c:716
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:437
+#: src/gtkdialogs.c:717
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:474
+#: src/gtkdialogs.c:751
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3103,139 +3151,147 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:477 src/gtkdialogs.c:478
+#: src/gtkdialogs.c:754 src/gtkdialogs.c:755
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkdialogs.c:530
+#: src/gtkdialogs.c:811
 #, 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:533 src/gtkdialogs.c:534
+#: src/gtkdialogs.c:814 src/gtkdialogs.c:815
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:577
+#: src/gtkdialogs.c:853
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:579 src/gtkdialogs.c:580
+#: src/gtkdialogs.c:856 src/gtkdialogs.c:857
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:596
+#: src/gtkdialogs.c:873
 #, 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:598 src/gtkdialogs.c:599
+#: src/gtkdialogs.c:877 src/gtkdialogs.c:878
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/gtkft.c:136
+#: src/gtkft.c:140
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:157 src/gtkft.c:962
+#: src/gtkft.c:161 src/gtkft.c:978
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:160 src/gtkft.c:913
+#: src/gtkft.c:164 src/gtkft.c:929
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:163
+#: src/gtkft.c:167 src/gtkft.c:848
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:216
+#: src/gtkft.c:220
+msgid "<b>Receiving As:</b>"
+msgstr "<b>接收为:</b>"
+
+#: src/gtkft.c:222
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:219
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:393
+#: src/gtkft.c:228
+msgid "<b>Sending As:</b>"
+msgstr "<b>发送为:</b>"
+
+#: src/gtkft.c:407
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:398
+#: src/gtkft.c:412
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:524
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:556
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:541
+#: src/gtkft.c:557
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:542
+#: src/gtkft.c:558
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:543
+#: src/gtkft.c:559
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:544
+#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:636
+#: src/gtkft.c:652
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:646
+#: src/gtkft.c:662
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:655
+#: src/gtkft.c:671
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:656
+#: src/gtkft.c:672
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:698 src/stock.c:91
+#: src/gtkft.c:714 src/stock.c:92
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:708
+#: src/gtkft.c:724
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:915
+#: src/gtkft.c:931
 msgid "Failed"
 msgstr "已失败"
 
@@ -3267,7 +3323,7 @@
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
-msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
+msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
 #: src/gtkimhtml.c:2827
 #, c-format
@@ -3278,107 +3334,107 @@
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2937
+#: src/gtkimhtml.c:2944
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:163
+#: src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:238
+#: src/gtkimhtmltoolbar.c:239
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:311
+#: src/gtkimhtmltoolbar.c:312
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:395
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: src/gtkimhtmltoolbar.c:403
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:405
+#: src/gtkimhtmltoolbar.c:406
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:410
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:414
+#: src/gtkimhtmltoolbar.c:415
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:419
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:487
+#: src/gtkimhtmltoolbar.c:488
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:661
+#: src/gtkimhtmltoolbar.c:662
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:676
+#: src/gtkimhtmltoolbar.c:677
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:894
+#: src/gtkimhtmltoolbar.c:895
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:905
+#: src/gtkimhtmltoolbar.c:906
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:917
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:932
+#: src/gtkimhtmltoolbar.c:933
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:944
+#: src/gtkimhtmltoolbar.c:945
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:962
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:973
+#: src/gtkimhtmltoolbar.c:974
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:986
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:1000
+#: src/gtkimhtmltoolbar.c:1001
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1010
+#: src/gtkimhtmltoolbar.c:1011
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1021
+#: src/gtkimhtmltoolbar.c:1022
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3393,23 +3449,23 @@
 msgstr "系统日志"
 
 #. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:238
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3420,7 +3476,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:259
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3431,503 +3487,507 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "浏览器命令“%s”无效。"
-
-#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
-#: src/gtknotify.c:569
+#: src/gtknotify.c:430
+#, 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:576
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:433 src/gtknotify.c:448
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "调用“%s”出错: %s"
-
-#: src/gtknotify.c:570
+#: src/gtknotify.c:442 src/gtknotify.c:455
+#, c-format
+msgid "Error launching <b>%s</b>: %s"
+msgstr "调用 <b>%s</b> 出错: %s"
+
+#: src/gtknotify.c:577
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:129
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:160
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:386 src/gtkpounce.c:888
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:386
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:403
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:430
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:454
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:463
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:469
 msgid "_Return from away"
 msgstr "回来(_R)"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:525
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:528
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:528
+#: src/gtkpounce.c:529
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:611
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:895
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:953
+#: src/gtkpounce.c:954
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:955
+#: src/gtkpounce.c:956
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:957
+#: src/gtkpounce.c:958
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:959
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:969
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:446
+#: src/gtkprefs.c:447
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:448
+#: src/gtkprefs.c:449
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:678
 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:715
+#: src/gtkprefs.c:718
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
+#: src/gtkprefs.c:725 src/gtkprefs.c:2201 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:721
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:821
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:819
+#: src/gtkprefs.c:822
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:825
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:826
+#: src/gtkprefs.c:829
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:831
 msgid "Ignore font _faces"
 msgstr "忽略字体(_F)"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:833
 msgid "Ignore font si_zes"
 msgstr "较大字体(_Z)"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:836
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:838
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:870
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:873
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:907
-msgid "Send Message"
-msgstr "发送消息"
-
-#: src/gtkprefs.c:908
-msgid "Enter _sends message"
-msgstr "回车键发送消息(_S)"
-
 #: src/gtkprefs.c:910
+msgid "Send Message"
+msgstr "发送消息"
+
+#: src/gtkprefs.c:911
+msgid "Enter _sends message"
+msgstr "回车键发送消息(_S)"
+
+#: src/gtkprefs.c:913
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:916
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:917
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:920
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:921
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} 更改格式(_F)"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:923
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:939
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:948
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:951 src/gtkprefs.c:1003
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:953 src/gtkprefs.c:1005
+#: src/gtkprefs.c:956 src/gtkprefs.c:1008
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:955 src/gtkprefs.c:1007
+#: src/gtkprefs.c:958 src/gtkprefs.c:1010
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:961
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:961
-msgid "Buddy Display"
-msgstr "好友显示"
-
-#: src/gtkprefs.c:962 src/gtkprefs.c:1020
-msgid "Show buddy _icons"
-msgstr "显示好友图标(_I)"
-
 #: src/gtkprefs.c:964
+msgid "Buddy Display"
+msgstr "好友显示"
+
+#: src/gtkprefs.c:965 src/gtkprefs.c:1027
+msgid "Show buddy _icons"
+msgstr "显示好友图标(_I)"
+
+#: src/gtkprefs.c:967
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:969
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:971
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:973
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1017
 msgid "Enable \"_slash\" commands"
 msgstr "允许斜线开头的命令(_S)"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1020
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "将未知的斜线命令发送为消息(_S)"
+
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "在标签/标题中显示别名(_A)"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "发生事件时激活对话窗口(_R)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "发生事件时激活聊天窗口(_W)"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天中使用多种颜色来区分用户名(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:1059
-msgid "Left"
-msgstr "左"
-
-#: src/gtkprefs.c:1060
-msgid "Right"
-msgstr "右"
-
 #: src/gtkprefs.c:1066
+msgid "Left"
+msgstr "左"
+
+#: src/gtkprefs.c:1067
+msgid "Right"
+msgstr "右"
+
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:4860
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:712
+#: src/protocols/oscar/oscar.c:4974
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1128
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1172
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1176
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1294
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/gtkprefs.c:1295
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/gtkprefs.c:1296
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1297
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1298
-msgid "Gnome Default"
-msgstr "GNOME 默认"
-
-#: src/gtkprefs.c:1299
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1300
-msgid "Mozilla"
-msgstr "Mozilla"
-
 #: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1303
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr "GNOME 默认"
+
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1309
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1366
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3936,83 +3996,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1445
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1667
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4021,92 +4081,90 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1745
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1779
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1806
+#: src/gtkprefs.c:1813
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:1815
 msgid "Never"
 msgstr "从不"
 
-#: src/gtkprefs.c:1809
-#, fuzzy
+#: src/gtkprefs.c:1816
 msgid "When away"
-msgstr "仅当离开时"
-
-#: src/gtkprefs.c:1810
-#, fuzzy
+msgstr "离开时"
+
+#: src/gtkprefs.c:1817
 msgid "When away and idle"
-msgstr "仅当离开和瞌睡时"
-
-#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2776
-#: src/protocols/oscar/oscar.c:4013 src/protocols/yahoo/yahoo.c:2554
+msgstr "离开和瞌睡时"
+
+#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2801
+#: src/protocols/oscar/oscar.c:4127 src/protocols/yahoo/yahoo.c:2563
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1814
+#: src/gtkprefs.c:1821
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1824
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1827
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1829
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1830
+#: src/gtkprefs.c:1837
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1831
+#: src/gtkprefs.c:1838
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1835
+#: src/gtkprefs.c:1842
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1843
+#: src/gtkprefs.c:1850
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1912
+#: src/gtkprefs.c:1919
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4121,7 +4179,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1924
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4136,144 +4194,144 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2150
+#: src/gtkprefs.c:2157
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2164
+#: src/gtkprefs.c:2171
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2212
+#: src/gtkprefs.c:2219
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2357
+#: src/gtkprefs.c:2379
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2393
+#: src/gtkprefs.c:2415
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2396
+#: src/gtkprefs.c:2418
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2397
+#: src/gtkprefs.c:2419
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2420
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2399
+#: src/gtkprefs.c:2421
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2400
+#: src/gtkprefs.c:2422
 msgid "Network"
 msgstr "网络"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2425
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2427
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2406
+#: src/gtkprefs.c:2428
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2407
+#: src/gtkprefs.c:2429
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2432
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:78
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow only the users on my buddy list"
 msgstr "只允许我的好友"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:80
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:81
 msgid "Block all users"
 msgstr "屏蔽全部用户"
 
-#: src/gtkprivacy.c:81
+#: src/gtkprivacy.c:82
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:399
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:410
+#: src/gtkprivacy.c:411
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:581
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:582
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:590
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
+#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:620
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:621
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:627
+#: src/gtkprivacy.c:628
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4281,104 +4339,104 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:239 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1864 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1889 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1890 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:243
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:244 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: src/gtkroomlist.c:330
+#: src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: src/gtkroomlist.c:401
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:173
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:185
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4389,11 +4447,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:491
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:577
+#: src/log.c:604
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4402,7 +4460,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:579
+#: src/log.c:606
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4411,59 +4469,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:630 src/log.c:817
+#: src/log.c:657 src/log.c:787
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:640 src/log.c:829
+#: src/log.c:667 src/log.c:799
 #, 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:677
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:762
+#: src/log.c:732
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:862
+#: src/log.c:803
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:149
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "请创建一个账户。"
 
-#: src/main.c:231
+#: src/main.c:232
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:247
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>账户(_A):</b>"
 
-#: src/main.c:261
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>密码(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:278
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: src/main.c:284
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: src/main.c:290
+#: src/main.c:291
 msgid "_Sign on"
 msgstr "登入(_S)"
 
 #. full help text
-#: src/main.c:516
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4496,16 +4554,16 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:531
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/main.c:844
+#: src/main.c:845
 msgid "Unable to load preferences"
 msgstr "无法装入首选项"
 
-#: src/main.c:844
+#: src/main.c:845
 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 "
@@ -4537,10 +4595,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 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:2767
-#: src/protocols/novell/novell.c:2886 src/protocols/novell/novell.c:2937
-#: src/protocols/oscar/oscar.c:600 src/protocols/yahoo/yahoo.c:2894
-#: src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2792
+#: src/protocols/novell/novell.c:2911 src/protocols/novell/novell.c:2962
+#: src/protocols/oscar/oscar.c:734 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3024
 msgid "Available"
 msgstr "可用"
 
@@ -4553,11 +4611,11 @@
 msgstr "只对好友离开"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:518
-#: src/protocols/oscar/oscar.c:5409 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:5511 src/protocols/oscar/oscar.c:6707
-#: src/protocols/oscar/oscar.c:6712 src/protocols/yahoo/yahoo.c:2552
-#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
+#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:5483 src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:5585 src/protocols/oscar/oscar.c:6763
+#: src/protocols/oscar/oscar.c:6768 src/protocols/yahoo/yahoo.c:2561
+#: src/protocols/yahoo/yahoo.c:2928 src/protocols/yahoo/yahoo.c:3036
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4573,7 +4631,7 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1684
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1709
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
@@ -4600,16 +4658,17 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3817
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3930
 #, 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
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3821
-#: src/protocols/oscar/oscar.c:4042 src/protocols/silc/ops.c:1076
-#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:467
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4156 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:467
 #: src/protocols/zephyr/zephyr.c:643
 msgid "Buddy Information"
 msgstr "好友信息"
@@ -4695,26 +4754,26 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4852
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4966
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4863 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4977 src/protocols/silc/ops.c:808
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4864 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4978 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4853
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1708
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4967
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "昵称"
 
@@ -4729,7 +4788,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4907 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:5021 src/protocols/oscar/oscar.c:5029
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
@@ -4828,7 +4887,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1562
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -4866,7 +4925,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
+#: src/protocols/gg/gg.c:1687 src/protocols/gg/gg.c:1689
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4880,14 +4939,14 @@
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
 #: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:240
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3556
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3669
+#: src/protocols/oscar/oscar.c:6215
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3558
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3671
+#: src/protocols/oscar/oscar.c:6216
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4907,19 +4966,19 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1292
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1294
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
-#: src/protocols/silc/silc.c:1001
+#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:562
+#: src/protocols/silc/silc.c:1002
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
-#: src/protocols/silc/silc.c:1004
+#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:566
+#: src/protocols/silc/silc.c:1006
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4951,7 +5010,7 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:387
+#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:399
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -4963,39 +5022,39 @@
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:204
+#: src/protocols/irc/irc.c:216
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:223 src/protocols/toc/toc.c:197
+#: src/protocols/irc/irc.c:235 src/protocols/toc/toc.c:197
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/irc/irc.c:232
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:247 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1517 src/protocols/oscar/oscar.c:1581
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1651 src/protocols/oscar/oscar.c:1715
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:384 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:396 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:535 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/irc/irc.c:547 src/protocols/silc/chat.c:1368
+#: src/protocols/yahoo/yahoochat.c:1393
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1388
+#: src/protocols/irc/irc.c:550 src/protocols/silc/chat.c:1371
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1402
 msgid "Topic"
 msgstr "话题"
 
@@ -5008,35 +5067,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:642
+#: src/protocols/irc/irc.c:655
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:656
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:643
-#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
+#: src/protocols/irc/irc.c:675 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1577 src/protocols/napster/napster.c:656
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1597
-#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:648
-#: src/protocols/silc/silc.c:1583 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:678 src/protocols/jabber/jabber.c:1598
+#: src/protocols/msn/msn.c:1760 src/protocols/napster/napster.c:661
+#: src/protocols/silc/silc.c:1586 src/protocols/trepia/trepia.c:1298
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1918
+#: src/protocols/irc/irc.c:681 src/protocols/oscar/oscar.c:7349
+#: src/protocols/zephyr/zephyr.c:1922
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:684 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
-#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "用户名"
 
@@ -5074,12 +5134,12 @@
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
-#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "目前位于"
 
@@ -5101,111 +5161,111 @@
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:286
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:289
+#: src/protocols/irc/msgs.c:291
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:306
+#: src/protocols/irc/msgs.c:308
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:330
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:435
+#: src/protocols/irc/msgs.c:437
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:438
+#: src/protocols/irc/msgs.c:440
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:445
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:465
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:519
+#: src/protocols/irc/msgs.c:521
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:520
+#: src/protocols/irc/msgs.c:522
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:625
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:651
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:760
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:761
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:782
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:822
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:824
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:899
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
+#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:936
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -5385,7 +5445,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1414
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1548
 #: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
 #: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
 msgid "Disconnected."
@@ -5419,12 +5479,12 @@
 msgstr "服务器的挑战无效"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:795
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "全名"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:807
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "姓"
 
@@ -5434,8 +5494,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
-#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "昵称"
@@ -5491,6 +5551,7 @@
 msgstr "组织单元"
 
 #: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
+#: src/protocols/novell/novell.c:1449
 msgid "Title"
 msgstr "标题"
 
@@ -5499,7 +5560,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:5002
 msgid "Birthday"
 msgstr "生日"
 
@@ -5519,24 +5580,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2789
-#: src/protocols/novell/novell.c:2793 src/protocols/oscar/oscar.c:560
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:568
-#: src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2814
+#: src/protocols/novell/novell.c:2818 src/protocols/oscar/oscar.c:694
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:702
+#: src/protocols/yahoo/yahoo.c:2686
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1580
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "中名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4914
-#: src/protocols/silc/ops.c:839
+#: src/protocols/oscar/oscar.c:5020 src/protocols/oscar/oscar.c:5028
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "地址"
 
@@ -5580,90 +5641,91 @@
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1001
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6286
+#: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "房间(_R):"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:200
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:177
+#: src/protocols/jabber/chat.c:201
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:182
+#: src/protocols/jabber/chat.c:206
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
+#: src/protocols/jabber/chat.c:207 src/protocols/jabber/chat.c:208
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:188
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
+#: src/protocols/jabber/chat.c:213 src/protocols/jabber/chat.c:214
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:341
+#: src/protocols/jabber/chat.c:365
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
+#: src/protocols/jabber/chat.c:374 src/protocols/jabber/chat.c:519
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:366
+#: src/protocols/jabber/chat.c:390
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:367
+#: src/protocols/jabber/chat.c:391
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:441 src/protocols/jabber/chat.c:510
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:565
+#: src/protocols/jabber/chat.c:593
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:637 src/protocols/jabber/chat.c:648
 msgid "Roomlist Error"
 msgstr "房间列表错误"
 
-#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
+#: src/protocols/jabber/chat.c:638 src/protocols/jabber/chat.c:649
 msgid "Error retreiving roomlist"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:661
+#: src/protocols/jabber/chat.c:689
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:698
+#: src/protocols/jabber/chat.c:726
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:699
+#: src/protocols/jabber/chat.c:727
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:702
+#: src/protocols/jabber/chat.c:730
 msgid "Find Rooms"
 msgstr "查找房间"
 
@@ -5733,13 +5795,13 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4908
-#: src/protocols/oscar/oscar.c:4916 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:5022
+#: src/protocols/oscar/oscar.c:5030 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:853
 #: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
@@ -5762,9 +5824,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2122
-#: src/protocols/oscar/oscar.c:1585 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2147
+#: src/protocols/oscar/oscar.c:1719 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1020
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5782,7 +5844,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:6566
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -5826,8 +5888,8 @@
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5499
-#: src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:642 src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:6759
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -5855,7 +5917,7 @@
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1552
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -5975,7 +6037,7 @@
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1511
 msgid "Connection Timeout"
 msgstr "连接超时"
 
@@ -6121,24 +6183,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1555 src/protocols/jabber/jabber.c:1557
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1582
+#: src/protocols/jabber/jabber.c:1583
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1587
+#: src/protocols/jabber/jabber.c:1588
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1593
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1579
+#: src/protocols/jabber/jabber.c:1602 src/protocols/silc/silc.c:1582
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6147,26 +6209,26 @@
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: src/protocols/jabber/message.c:173
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: src/protocols/jabber/message.c:226
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: src/protocols/jabber/message.c:229
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
-#: src/protocols/jabber/message.c:293
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
@@ -6329,7 +6391,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:189
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6422,8 +6484,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2014
-#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:629
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2150
+#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:629
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6509,7 +6571,7 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -6524,34 +6586,34 @@
 msgstr "远离电脑"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
-#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2543
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3026
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2773
-#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2942
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2798
+#: src/protocols/novell/novell.c:2913 src/protocols/novell/novell.c:2967
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
-#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2545
+#: src/protocols/yahoo/yahoo.c:2912 src/protocols/yahoo/yahoo.c:3027
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2553
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:3031
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
-#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2557
+#: src/protocols/yahoo/yahoo.c:2924 src/protocols/yahoo/yahoo.c:3033
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1357 src/protocols/zephyr/zephyr.c:1376
+#: src/protocols/zephyr/zephyr.c:1360 src/protocols/zephyr/zephyr.c:1379
 msgid "Hidden"
 msgstr "隐身"
 
@@ -6622,14 +6684,14 @@
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4893
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:5007
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4879
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4993
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6639,7 +6701,8 @@
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1341 src/protocols/novell/novell.c:1443
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "位置"
 
@@ -6673,7 +6736,7 @@
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
@@ -6720,15 +6783,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
+#: src/protocols/msn/msn.c:1734 src/protocols/msn/msn.c:1736
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1755 src/protocols/trepia/trepia.c:1293
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1763
+#: src/protocols/msn/msn.c:1764
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6749,7 +6812,7 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2304
+#: src/protocols/oscar/oscar.c:2440
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6869,8 +6932,7 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6212
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:540 src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6885,7 +6947,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
+#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -7089,7 +7151,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1593
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1618
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
@@ -7099,61 +7161,82 @@
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1632
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1657
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
+#: src/protocols/novell/novell.c:1441
+msgid "Telephone Number"
+msgstr "电话号码"
+
 #: src/protocols/novell/novell.c:1445
-msgid "Userid"
+msgid "Department"
+msgstr "部门"
+
+#: src/protocols/novell/novell.c:1447
+msgid "Personal Title"
+msgstr "个人称谓"
+
+#: src/protocols/novell/novell.c:1451
+msgid "Mailstop"
+msgstr "邮箱"
+
+#: src/protocols/novell/novell.c:1453 src/protocols/oscar/oscar.c:4980
+#: src/protocols/oscar/oscar.c:4987
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#: src/protocols/novell/novell.c:1469
+msgid "User ID"
 msgstr "用户 ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1483
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1479
+#: src/protocols/novell/novell.c:1504
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:1608
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1608
+#: src/protocols/novell/novell.c:1633
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1638
+#: src/protocols/novell/novell.c:1663
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1672
+#: src/protocols/novell/novell.c:1697
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1687
+#: src/protocols/novell/novell.c:1712
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1822
+#: src/protocols/novell/novell.c:1847
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1849
+#: src/protocols/novell/novell.c:1874
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1850
+#: src/protocols/novell/novell.c:1875
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7164,15 +7247,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1852
+#: src/protocols/novell/novell.c:1877
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1955
+#: src/protocols/novell/novell.c:1980
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:2009
+#: src/protocols/novell/novell.c:2034
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7182,34 +7265,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2107
+#: src/protocols/novell/novell.c:2132
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2129
+#: src/protocols/novell/novell.c:2154
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2433
+#: src/protocols/novell/novell.c:2458
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2779 src/protocols/oscar/oscar.c:568
-#: src/protocols/oscar/oscar.c:6512 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2804 src/protocols/oscar/oscar.c:702
+#: src/protocols/oscar/oscar.c:6568 src/protocols/yahoo/yahoo.c:2565
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2815
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2945
+#: src/protocols/novell/novell.c:2914 src/protocols/novell/novell.c:2970
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3339
+#: src/protocols/novell/novell.c:3364
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -7224,295 +7307,299 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3435 src/protocols/novell/novell.c:3437
+#: src/protocols/novell/novell.c:3461 src/protocols/novell/novell.c:3463
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3456
+#: src/protocols/novell/novell.c:3482
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3460
+#: src/protocols/novell/novell.c:3486
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:187
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:190
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:191
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:191
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
-
 #: src/protocols/oscar/oscar.c:192
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
+
+#: src/protocols/oscar/oscar.c:193
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:195
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:196
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:197
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:198
-msgid "Busted SNAC payload"
-msgstr "SNAC 有效负载激增"
-
 #: src/protocols/oscar/oscar.c:199
+msgid "Busted SNAC payload"
+msgstr "SNAC 有效负载激增"
+
+#: src/protocols/oscar/oscar.c:200
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:202
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:204
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:205
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:205
-msgid "List overflow"
-msgstr "列表溢出"
-
 #: src/protocols/oscar/oscar.c:206
+msgid "List overflow"
+msgstr "列表溢出"
+
+#: src/protocols/oscar/oscar.c:207
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:208
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:209
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:423
+#: src/protocols/oscar/oscar.c:452
+msgid "(There was an error receiving this message)"
+msgstr "(接收此消息出错)"
+
+#: src/protocols/oscar/oscar.c:557
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:426
+#: src/protocols/oscar/oscar.c:560
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:429 src/protocols/silc/silc.c:641
+#: src/protocols/oscar/oscar.c:563 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:432 src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6870
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:573
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:442
+#: src/protocols/oscar/oscar.c:576
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:445
+#: src/protocols/oscar/oscar.c:579
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:582
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:451
+#: src/protocols/oscar/oscar.c:585
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:454
+#: src/protocols/oscar/oscar.c:588
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:591
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:594
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:597
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:600
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:603
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:606
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:609
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:612
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:616
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:619
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:622
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:506 src/protocols/oscar/oscar.c:5508
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:5582
+#: src/protocols/oscar/oscar.c:6762
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5502
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:5576
+#: src/protocols/oscar/oscar.c:6760
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5505
-#: src/protocols/oscar/oscar.c:6705
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:5579
+#: src/protocols/oscar/oscar.c:6761
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:516
+#: src/protocols/oscar/oscar.c:650
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:718
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:727
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:862
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:864
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:737
+#: src/protocols/oscar/oscar.c:871
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:814 src/protocols/oscar/oscar.c:945
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:1079
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:895
+#: src/protocols/oscar/oscar.c:1029
 #, 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:1312
+#: src/protocols/oscar/oscar.c:1446
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1317
+#: src/protocols/oscar/oscar.c:1451
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1486
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1356
+#: src/protocols/oscar/oscar.c:1490
 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:1360 src/protocols/oscar/oscar.c:3318
+#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:3431
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1427 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1561 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1446
+#: src/protocols/oscar/oscar.c:1580
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1527
+#: src/protocols/oscar/oscar.c:1661
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1541
+#: src/protocols/oscar/oscar.c:1675
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7522,46 +7609,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1569
+#: src/protocols/oscar/oscar.c:1703
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:2107
+#: src/protocols/oscar/oscar.c:1804 src/protocols/oscar/oscar.c:2243
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1678
+#: src/protocols/oscar/oscar.c:1812
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1791 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1925 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:1796
+#: src/protocols/oscar/oscar.c:1930
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1867
+#: src/protocols/oscar/oscar.c:2002
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1991 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:2127 src/protocols/toc/toc.c:540
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2132
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2000
+#: src/protocols/oscar/oscar.c:2136
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2005
+#: src/protocols/oscar/oscar.c:2141
 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."
@@ -7569,21 +7656,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2010
+#: src/protocols/oscar/oscar.c:2146
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2042
+#: src/protocols/oscar/oscar.c:2178
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2114
+#: src/protocols/oscar/oscar.c:2250
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2180
-#: src/protocols/oscar/oscar.c:2269
+#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2316
+#: src/protocols/oscar/oscar.c:2405
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7591,24 +7678,20 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2153 src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2289 src/protocols/oscar/oscar.c:2319
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2272
+#: src/protocols/oscar/oscar.c:2408
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3102 src/protocols/oscar/oscar.c:3124
-msgid "(There was an error receiving this message)"
-msgstr "(接收此消息出错)"
-
-#: src/protocols/oscar/oscar.c:3310
+#: src/protocols/oscar/oscar.c:3423
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3313
+#: src/protocols/oscar/oscar.c:3426
 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 "
@@ -7617,42 +7700,41 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3349
+#: src/protocols/oscar/oscar.c:3462
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3357
+#: src/protocols/oscar/oscar.c:3470
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3358
+#: src/protocols/oscar/oscar.c:3471
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3501
 #, 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:3393 src/protocols/oscar/oscar.c:3395
+#: src/protocols/oscar/oscar.c:3506 src/protocols/oscar/oscar.c:3508
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3443 src/protocols/oscar/oscar.c:3445
-#: src/protocols/oscar/oscar.c:3452 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3918
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3979
-#: src/protocols/oscar/oscar.c:6133 src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6253
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3451
+#: src/protocols/oscar/oscar.c:3564
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:3659
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7661,11 +7743,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3554 src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:3667 src/protocols/oscar/oscar.c:6213
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3679
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7675,17 +7757,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:3680
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3574
+#: src/protocols/oscar/oscar.c:3687
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3582
+#: src/protocols/oscar/oscar.c:3695
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7698,7 +7780,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3703
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7711,7 +7793,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3598
+#: src/protocols/oscar/oscar.c:3711
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7724,32 +7806,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3732
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3738
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3629
+#: src/protocols/oscar/oscar.c:3742
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3826
 #, 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:3722
+#: src/protocols/oscar/oscar.c:3835
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3844
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7757,85 +7839,92 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3853
 #, 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:3749
+#: src/protocols/oscar/oscar.c:3862
 #, 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:3758
+#: src/protocols/oscar/oscar.c:3871
 #, 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:3812 src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:3878
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3992
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/protocols/oscar/oscar.c:3915
-msgid "Your message did not get sent."
-msgstr "未发送您的消息。"
-
-#: src/protocols/oscar/oscar.c:3916
-#, c-format
-msgid "Your message to %s did not get sent:"
-msgstr "您给 %s 的消息未发送:"
-
-#: src/protocols/oscar/oscar.c:3975
+#. Data is assumed to be the destination sn
+#: src/protocols/oscar/oscar.c:4027
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "无法发送消息: %s"
+
+#: src/protocols/oscar/oscar.c:4027 src/protocols/oscar/oscar.c:4032
+#: src/protocols/oscar/oscar.c:4090 src/protocols/oscar/oscar.c:4094
+msgid "Unknown reason."
+msgstr "未知原因。"
+
+#: src/protocols/oscar/oscar.c:4030
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "无法给 %s 发送消息:"
+
+#: src/protocols/oscar/oscar.c:4090
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:4093
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4115
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4118
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4008 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4122 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4206
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4278
+#: src/protocols/oscar/oscar.c:4392
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4612
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4499
+#: src/protocols/oscar/oscar.c:4613
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7843,166 +7932,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4562
+#: src/protocols/oscar/oscar.c:4676
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4564
+#: src/protocols/oscar/oscar.c:4678
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4595
+#: src/protocols/oscar/oscar.c:4709
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4873
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: src/protocols/oscar/oscar.c:4878 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4992 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4993
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:5010
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:5014
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:5019
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4909 src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:5023 src/protocols/oscar/oscar.c:5031
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:5027
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:5035
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4922
+#: src/protocols/oscar/oscar.c:5036
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4923
+#: src/protocols/oscar/oscar.c:5037
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:5038
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:5040
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4936
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5099
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:5006
+#: src/protocols/oscar/oscar.c:5120
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5010
+#: src/protocols/oscar/oscar.c:5124
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5048
+#: src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5164
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5195
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5198
 #, 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:5087
+#: src/protocols/oscar/oscar.c:5201
 #, 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:5090
+#: src/protocols/oscar/oscar.c:5204
 #, 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:5093
+#: src/protocols/oscar/oscar.c:5207
 #, 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:5096
+#: src/protocols/oscar/oscar.c:5210
 #, 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:5099
+#: src/protocols/oscar/oscar.c:5213
 #, 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:5102
+#: src/protocols/oscar/oscar.c:5216
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8011,25 +8096,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5113 src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5234
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5183
+#: src/protocols/oscar/oscar.c:5296
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5357
+#: src/protocols/oscar/oscar.c:5431
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5432
 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 "
@@ -8038,7 +8123,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5385
+#: src/protocols/oscar/oscar.c:5459
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8048,19 +8133,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5390
+#: src/protocols/oscar/oscar.c:5464
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5406 src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6767
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5424
+#: src/protocols/oscar/oscar.c:5498
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5425
+#: src/protocols/oscar/oscar.c:5499
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8069,7 +8154,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:5539
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8081,11 +8166,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5544
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5548
+#: src/protocols/oscar/oscar.c:5622
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8095,16 +8180,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5550 src/protocols/oscar/oscar.c:5999
-#: src/protocols/oscar/oscar.c:6013
+#: src/protocols/oscar/oscar.c:5624 src/protocols/oscar/oscar.c:6073
+#: src/protocols/oscar/oscar.c:6087
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5785
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:5786
 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 "
@@ -8113,13 +8198,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5894 src/protocols/oscar/oscar.c:5895
-#: src/protocols/oscar/oscar.c:5900 src/protocols/oscar/oscar.c:6057
-#: src/protocols/oscar/oscar.c:6058 src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:5969
+#: src/protocols/oscar/oscar.c:5974 src/protocols/oscar/oscar.c:6131
+#: src/protocols/oscar/oscar.c:6132 src/protocols/oscar/oscar.c:6137
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6071
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8127,11 +8212,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6071 src/protocols/oscar/oscar.c:6085
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6085
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8141,18 +8226,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6094
+#: src/protocols/oscar/oscar.c:6168
 #, 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:6100
+#: src/protocols/oscar/oscar.c:6174
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6133
+#: src/protocols/oscar/oscar.c:6207
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8162,17 +8247,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6175
+#: src/protocols/oscar/oscar.c:6249
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6176
+#: src/protocols/oscar/oscar.c:6250
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:6253
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8182,76 +8267,76 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6254
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6217 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6291 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6239
+#: src/protocols/oscar/oscar.c:6325
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6414
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6484
+#: src/protocols/oscar/oscar.c:6540
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6770
+#: src/protocols/oscar/oscar.c:6826
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:6771
+#: src/protocols/oscar/oscar.c:6827
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6790
+#: src/protocols/oscar/oscar.c:6846
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6796
+#: src/protocols/oscar/oscar.c:6852
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6808
+#: src/protocols/oscar/oscar.c:6864
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6881
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6911
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:6912
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:6919
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:6971
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6960
+#: src/protocols/oscar/oscar.c:7016
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:7019
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:7020
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8259,75 +8344,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:7037
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6982
+#: src/protocols/oscar/oscar.c:7038
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6983
+#: src/protocols/oscar/oscar.c:7039
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7000
+#: src/protocols/oscar/oscar.c:7056
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:7001
+#: src/protocols/oscar/oscar.c:7057
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:7083 src/protocols/silc/silc.c:795
+#: src/protocols/oscar/oscar.c:7139 src/protocols/silc/silc.c:795
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7088
+#: src/protocols/oscar/oscar.c:7144
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7094
+#: src/protocols/oscar/oscar.c:7150
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:7099 src/protocols/silc/silc.c:791
+#: src/protocols/oscar/oscar.c:7155 src/protocols/silc/silc.c:791
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7160
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7108
+#: src/protocols/oscar/oscar.c:7164
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7117
+#: src/protocols/oscar/oscar.c:7173
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7177
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7181
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7129
+#: src/protocols/oscar/oscar.c:7185
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7192
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7142
+#: src/protocols/oscar/oscar.c:7198
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7147
+#: src/protocols/oscar/oscar.c:7203
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -8342,21 +8427,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7265 src/protocols/oscar/oscar.c:7267
+#: src/protocols/oscar/oscar.c:7322 src/protocols/oscar/oscar.c:7324
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7343
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7291
+#: src/protocols/oscar/oscar.c:7346
 msgid "Auth port"
 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:340
+#: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "用户 %s 未出现于网络中"
@@ -8437,12 +8522,12 @@
 msgstr "设定聊天密码"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
+#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
-#: src/protocols/silc/ops.c:1277
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
+#: src/protocols/silc/ops.c:1288
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
@@ -8451,18 +8536,18 @@
 msgstr "显示公钥"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:222
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
-#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
+#: 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:1098
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
-#: src/protocols/silc/ops.c:1089
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
@@ -8595,36 +8680,36 @@
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "用户模式"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
 #: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "地理位置"
 
@@ -8644,7 +8729,7 @@
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8652,81 +8737,81 @@
 msgid "_Passphrase:"
 msgstr "密码句(_P):"
 
-#: src/protocols/silc/chat.c:66
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "频道信息"
 
-#: src/protocols/silc/chat.c:68
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:105
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>频道名称:</b> %s"
 
-#: src/protocols/silc/chat.c:108
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>用户数:</b> %d"
 
-#: src/protocols/silc/chat.c:115
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>频道创建人:</b> %s"
 
-#: src/protocols/silc/chat.c:124
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>频道密码句:</b> %s"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>频道 HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:132
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>频道话题:</b><br>%s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>频道模式:</b> "
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
-#: src/protocols/silc/chat.c:151
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
-#: src/protocols/silc/chat.c:221
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:276
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:385
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:392
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8738,130 +8823,130 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
-#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:563
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:578
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:580
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:708
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:850
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:857
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:861
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:868
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:879
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:883
+#: src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:890
+#: src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:899
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:905
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:909
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:915
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:919
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:981
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:985
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1039
+#: src/protocols/silc/chat.c:1051
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: src/protocols/silc/chat.c:1041
+#: src/protocols/silc/chat.c:1053
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1054
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:894
+#: src/protocols/silc/chat.c:1247 src/protocols/silc/silc.c:894
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:895
+#: src/protocols/silc/chat.c:1248 src/protocols/silc/silc.c:895
 msgid "Unknown command"
 msgstr "未知命令"
 
 #: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
 #: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
-#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
-#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全文件传送"
 
@@ -8883,170 +8968,170 @@
 msgid "File transfer sessions does not exist"
 msgstr "文件传送会话不存在"
 
-#: src/protocols/silc/ft.c:207
+#: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "没有激活的文件传送会话"
 
-#: src/protocols/silc/ft.c:212
+#: src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "文件传送已开始"
 
-#: src/protocols/silc/ft.c:217
+#: src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "无法执行文件传送的密钥协议"
 
-#: src/protocols/silc/ft.c:223
+#: src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "无法开始传送文件"
 
-#: src/protocols/silc/ft.c:343
+#: src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
-#: src/protocols/silc/ops.c:351
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, 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:414
+#: src/protocols/silc/ops.c:423
 #, 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:418
+#: src/protocols/silc/ops.c:427
 #, 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:451
+#: src/protocols/silc/ops.c:460
 #, 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:459
+#: src/protocols/silc/ops.c:468
 #, 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:488
+#: src/protocols/silc/ops.c:497
 #, 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:518 src/protocols/silc/ops.c:523
-#: src/protocols/silc/ops.c:528
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
-#: src/protocols/silc/ops.c:559
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:605
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:792
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:815
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:819
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:823
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:827
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:831
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:850
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:855
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:903
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:1073
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:783
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:783
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1144
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: src/protocols/silc/ops.c:1278
+#: src/protocols/silc/ops.c:1289
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1292
+#: src/protocols/silc/ops.c:1303
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "服务器统计"
 
-#: src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
-#: src/protocols/silc/ops.c:1355
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9081,97 +9166,97 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: src/protocols/silc/ops.c:1378
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1386
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: src/protocols/silc/ops.c:1399
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1480
+#: src/protocols/silc/ops.c:1491
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1496
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1505
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1529
+#: src/protocols/silc/ops.c:1540
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
+#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
 #: src/protocols/silc/silc.c:173
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1591
+#: src/protocols/silc/ops.c:1602
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1638
+#: src/protocols/silc/ops.c:1649
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1679
+#: src/protocols/silc/ops.c:1690
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1708
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1711
+#: src/protocols/silc/ops.c:1722
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1714
+#: src/protocols/silc/ops.c:1725
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1752
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -9295,7 +9380,7 @@
 "到的有关您自己的信息。"
 
 #: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:1141
+#: src/protocols/silc/silc.c:1143
 msgid "Message of the Day"
 msgstr "每日消息"
 
@@ -9303,7 +9388,7 @@
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1136
+#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1138
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
@@ -9324,156 +9409,156 @@
 msgid "Failed to leave channel"
 msgstr "离开频道失败"
 
-#: src/protocols/silc/silc.c:1012
+#: src/protocols/silc/silc.c:1014
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1093
+#: src/protocols/silc/silc.c:1095
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1197
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1200
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1204
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1215
+#: src/protocols/silc/silc.c:1217
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1247
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1308
+#: src/protocols/silc/silc.c:1310
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1312
+#: src/protocols/silc/silc.c:1314
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1316
+#: src/protocols/silc/silc.c:1318
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1321
+#: src/protocols/silc/silc.c:1323
 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:1325
+#: src/protocols/silc/silc.c:1327
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1331
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1333 src/protocols/zephyr/zephyr.c:1675
+#: src/protocols/silc/silc.c:1335 src/protocols/zephyr/zephyr.c:1678
 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:1337
+#: src/protocols/silc/silc.c:1339
 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:1341
+#: src/protocols/silc/silc.c:1343
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1347
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1349
+#: src/protocols/silc/silc.c:1351
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1355
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1361
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1365
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1369
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1373
 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:1375
+#: src/protocols/silc/silc.c:1377
 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:1379
+#: src/protocols/silc/silc.c:1381
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1383
+#: src/protocols/silc/silc.c:1385
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1389
 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:1391
+#: src/protocols/silc/silc.c:1393
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1395
+#: src/protocols/silc/silc.c:1397
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1399
+#: src/protocols/silc/silc.c:1401
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1403
+#: src/protocols/silc/silc.c:1405
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1407
+#: src/protocols/silc/silc.c:1409
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1411
+#: src/protocols/silc/silc.c:1413
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1418
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1422
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9481,39 +9566,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1434
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1439
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1442
+#: src/protocols/silc/silc.c:1444
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1445
+#: src/protocols/silc/silc.c:1447
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1452
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1457
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1458
+#: src/protocols/silc/silc.c:1460
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1465
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1470
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9527,40 +9612,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1554
+#: src/protocols/silc/silc.c:1557
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1556
+#: src/protocols/silc/silc.c:1559
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1586
+#: src/protocols/silc/silc.c:1589
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1592
+#: src/protocols/silc/silc.c:1595
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1596
+#: src/protocols/silc/silc.c:1599
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/silc/silc.c:1604
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1607
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1610
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1613
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -9802,43 +9887,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1421
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1557
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1679
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1715
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1760 src/protocols/toc/toc.c:1800
+#: src/protocols/toc/toc.c:1924 src/protocols/toc/toc.c:2012
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1957
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2057
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2091
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2098
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -9854,15 +9939,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2182 src/protocols/toc/toc.c:2184
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2203
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2207
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9946,7 +10031,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
+#: src/protocols/trepia/trepia.c:1272 src/protocols/trepia/trepia.c:1274
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
@@ -10016,14 +10101,14 @@
 msgstr "用户名无效。"
 
 #: src/protocols/yahoo/yahoo.c:1825
-msgid "Normal authencation failed!"
+msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
-"The normal authencation method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authencation, will which result in "
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 msgstr ""
 "普通的身份验证方法失败。这意味着您的密码可能不对,或者是 Yahoo! 的身份验证方"
@@ -10059,61 +10144,61 @@
 
 #: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
 #: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
-#: src/protocols/yahoo/yahoo.c:3014
+#: src/protocols/yahoo/yahoo.c:2547 src/protocols/yahoo/yahoo.c:2914
+#: src/protocols/yahoo/yahoo.c:3028
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
-#: src/protocols/yahoo/yahoo.c:3015
+#: src/protocols/yahoo/yahoo.c:2549 src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:3029
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
-#: src/protocols/yahoo/yahoo.c:3016
+#: src/protocols/yahoo/yahoo.c:2551 src/protocols/yahoo/yahoo.c:2918
+#: src/protocols/yahoo/yahoo.c:3030
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
-#: src/protocols/yahoo/yahoo.c:3018
+#: src/protocols/yahoo/yahoo.c:2555 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:3032
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
-#: src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/yahoo/yahoo.c:2559 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:3034
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:2666
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2736
+#: src/protocols/yahoo/yahoo.c:2745
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2741
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2811
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/yahoo/yahoo.c:2821
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2825
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
@@ -10128,47 +10213,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3350 src/protocols/yahoo/yahoo.c:3352
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3356
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3359
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3362
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3365
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3386
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3389
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3392
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3395
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3383
+#: src/protocols/yahoo/yahoo.c:3398
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
@@ -10264,57 +10349,57 @@
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/yahoo/yahoochat.c:192
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您现在正在 %s 中聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1396
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/yahoo/yahoochat.c:1399
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1450
+#: src/protocols/yahoo/yahoochat.c:1464
 msgid "User Rooms"
 msgstr "用户房间"
 
@@ -10341,60 +10426,60 @@
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:986 src/protocols/zephyr/zephyr.c:987
+#: src/protocols/zephyr/zephyr.c:989 src/protocols/zephyr/zephyr.c:990
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:1388
+#: src/protocols/zephyr/zephyr.c:1391
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1394
+#: src/protocols/zephyr/zephyr.c:1397
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1400
+#: src/protocols/zephyr/zephyr.c:1403
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:1411
+#: src/protocols/zephyr/zephyr.c:1414
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:1680
+#: src/protocols/zephyr/zephyr.c:1683
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:1685
+#: src/protocols/zephyr/zephyr.c:1688
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:1690
+#: src/protocols/zephyr/zephyr.c:1693
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:1695
+#: src/protocols/zephyr/zephyr.c:1698
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:1701
+#: src/protocols/zephyr/zephyr.c:1704
 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:1706
+#: src/protocols/zephyr/zephyr.c:1709
 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:1712
+#: src/protocols/zephyr/zephyr.c:1715
 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:1718
+#: src/protocols/zephyr/zephyr.c:1721
 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;"
@@ -10402,7 +10487,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:1724
+#: src/protocols/zephyr/zephyr.c:1727
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10410,15 +10495,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:1729
+#: src/protocols/zephyr/zephyr.c:1732
 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:1805
+#: src/protocols/zephyr/zephyr.c:1808
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:1808
+#: src/protocols/zephyr/zephyr.c:1811
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10433,19 +10518,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1888 src/protocols/zephyr/zephyr.c:1890
+#: src/protocols/zephyr/zephyr.c:1892 src/protocols/zephyr/zephyr.c:1894
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/zephyr/zephyr.c:1919
 msgid "Exposure"
 msgstr "暴露"
 
@@ -10472,7 +10557,7 @@
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:181
+#: src/prpl.h:180
 msgid "Custom"
 msgstr "自定义"
 
@@ -10580,56 +10665,55 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "抱歉,我现在不在。请稍候再与我联系。"
 
-#: src/stock.c:86
+#: src/stock.c:87
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/stock.c:88
-#, fuzzy
+#: src/stock.c:89
 msgid "_Invite"
-msgstr "邀请"
-
-#: src/stock.c:89
-msgid "_Modify"
-msgstr "修改(_M)"
+msgstr "邀请(_I)"
 
 #: src/stock.c:90
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/stock.c:91
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/stock.c:92
+#: src/stock.c:93
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2353
+#: src/util.c:2352
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2356
+#: src/util.c:2355
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2382
+#: src/util.c:2381
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2396
+#: src/util.c:2395
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2404
+#: src/util.c:2403
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2412
+#: src/util.c:2411
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2822
+#: src/util.c:2828
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
@@ -10644,6 +10728,3 @@
 #: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "提示"
-
-#~ msgid "<font sml=\"msn\">%s</font><br>"
-#~ msgstr "<font sml=\"msn\">%s</font><br>"
--- a/src/connection.c	Tue Aug 24 05:16:35 2004 +0000
+++ b/src/connection.c	Tue Aug 24 11:43:39 2004 +0000
@@ -263,6 +263,9 @@
 		gaim_notify_close_with_handle(gc);
 	}
 
+	if (!gaim_account_get_remember_password(account))
+		gaim_account_set_password(account,NULL);
+
 	gaim_connection_destroy(gc);
 }
 
@@ -270,6 +273,10 @@
 gaim_connection_disconnect_cb(gpointer data)
 {
 	GaimAccount *account = data;
+
+	if (!gaim_account_get_remember_password(account))
+		gaim_account_set_password(account,NULL);
+
 	GaimConnection *gc = gaim_account_get_connection(account);
 
 	if(gc)