changeset 8242:1c06cadec61a

[gaim-migrate @ 8965] " applied 02/10 POT." -- Funda Wang - fundawang committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 12 Feb 2004 19:13:55 +0000
parents 1d68a254237b
children 217643616a74
files po/zh_CN.po
diffstat 1 files changed, 1816 insertions(+), 1495 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Feb 12 17:58:53 2004 +0000
+++ b/po/zh_CN.po	Thu Feb 12 19:13:55 2004 +0000
@@ -1,13 +1,13 @@
 # gaim 软件包的简体中文翻译。
 # Copyright (C) 2003 gaim team.
 # This file is distributed under the same license as the gaim package.
-# Funda Wang <fundawang@linux.net.cn>, 2003.
+# Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2004-01-05 00:40-0500\n"
-"PO-Revision-Date: 2004-01-04 20:59+0800\n"
+"POT-Creation-Date: 2004-02-10 00:00-0500\n"
+"PO-Revision-Date: 2004-02-09 11:03+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"
@@ -29,6 +29,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/autorecon.c:107 plugins/autorecon.c:109
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
@@ -128,7 +129,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:483 src/gtkaccount.c:1763
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -144,16 +145,16 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2548 src/gtkpounce.c:411
-#: src/gtkprefs.c:1456 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
-#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
-#: src/protocols/oscar/oscar.c:6146
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1472 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:56
+#: src/protocols/jabber/presence.c:112 src/protocols/oscar/oscar.c:2860
+#: src/protocols/oscar/oscar.c:4645 src/protocols/oscar/oscar.c:5638
+#: src/protocols/oscar/oscar.c:6240
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:517
 msgid "Back"
 msgstr "回来"
 
@@ -161,16 +162,16 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:581
+#: plugins/docklet/docklet.c:172 src/gtkft.c:583
 msgid "File Transfers"
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1922 src/main.c:284
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:330
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2454 src/main.c:290
 msgid "Preferences"
 msgstr "首选项"
 
@@ -234,6 +235,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
@@ -363,6 +365,161 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+msgid "Local Addressbook"
+msgstr "本地地址簿"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2609 src/gtkprefs.c:840 src/gtkprefs.c:1500
+#: src/protocols/jabber/jabber.c:939
+msgid "None"
+msgstr "无"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1873
+#: src/gtkroomlist.c:531 src/protocols/jabber/jabber.c:616
+#: src/protocols/msn/msn.c:1353 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "名称"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+msgid "Instant Messaging"
+msgstr "即时通讯"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6500
+msgid "Search"
+msgstr "搜索"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3611
+#: src/gtkblist.c:3939
+msgid "Group:"
+msgstr "组:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+msgid "New Person"
+msgstr "新建联系人"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+msgid "Select Buddy"
+msgstr "选择好友"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:372
+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:451
+msgid "Show user details"
+msgstr "显示用户细节"
+
+#: plugins/gevolution/assoc-buddy.c:452
+msgid "Hide user details"
+msgstr "隐藏用户细节"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+msgid "_Associate Buddy"
+msgstr "关联好友(_A)"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:673 src/blist.c:860 src/blist.c:2077 src/gtkblist.c:3436
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
+msgid "Buddies"
+msgstr "好友"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr "添加到地址簿"
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+msgid "Evolution Integration Configuration"
+msgstr "Evolution 集成配置"
+
+#. Label
+#: plugins/gevolution/gevolution.c:350
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "选择要将好友自动添加到哪些账户。"
+
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:621
+msgid "Account"
+msgstr "账户"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:461
+msgid "Evolution Integration"
+msgstr "Evolution 集成"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr "提供与 Ximian Evolution 的集成。"
+
+#: plugins/gevolution/new_person_dialog.c:270
+msgid "Please enter the person's information below."
+msgstr "请在下面输入联系人的信息。"
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "请在下面输入好友的用户名和账户类型。"
+
+#: plugins/gevolution/new_person_dialog.c:294
+msgid "Account type:"
+msgstr "账户类型:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "用户名:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+msgid "Optional information:"
+msgstr "额外信息:"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:319
+#: src/protocols/oscar/oscar.c:3095
+msgid "Buddy Icon"
+msgstr "好友图标"
+
+#: plugins/gevolution/new_person_dialog.c:353
+msgid "First name:"
+msgstr "名:"
+
+#: plugins/gevolution/new_person_dialog.c:365
+msgid "Last name:"
+msgstr "姓:"
+
+#: plugins/gevolution/new_person_dialog.c:385
+msgid "E-mail:"
+msgstr "电子邮件:"
+
 #: plugins/history.c:74
 msgid "History"
 msgstr "历史"
@@ -391,6 +548,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
@@ -559,6 +717,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
@@ -570,13 +729,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#. *< summary
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -662,6 +822,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
@@ -680,6 +841,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
@@ -730,6 +892,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
@@ -748,6 +911,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
@@ -766,11 +930,12 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:799
+#: plugins/statenotify.c:30 src/gtkpounce.c:803
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
@@ -804,17 +969,18 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: plugins/tcl/tcl.c:348
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -825,14 +991,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "好友点点通"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#. *  description
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
@@ -862,6 +1029,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
@@ -886,7 +1054,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:843
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -908,6 +1076,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -933,8 +1102,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2382
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2650
+#: src/gtkprefs.c:2372
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -953,8 +1122,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:881
+#: src/gtkprefs.c:2373
 msgid "Conversations"
 msgstr "对话"
 
@@ -970,16 +1139,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/about.c:57
+#: src/about.c:59
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/about.c:72
+#: src/about.c:74
 #, 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:92
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -989,309 +1158,304 @@
 "Jabber,Napster,Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写成,并以 GPL 许可协议发"
 "行。<BR><BR>"
 
-#: src/about.c:102
+#: src/about.c:104
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/about.c:107
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/about.c:108
+#: src/about.c:110
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/about.c:110
+#: src/about.c:112
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/about.c:113
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/about.c:114
+#: src/about.c:116
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/about.c:117 src/about.c:118 src/about.c:119
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "开发者"
 
-#: src/about.c:120
+#: src/about.c:122
 msgid "support"
 msgstr "支持"
 
-#: src/about.c:127
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:141
+#: src/about.c:143
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:142
+#: src/about.c:144
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/about.c:143
+#: src/about.c:145
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:146
+#: src/about.c:148
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:147
+#: src/about.c:149
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:148
+#: src/about.c:150
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:151
+#: src/about.c:153
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:159
+#: src/about.c:161
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:160 src/about.c:193
+#: src/about.c:162 src/about.c:195
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:161 src/about.c:194
+#: src/about.c:163 src/about.c:196
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:163
+#: src/about.c:165
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:164 src/about.c:195
-msgid "German"
-msgstr "德语"
-
-#: src/about.c:165 src/about.c:196
-msgid "Spanish"
-msgstr "西班牙语"
-
 #: src/about.c:166 src/about.c:197
+msgid "German"
+msgstr "德语"
+
+#: src/about.c:167 src/about.c:198
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:169 src/about.c:200
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:168
+#: src/about.c:170
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:169
+#: src/about.c:171
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:170 src/about.c:200
+#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:173 src/about.c:204
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:172
+#: src/about.c:174
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:173
+#: src/about.c:175
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:174 src/about.c:203
+#: src/about.c:176 src/about.c:205
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:175
+#: src/about.c:177
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:176
+#: src/about.c:178
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:177
+#: src/about.c:179
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:178 src/about.c:204
-msgid "Russian"
-msgstr "俄语"
-
-#: src/about.c:179
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
 #: src/about.c:180 src/about.c:206
+msgid "Russian"
+msgstr "俄语"
+
+#: src/about.c:181
+msgid "Serbian"
+msgstr "塞尔维亚语"
+
+#: src/about.c:182 src/about.c:208
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:182
+#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:183
+#: src/about.c:185
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:190
-msgid "Past Translators"
-msgstr "先前翻译者"
-
-#: src/about.c:191
-msgid "Amharic"
-msgstr "阿姆哈拉语"
-
 #: src/about.c:192
+msgid "Past Translators"
+msgstr "先前翻译者"
+
+#: src/about.c:193
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: src/about.c:194
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:199
+#: src/about.c:201
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:205
+#: src/about.c:207
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:272 src/protocols/jabber/jabber.c:1012
+#: src/account.c:274 src/protocols/jabber/jabber.c:1036
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:280
+#: src/account.c:282
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:305
+#: src/account.c:307
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:311
+#: src/account.c:313
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:317
+#: src/account.c:319
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:322
+#: src/account.c:324
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:330
+#: src/account.c:332
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:333 src/connection.c:193 src/dialogs.c:1488
-#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1738
-#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1057
-#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
+#: src/account.c:335 src/connection.c:198 src/dialogs.c:1478
+#: src/dialogs.c:1495 src/dialogs.c:1514 src/gtkblist.c:2005
+#: src/gtkrequest.c:192 src/protocols/jabber/jabber.c:1081
+#: src/protocols/jabber/xdata.c:328 src/protocols/msn/msn.c:181
 #: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2453
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
-#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
-#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
-#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
+#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2470
+#: src/protocols/oscar/oscar.c:2551 src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:6386 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:6517 src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2417 src/request.h:1020
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
-#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
-#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
-#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1739
-#: src/gtkblist.c:3697 src/gtkconn.c:163 src/gtkprivacy.c:569
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
-#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:684
-#: src/protocols/jabber/jabber.c:1058 src/protocols/jabber/xdata.c:335
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2417
-#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
-#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
-#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
-#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
-#: src/request.h:1018 src/request.h:1028
+#: src/account.c:336 src/account.c:370 src/connection.c:199 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1321
+#: src/dialogs.c:1479 src/dialogs.c:1496 src/dialogs.c:1515
+#: src/gtkaccount.c:1616 src/gtkaccount.c:2085 src/gtkblist.c:2006
+#: src/gtkblist.c:3978 src/gtkconn.c:169 src/gtkprivacy.c:561
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:599 src/gtkprivacy.c:610
+#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/chat.c:698
+#: src/protocols/jabber/jabber.c:685 src/protocols/jabber/jabber.c:1082
+#: src/protocols/jabber/xdata.c:329 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
+#: src/protocols/oscar/oscar.c:2434 src/protocols/oscar/oscar.c:2471
+#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:6117 src/protocols/oscar/oscar.c:6291
+#: src/protocols/oscar/oscar.c:6387 src/protocols/oscar/oscar.c:6436
+#: src/protocols/oscar/oscar.c:6501 src/protocols/oscar/oscar.c:6518
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2418 src/request.h:1020 src/request.h:1030
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:360
+#: src/account.c:362
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
+#: src/account.c:369 src/dialogs.c:1309 src/gtkrequest.c:199
 #: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
-#: src/away.c:208
+#: src/away.c:210
 msgid "Away!"
 msgstr "离开!"
 
-#: src/away.c:269
+#: src/away.c:271
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:368
+#: src/away.c:370
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:388
+#: src/away.c:390
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
-#: src/away.c:583
+#: src/away.c:585
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:576 src/gtkprefs.c:2258
+#: src/blist.c:578 src/gtkprefs.c:2375
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3164
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
-msgid "Buddies"
-msgstr "好友"
-
-#: src/blist.c:1158
+#: src/blist.c:1164
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1303,139 +1467,146 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1167
+#: src/blist.c:1173
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
-#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:568
+#: src/blist.c:1223 src/gtkaccount.c:160 src/gtkutils.c:859
+#: src/protocols/jabber/auth.c:144 src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1544
+#: src/blist.c:1550
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2194
+#: src/blist.c:2192
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:2196
+#: src/blist.c:2194
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
-#: src/buddy_chat.c:212 src/gtkblist.c:3587
+#: src/buddy_chat.c:216 src/gtkblist.c:3865
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/buddy_chat.c:223
+#: src/buddy_chat.c:227
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:225 src/gtkblist.c:924
+#. join button
+#: src/buddy_chat.c:229 src/gtkblist.c:902 src/gtkroomlist.c:242
+#: src/gtkroomlist.c:398
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/buddy_chat.c:242
+#: src/buddy_chat.c:246
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/buddy_chat.c:253 src/dialogs.c:587 src/dialogs.c:662
-#: src/gtkpounce.c:358
+#: src/buddy_chat.c:257 src/dialogs.c:590 src/dialogs.c:667
+#: src/gtkpounce.c:360 src/gtkroomlist.c:342
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/connection.c:117 src/connection.c:165
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/connection.c:170
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: src/conversation.c:297
+#: src/conversation.c:283
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:305
+#: src/conversation.c:291
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1892
+#: src/conversation.c:1891
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1895
+#: src/conversation.c:1894
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:1980
+#: src/conversation.c:1986
+#, c-format
+msgid "You are now known as %s"
+msgstr "您现在叫做 %s"
+
+#: src/conversation.c:1989
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2022
+#: src/conversation.c:2032
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2024
+#: src/conversation.c:2034
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2097
+#: src/conversation.c:2107
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2109
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2381
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2383
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2385
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2387
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:202
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:205
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:219
+#: src/dialogs.c:221
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1447,47 +1618,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:228
+#: src/dialogs.c:230
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:237
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:349
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:359
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:361 src/dialogs.c:362
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:371
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:374 src/dialogs.c:375
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:392
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1496,141 +1667,141 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:395 src/dialogs.c:396
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:543
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/dialogs.c:559
-msgid "Please enter the screenname of the person you would like to IM.\n"
+#: src/dialogs.c:561
+msgid "Please enter the screen name of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:571 src/dialogs.c:646
-msgid "_Screenname:"
+#: src/dialogs.c:573 src/dialogs.c:650
+msgid "_Screen Name:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:616
+#: src/dialogs.c:620
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:634
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
+#: src/dialogs.c:638
+msgid ""
+"Please enter the screen name of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:740
+#: src/dialogs.c:744
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:742
+#: src/dialogs.c:746
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/dialogs.c:767
+#: src/dialogs.c:771
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
 
-#: src/dialogs.c:780
+#: src/dialogs.c:784
 msgid "_URL:"
 msgstr "_URL:"
 
-#: src/dialogs.c:793
+#: src/dialogs.c:798
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: src/dialogs.c:924 src/dialogs.c:941
+#: src/dialogs.c:922 src/dialogs.c:939
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:976 src/dialogs.c:993
+#: src/dialogs.c:974 src/dialogs.c:991
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:1078 src/dialogs.c:1104
+#: src/dialogs.c:1076 src/dialogs.c:1102
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:1168
+#: src/dialogs.c:1166
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:1170
+#: src/dialogs.c:1168
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:1180
+#: src/dialogs.c:1178
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:1242
+#: src/dialogs.c:1240
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:1263
+#: src/dialogs.c:1261
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:1314
+#: src/dialogs.c:1313
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:1318
+#: src/dialogs.c:1317
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:1467
+#: src/dialogs.c:1457
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:1485
+#: src/dialogs.c:1475
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:1476
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:1502
+#: src/dialogs.c:1492
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:1493
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:1520
+#: src/dialogs.c:1510
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:1522
+#: src/dialogs.c:1512
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/ft.c:139
+#: src/ft.c:141
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:152
+#: src/ft.c:154
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:754
+#: src/ft.c:756
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:756
+#: src/ft.c:758
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1672,13 +1843,13 @@
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1717,32 +1888,32 @@
 "关闭 Gaim 的运行副本\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1450
+#: src/gaimrc.c:375 src/gaimrc.c:1452
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2344
+#: src/gaimrc.c:1261 src/gtkblist.c:2611
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2345
+#: src/gaimrc.c:1263 src/gtkblist.c:2612
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2346
+#: src/gaimrc.c:1265 src/gtkblist.c:2613
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gaimrc.c:1548
+#: src/gaimrc.c:1550
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkaccount.c:285
+#: src/gtkaccount.c:288
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1753,176 +1924,172 @@
 "<b>文件大小:</b> %s\n"
 "<b>图像大小:</b> %dx%d"
 
-#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
-msgid "Buddy Icon"
-msgstr "好友图标"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:370
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:387
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:389
-msgid "Screenname:"
+#: src/gtkaccount.c:392 src/gtkblist.c:3583
+msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:462 src/main.c:308
+#: src/gtkaccount.c:465
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:467 src/gtkblist.c:3324 src/gtkblist.c:3646
+#: src/gtkaccount.c:470 src/gtkblist.c:3597 src/gtkblist.c:3925
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:471
+#: src/gtkaccount.c:474
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:528
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:538
+#: src/gtkaccount.c:541
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:550
 msgid "Buddy icon file:"
 msgstr "好友图标文件:"
 
-#: src/gtkaccount.c:556
+#: src/gtkaccount.c:560
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:566
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:628
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:743
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:750
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:757
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:764
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:771
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:774 src/gtkprefs.c:1090
+#: src/gtkaccount.c:778 src/gtkprefs.c:1097
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:807
-msgid "you can see the butterflies mating"
-msgstr "明日复明日"
-
 #: src/gtkaccount.c:811
+msgid "you can see the butterflies mating"
+msgstr "明日复明日"
+
+#: src/gtkaccount.c:815
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:831
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:843 src/gtkprefs.c:1084
+#: src/gtkaccount.c:847 src/gtkprefs.c:1091
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:852 src/gtkprefs.c:1114
+#: src/gtkaccount.c:856 src/gtkprefs.c:1121
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:856 src/gtkprefs.c:1131
+#: src/gtkaccount.c:860 src/gtkprefs.c:1139
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:868
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:869 src/gtkprefs.c:1166
+#: src/gtkaccount.c:873 src/gtkprefs.c:1176
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1212
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1214
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1234
+#: src/gtkaccount.c:1238
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1235
+#: src/gtkaccount.c:1239
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:683
+#: src/gtkaccount.c:1266 src/protocols/jabber/jabber.c:684
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1611
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1611 src/gtkrequest.c:194
+#: src/gtkaccount.c:1615 src/gtkrequest.c:196
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1725
+#: src/gtkaccount.c:1729
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1752 src/protocols/jabber/jabber.c:981
+#: src/protocols/oscar/oscar.c:2866 src/protocols/oscar/oscar.c:4643
+#: src/protocols/oscar/oscar.c:6239 src/protocols/yahoo/yahoo.c:2204
+#: src/protocols/zephyr/zephyr.c:963 src/protocols/zephyr/zephyr.c:973
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:1766
+#: src/gtkaccount.c:1770
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2056
+#: src/gtkaccount.c:2060
 #, 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:2070
+#: src/gtkaccount.c:2074
 msgid ""
 "\n"
 "\n"
@@ -1932,190 +2099,194 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2074
+#: src/gtkaccount.c:2078
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2078
+#: src/gtkaccount.c:2082
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2080 src/gtkblist.c:3696 src/gtkconv.c:1256
-#: src/gtkconv.c:3232 src/gtkconv.c:3323 src/gtkrequest.c:195
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
+#: src/gtkaccount.c:2084 src/gtkblist.c:3977 src/gtkconv.c:1194
+#: src/gtkconv.c:3520 src/gtkconv.c:3611 src/gtkrequest.c:197
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2708
 msgid "Add"
 msgstr "添加"
 
+#: src/gtkblist.c:808 src/gtkblist.c:2800
+msgid "Get _Info"
+msgstr "获取信息(_I)"
+
+#: src/gtkblist.c:811 src/gtkblist.c:2791
+msgid "I_M"
+msgstr "开聊(_M)"
+
 #: src/gtkblist.c:813
-msgid "_Get Info"
-msgstr "获取信息(_G)"
-
-#: src/gtkblist.c:816
-msgid "_IM"
-msgstr "开聊(_I)"
-
-#: src/gtkblist.c:818
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:820
+#: src/gtkblist.c:815
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+#: src/gtkblist.c:835 src/gtkblist.c:907 src/gtkblist.c:920
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:354
+#: src/gtkblist.c:837 src/gtkblist.c:909 src/gtkblist.c:925 src/gtkconn.c:362
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:905
+#: src/gtkblist.c:882
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:884
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:886
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:888
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:926
+#: src/gtkblist.c:904
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:950 src/gtkblist.c:985
+#: src/gtkblist.c:922 src/gtkblist.c:948
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:990
+#: src/gtkblist.c:953
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1389 src/gtkconv.c:3999
+#: src/gtkblist.c:1604 src/gtkconv.c:4253
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1952
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1953
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:1954
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:1691
-msgid "/Buddies/Get _User Info..."
-msgstr "/好友(B)/获取用户信息(_U)..."
-
-#: src/gtkblist.c:1693
+#: src/gtkblist.c:1955
+msgid "/Buddies/Get User _Info..."
+msgstr "/好友(B)/获取用户信息(_I)..."
+
+#: src/gtkblist.c:1957
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:1694
+#: src/gtkblist.c:1958
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1959
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1960
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1961
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:1963
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:1700
+#: src/gtkblist.c:1964
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1703
+#: src/gtkblist.c:1967
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:1704
+#: src/gtkblist.c:1968
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:1705
+#: src/gtkblist.c:1969
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:1970
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:1708
+#: src/gtkblist.c:1972
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:1709
+#: src/gtkblist.c:1973
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:1974
+msgid "/Tools/R_oom List"
+msgstr "/工具(T)/房间列表(_O)"
+
+#: src/gtkblist.c:1975
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:1976
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:1713
+#: src/gtkblist.c:1979
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:1716
+#: src/gtkblist.c:1983
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:1717
+#: src/gtkblist.c:1984
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:1718
+#: src/gtkblist.c:1985
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:1719
+#: src/gtkblist.c:1986
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:1735
+#: src/gtkblist.c:2002
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:1735
+#: src/gtkblist.c:2002
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:1736
+#: src/gtkblist.c:2003
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:1764
+#: src/gtkblist.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -2124,16 +2295,16 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:1828 src/protocols/oscar/oscar.c:5525
+#: src/gtkblist.c:2095 src/protocols/oscar/oscar.c:5618
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:1843
+#: src/gtkblist.c:2110
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1859
+#: src/gtkblist.c:2126
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2141,7 +2312,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:1860
+#: src/gtkblist.c:2127
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2149,7 +2320,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:1861
+#: src/gtkblist.c:2128
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2157,7 +2328,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:1862
+#: src/gtkblist.c:2129
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2165,7 +2336,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2130
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2173,7 +2344,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2131
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2181,7 +2352,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2132
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2189,7 +2360,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:1867
+#: src/gtkblist.c:2134
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2197,7 +2368,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2135
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2205,7 +2376,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2136
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2213,85 +2384,77 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:2139
+#: src/gtkblist.c:2406
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2141
+#: src/gtkblist.c:2408
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2146
+#: src/gtkblist.c:2413
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2149
+#: src/gtkblist.c:2416
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:2342 src/gtkprefs.c:834 src/gtkprefs.c:1484
-msgid "None"
-msgstr "无"
-
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:2677
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:2412
+#: src/gtkblist.c:2680
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:2415
+#: src/gtkblist.c:2683
 msgid "/Tools/Protocol Actions"
 msgstr "/工具(T)/协议操作(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2771
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2773
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:2522 src/gtkconv.c:1215
-msgid "IM"
-msgstr "开聊"
-
-#: src/gtkblist.c:2528
+#: src/gtkblist.c:2797
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:2531 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "信息"
-
-#: src/gtkblist.c:2537
+#: src/gtkblist.c:2806
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:2540 src/protocols/oscar/oscar.c:3086
-msgid "Chat"
-msgstr "聊天"
-
-#: src/gtkblist.c:2545
+#: src/gtkblist.c:2809
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#: src/gtkblist.c:2814
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:2553
+#: src/gtkblist.c:2817
+msgid "_Away"
+msgstr "离开(_A)"
+
+#: src/gtkblist.c:2822
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3266 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3538 src/protocols/yahoo/yahoo.c:2336
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3289
+#: src/gtkblist.c:3561
 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. "
@@ -2300,62 +2463,54 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/gtkblist.c:3311 src/main.c:290
-msgid "Screen Name:"
-msgstr "用户名:"
-
-#: src/gtkblist.c:3337 src/gtkblist.c:3659
-msgid "Group:"
-msgstr "组:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3346 src/gtkblist.c:3627
+#: src/gtkblist.c:3621 src/gtkblist.c:3905
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:3594
+#: src/gtkblist.c:3872
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:3617
+#: src/gtkblist.c:3895
 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:3693
+#: src/gtkblist.c:3974
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:3694
+#: src/gtkblist.c:3975
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4211
+#: src/gtkblist.c:4494
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:73 src/gtkconn.c:245 src/gtkconn.c:256
+#: src/gtkconn.c:79 src/gtkconn.c:251 src/gtkconn.c:262
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:152
+#: src/gtkconn.c:158
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:198
+#: src/gtkconn.c:204
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:211
+#: src/gtkconn.c:217
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:354 src/gtkconn.c:581
+#: src/gtkconn.c:362 src/gtkconn.c:594
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:545
+#: src/gtkconn.c:558
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2368,562 +2523,558 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:547
+#: src/gtkconn.c:560
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:586
+#: src/gtkconn.c:599
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:608
-msgid "Account"
-msgstr "账户"
-
-#: src/gtkconn.c:616
+#: src/gtkconn.c:629
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:187
+#: src/gtkconv.c:186
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:188 src/gtkft.c:1076
+#: src/gtkconv.c:187 src/gtkft.c:1078
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:244
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkconv.c:300
+#: src/gtkconv.c:299
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:604
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:657
+#: src/gtkconv.c:632
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:678
+#: src/gtkconv.c:653
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:698
+#: src/gtkconv.c:673
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:788
+#: src/gtkconv.c:763
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:785
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1152
+msgid "IM"
+msgstr "开聊"
+
+#: src/gtkconv.c:1160
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1225 src/gtkprefs.c:767
+#: src/gtkconv.c:1162 src/gtkprefs.c:773
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1234 src/gtkconv.c:3246
+#: src/gtkconv.c:1171 src/gtkconv.c:3534
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1180
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
 #. Remove button
-#: src/gtkconv.c:1254 src/gtkconv.c:3239 src/gtkconv.c:3330
-#: src/gtkrequest.c:196
+#: src/gtkconv.c:1192 src/gtkconv.c:3527 src/gtkconv.c:3618
+#: src/gtkrequest.c:198
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2326
+msgid "Animate"
+msgstr "动画"
+
+#: src/gtkconv.c:2331
+msgid "Hide Icon"
+msgstr "隐藏图标"
+
+#: src/gtkconv.c:2337
+msgid "Save Icon As..."
+msgstr "图标另存为..."
+
+#: src/gtkconv.c:2768
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2776
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2879
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3299
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3028
+#: src/gtkconv.c:3316
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3030
+#: src/gtkconv.c:3318
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3035
+#: src/gtkconv.c:3323
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3324
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3325
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3330
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3044
+#: src/gtkconv.c:3332
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3334
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:3336
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3341
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3055
+#: src/gtkconv.c:3343
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3057
+#: src/gtkconv.c:3345
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3059
+#: src/gtkconv.c:3347
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3352
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3354
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3071
+#: src/gtkconv.c:3359
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3363
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3076
+#: src/gtkconv.c:3364
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3077
+#: src/gtkconv.c:3365
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3366
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3120
+#: src/gtkconv.c:3408
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3413
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3419
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3423
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3427
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3433
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3437
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3441
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3445
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3451
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3455
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3461
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3464
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3179
+#: src/gtkconv.c:3467
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3202 src/gtkconv.c:3204 src/gtkconv.c:3302 src/gtkconv.c:3304
+#: src/gtkconv.c:3490 src/gtkconv.c:3492 src/gtkconv.c:3590 src/gtkconv.c:3592
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3506
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3221
+#: src/gtkconv.c:3509
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3225 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkconv.c:3513 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3516
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3523
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3530
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3249 src/gtkconv.c:3747
+#: src/gtkconv.c:3537 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3316
+#: src/gtkconv.c:3604
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3319
+#: src/gtkconv.c:3607
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3326
+#: src/gtkconv.c:3614
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3621
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3389
+#: src/gtkconv.c:3677
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3400
+#: src/gtkconv.c:3688
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3411
+#: src/gtkconv.c:3699
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3427
+#: src/gtkconv.c:3715
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3439
-msgid "Normal font size"
-msgstr "普通大小字体"
-
-#: src/gtkconv.c:3451
+#: src/gtkconv.c:3740
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3757
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3769
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3492
+#: src/gtkconv.c:3781
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3796
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3518
+#: src/gtkconv.c:3807
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3818
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3904
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3963
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3736
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4284
+#: src/gtkconv.c:4540
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4808 src/gtkconv.c:4840 src/gtkconv.c:4961 src/gtkconv.c:5028
+#: src/gtkconv.c:5064 src/gtkconv.c:5096 src/gtkconv.c:5217 src/gtkconv.c:5284
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5353
-msgid "Animate"
-msgstr "动画"
-
-#: src/gtkconv.c:5358
-msgid "Hide Icon"
-msgstr "隐藏图标"
-
-#: src/gtkconv.c:5364
-msgid "Save Icon As..."
-msgstr "图标另存为..."
-
-#: src/gtkconv.c:5760 src/gtkconv.c:5763
+#: src/gtkconv.c:5782 src/gtkconv.c:5785
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkft.c:133
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:207
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:210
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:458
+#: src/gtkft.c:460
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:465
+#: src/gtkft.c:467
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:472
+#: src/gtkft.c:474
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:479
+#: src/gtkft.c:481
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:509
+#: src/gtkft.c:511
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:510
-msgid "Status:"
-msgstr "状态:"
-
-#: src/gtkft.c:511
-msgid "Speed:"
-msgstr "速度:"
-
 #: src/gtkft.c:512
+msgid "Status:"
+msgstr "状态:"
+
+#: src/gtkft.c:513
+msgid "Speed:"
+msgstr "速度:"
+
+#: src/gtkft.c:514
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:513
+#: src/gtkft.c:515
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:610
+#: src/gtkft.c:612
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:620
+#: src/gtkft.c:622
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:629
+#: src/gtkft.c:631
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:632
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:672 src/stock.c:85
+#: src/gtkft.c:674 src/stock.c:87
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:682
+#: src/gtkft.c:684
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:882
+#: src/gtkft.c:884
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:884
+#: src/gtkft.c:886
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkft.c:1053
+#: src/gtkft.c:1055
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
-#: src/gtkft.c:1062
+#: src/gtkft.c:1064
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/gtkft.c:1075
+#: src/gtkft.c:1077
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
-#: src/gtkft.c:1100
+#: src/gtkft.c:1102
 msgid "Open..."
 msgstr "打开..."
 
-#: src/gtkft.c:1102
+#: src/gtkft.c:1104
 msgid "Save As..."
 msgstr "另存为..."
 
-#: src/gtkft.c:1149
+#: src/gtkft.c:1151
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:719
 msgid "_Copy E-Mail Address"
 msgstr "电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:731
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:741
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:2077
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1760
+#: src/gtkimhtml.c:2085
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1769
+#: src/gtkimhtml.c:2094
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:1792
+#: src/gtkimhtml.c:2117
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtklog.c:255
+#: src/gtklog.c:257
 msgid "Conversations with"
 msgstr "交谈对象"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:213
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:219
+#: src/gtknotify.c:221
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:226
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:230
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2934,7 +3085,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2945,534 +3096,541 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
+#: src/gtknotify.c:439 src/gtknotify.c:459 src/gtknotify.c:467
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:431
+#: src/gtknotify.c:440
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtknotify.c:448
+#: src/gtknotify.c:457
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "浏览器“%s”无效。"
 
-#: src/gtknotify.c:455
+#: src/gtknotify.c:464
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "调用“命令”出错:%s"
 
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:142
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:191
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:335 src/gtkpounce.c:742
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:335
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:353
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:380
 msgid "_Buddy Name:"
 msgstr "好友(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:403
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:407 src/main.c:336
-msgid "Sign on"
-msgstr "登入"
-
-#: src/gtkpounce.c:409
-msgid "Sign off"
-msgstr "登出"
+#: src/gtkpounce.c:411
+msgid "_Sign on"
+msgstr "登入(_S)"
 
 #: src/gtkpounce.c:413
-msgid "Return from away"
-msgstr "回来"
-
-#: src/gtkpounce.c:415 src/gtkprefs.c:1481 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2189
-msgid "Idle"
-msgstr "瞌睡"
+msgid "Sign _off"
+msgstr "登出(_O)"
+
+#: src/gtkpounce.c:415
+msgid "A_way"
+msgstr "离开(_W)"
 
 #: src/gtkpounce.c:417
-msgid "Return from idle"
-msgstr "睡醒了"
+msgid "Re_turn from away"
+msgstr "回来(_T)"
 
 #: src/gtkpounce.c:419
-msgid "Buddy starts typing"
-msgstr "好友开始打字"
+msgid "_Idle"
+msgstr "瞌睡(_I)"
 
 #: src/gtkpounce.c:421
-msgid "Buddy stops typing"
-msgstr "好友停止打字"
+msgid "Retur_n from idle"
+msgstr "睡醒了(_N)"
+
+#: src/gtkpounce.c:423
+msgid "Buddy starts _typing"
+msgstr "好友开始打字(_T)"
+
+#: src/gtkpounce.c:425
+msgid "Buddy stops t_yping"
+msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:454
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:457
-msgid "Open an IM window"
-msgstr "打开即时消息窗口"
-
-#: src/gtkpounce.c:458
-msgid "Popup notification"
-msgstr "弹出通知"
-
-#: src/gtkpounce.c:459
-msgid "Send a message"
-msgstr "发送消息"
-
-#: src/gtkpounce.c:460
-msgid "Execute a command"
-msgstr "执行命令"
-
 #: src/gtkpounce.c:461
-msgid "Play a sound"
-msgstr "播放声音"
-
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
-msgstr "浏览"
-
-#: src/gtkpounce.c:468 src/gtkprefs.c:2071
-msgid "Test"
-msgstr "测试"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
-msgstr "激活后保存此千里眼(_S)"
+msgid "Op_en an IM window"
+msgstr "打开即时消息窗口(_E)"
+
+#: src/gtkpounce.c:462
+msgid "_Popup notification"
+msgstr "弹出通知(_P)"
+
+#: src/gtkpounce.c:463
+msgid "Send a _message"
+msgstr "发送消息(_M)"
+
+#: src/gtkpounce.c:464
+msgid "E_xecute a command"
+msgstr "执行命令(_X)"
+
+#: src/gtkpounce.c:465
+msgid "P_lay a sound"
+msgstr "播放声音(_L)"
+
+#: src/gtkpounce.c:469
+msgid "B_rowse..."
+msgstr "浏览(_R)..."
+
+#: src/gtkpounce.c:471
+msgid "Bro_wse..."
+msgstr "浏览(_W)..."
+
+#: src/gtkpounce.c:472
+msgid "Pre_view"
+msgstr "预览(_V)"
+
+#: src/gtkpounce.c:555
+msgid "Sav_e this pounce after activation"
+msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:749
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:796
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 开始向您打字"
 
-#: src/gtkpounce.c:793
+#: src/gtkpounce.c:797
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已登入"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:798
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 睡醒了"
 
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:799
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 回来了"
 
-#: src/gtkpounce.c:796
+#: src/gtkpounce.c:800
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止了给您打字"
 
-#: src/gtkpounce.c:797
+#: src/gtkpounce.c:801
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已登出"
 
-#: src/gtkpounce.c:798
+#: src/gtkpounce.c:802
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 打起瞌睡"
 
-#: src/gtkpounce.c:800
+#: src/gtkpounce.c:804
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:365
+#: src/gtkprefs.c:371
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:373
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:553
+#: src/gtkprefs.c:559
 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:588
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:595 src/gtkprefs.c:1793 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:748
+#: src/gtkprefs.c:601 src/gtkprefs.c:1910 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:690
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "样式"
 
-#: src/gtkprefs.c:663
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/gtkprefs.c:665
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "斜体(_I)"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "字体"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/gtkprefs.c:704
+#: src/gtkprefs.c:710
 msgid "Color"
 msgstr "颜色"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:714
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:733
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:755 src/gtkprefs.c:984 src/gtkprefs.c:1034
+#: src/gtkprefs.c:761 src/gtkprefs.c:993 src/gtkprefs.c:1041
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:762
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/gtkprefs.c:758
+#: src/gtkprefs.c:764
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:766
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:770
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:774
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:776
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:778
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:791
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:792
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:788
+#: src/gtkprefs.c:794
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:797
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:798
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:801
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:802
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:804
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:820
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:823
-msgid "Sorting:"
-msgstr "排序:"
-
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:829
+msgid "_Sorting:"
+msgstr "排序(_S):"
+
+#: src/gtkprefs.c:834
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:829 src/gtkprefs.c:957 src/gtkprefs.c:1010
+#: src/gtkprefs.c:835 src/gtkprefs.c:966 src/gtkprefs.c:1017
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:837 src/gtkprefs.c:968 src/gtkprefs.c:1019
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:838 src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:833 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:839 src/gtkprefs.c:970 src/gtkprefs.c:1021
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:972 src/gtkprefs.c:1025
+#: src/gtkprefs.c:844 src/gtkprefs.c:981 src/gtkprefs.c:1032
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:847
 msgid "Group Display"
 msgstr "分组显示"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:848
 msgid "Show _numbers in groups"
 msgstr "在分组旁显示数字(_N)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:851
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:979
+#: src/gtkprefs.c:852 src/gtkprefs.c:988
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:854
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:856
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:858
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:860
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:885
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:892
 msgid "Send _URLs as Links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:889
-msgid "Show Formatting Toolbar"
-msgstr "显示格式工具栏"
-
-#: src/gtkprefs.c:892
+#: src/gtkprefs.c:895
+msgid "Show _Formatting Toolbar"
+msgstr "显示格式工具栏(_F)"
+
+#: src/gtkprefs.c:898
+msgid "Show a_liases in tabs/titles"
+msgstr "在标签/标题中显示别名(_L)"
+
+#: src/gtkprefs.c:901
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:903
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:905
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:906
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:907
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:908
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:905
+#: src/gtkprefs.c:914
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:917
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:927
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:938
 msgid "Show status _icons on tabs"
 msgstr "在标签上显示状态图标(_I)"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:965 src/gtkprefs.c:1016
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:966 src/gtkprefs.c:1019
+#: src/gtkprefs.c:975 src/gtkprefs.c:1026
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:968 src/gtkprefs.c:1021
+#: src/gtkprefs.c:977 src/gtkprefs.c:1028
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:970 src/gtkprefs.c:1023
+#: src/gtkprefs.c:979 src/gtkprefs.c:1030
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:974
+#: src/gtkprefs.c:983
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:978
-msgid "Buddy Icons"
-msgstr "好友图标"
-
-#: src/gtkprefs.c:981
-msgid "Enable buddy icon a_nimation"
-msgstr "启用好友图标动画(_N)"
-
-#: src/gtkprefs.c:985
-msgid "Show _logins in window"
-msgstr "在窗口中显示登录(_L)"
-
 #: src/gtkprefs.c:987
-msgid "Show a_liases in tabs/titles"
-msgstr "在标签/标题中显示别名(_L)"
+msgid "Buddy Icons"
+msgstr "好友图标"
 
 #: src/gtkprefs.c:990
+msgid "Enable buddy icon a_nimation"
+msgstr "启用好友图标动画(_N)"
+
+#: src/gtkprefs.c:994
+msgid "Show _logins in window"
+msgstr "在窗口中显示登录(_L)"
+
+#: src/gtkprefs.c:997
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:998
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1035
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1036
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1038
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1042
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1044
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1039
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1046
+msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1083
+#: src/gtkprefs.c:1090
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1086
-msgid "No proxy"
-msgstr "无代理"
-
 #: src/gtkprefs.c:1093
+msgid "No proxy"
+msgstr "无代理"
+
+#: src/gtkprefs.c:1100
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1158
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1214
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1215
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1216
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1217
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1218
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1219
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1228
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3481,63 +3639,63 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1306
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1307
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1324
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1327
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1316
+#: src/gtkprefs.c:1330
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1332
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1387
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1388
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1390
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1394
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1395
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1397
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1399
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1406
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1416
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3546,67 +3704,72 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1473
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1475
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1462
+#: src/gtkprefs.c:1478
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1481
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1484
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1486
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1472
+#: src/gtkprefs.c:1488
 msgid "Send auto-response in _active conversations"
 msgstr "在当前对话中发送自动回复(_A)"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1497 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2200
+msgid "Idle"
+msgstr "瞌睡"
+
+#: src/gtkprefs.c:1498
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1501
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1488
+#: src/gtkprefs.c:1504
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1506
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1514
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1515
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1508
+#: src/gtkprefs.c:1524
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3621,7 +3784,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1575
+#: src/gtkprefs.c:1683
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3636,177 +3799,184 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1757
+#: src/gtkprefs.c:1866
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1764 src/protocols/jabber/jabber.c:615
-#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "名称"
-
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1880
+msgid "Summary"
+msgstr "概览"
+
+#: src/gtkprefs.c:1928
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:1938
+#: src/gtkprefs.c:2055
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2045
+#: src/gtkprefs.c:2162
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2052
+#: src/gtkprefs.c:2169
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2075
+#: src/gtkprefs.c:2188
+msgid "Test"
+msgstr "测试"
+
+#: src/gtkprefs.c:2192
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2079
+#: src/gtkprefs.c:2196
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2331
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2367
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2368
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2369
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2370
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2371
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2374
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2376
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2379
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2381
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2382
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2383
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2384
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2385
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2387
+msgid "Protocols"
+msgstr "协议"
+
+#: src/gtkprefs.c:2403
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "只允许我的好友"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "屏蔽全部用户"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
-msgstr "屏蔽以下用户"
-
-#: src/gtkprivacy.c:369
+#: src/gtkprivacy.c:81
+msgid "Block only the users below"
+msgstr "只屏蔽以下用户"
+
+#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:384
+#: src/gtkprivacy.c:375
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:396
+#: src/gtkprivacy.c:387
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
+#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:556
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:557
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:573
+#: src/gtkprivacy.c:565
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:567
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:595
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:596
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:611
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:605
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -3814,142 +3984,169 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:190 src/protocols/gg/gg.c:660 src/request.h:1011
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
+#: src/gtkrequest.c:191 src/protocols/gg/gg.c:660 src/request.h:1011
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:192
+#: src/gtkrequest.c:194
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:195 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtksound.c:61
+#: src/gtkroomlist.c:303
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr "您目前登入的协议中没有一个可以列出聊天室的。"
+
+#: src/gtkroomlist.c:316
+msgid "Room List"
+msgstr "房间列表"
+
+#. list button
+#: src/gtkroomlist.c:391
+msgid "_Get List"
+msgstr "获取列表(_G)"
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:63
-msgid "Message received"
-msgstr "消息已收到"
-
 #: src/gtksound.c:64
+msgid "Message received"
+msgstr "消息已收到"
+
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:172
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:184
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
 
-#: src/gtkutils.c:298
+#: src/gtkutils.c:296
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:333
+#: src/gtkutils.c:331
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/log.c:83
+#: src/log.c:88
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:408
+#: src/log.c:433
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, c-format
-msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\">(%s) <b>%s <自动回复>:</b></font> %s<br/>\n"
-
-#: src/log.c:490
-#, c-format
-msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自动回复>:</b></font> %s<br/>\n"
-
-#: src/log.c:534 src/log.c:669
+#: src/log.c:514
+#, c-format
+msgid ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;自动回复&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:516
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;自动回复&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:560 src/log.c:696
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:544 src/log.c:679
+#: src/log.c:570 src/log.c:706
 #, 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:548
+#: src/log.c:574
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:622
+#: src/log.c:649
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:683
+#: src/log.c:710
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:149
-msgid "Please enter your login."
-msgstr "请输入您的登录名。"
-
-#: src/main.c:232
-msgid "<New User>"
-msgstr "<新用户>"
-
-#: src/main.c:274
+#: src/main.c:155
+msgid "Please create an account."
+msgstr "请创建一个账户。"
+
+#: src/main.c:237
 msgid "Login"
 msgstr "登入"
 
+#: src/main.c:255
+msgid "<b>Screen Name:</b>"
+msgstr "<b>用户名:</b>"
+
+#: src/main.c:268
+msgid "<b>Password:</b>"
+msgstr "<b>密码:</b>"
+
+#: src/main.c:296
+msgid "Sign on"
+msgstr "登入"
+
 #. full help text
-#: src/main.c:553
+#: src/main.c:515
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3981,36 +4178,36 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:568
+#: src/main.c:530
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/plugin.c:267
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:272 src/plugin.c:300
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:296
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:271
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2503
+#: src/protocols/yahoo/yahoo.c:2612
 msgid "Available"
 msgstr "可用"
 
@@ -4022,11 +4219,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
-#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:987
+#: src/protocols/jabber/presence.c:119 src/protocols/oscar/oscar.c:2864
+#: src/protocols/oscar/oscar.c:4633 src/protocols/oscar/oscar.c:4660
+#: src/protocols/oscar/oscar.c:6245 src/protocols/yahoo/yahoo.c:2198
+#: src/protocols/yahoo/yahoo.c:2523 src/protocols/yahoo/yahoo.c:2622
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4046,9 +4243,9 @@
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:60
-#: src/protocols/jabber/auth.c:153 src/protocols/jabber/auth.c:312
-#: src/protocols/jabber/auth.c:412 src/protocols/jabber/auth.c:424
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
+#: src/protocols/jabber/auth.c:167 src/protocols/jabber/auth.c:334
+#: src/protocols/jabber/auth.c:434 src/protocols/jabber/auth.c:446
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4084,11 +4281,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
-#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:141
+#: src/protocols/yahoo/yahoo.c:1865 src/protocols/yahoo/yahoo.c:1896
+#: src/protocols/yahoo/yahoo.c:1959 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "无法连接。"
 
@@ -4150,29 +4347,29 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:4011
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:630
-#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:631
+#: src/protocols/oscar/oscar.c:4016 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:635
-#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:636
+#: src/protocols/oscar/oscar.c:4019 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4013
 msgid "Nick"
 msgstr "昵称"
 
 #: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
+msgid "Birth Year"
 msgstr "出生年份"
 
 #: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
@@ -4181,19 +4378,20 @@
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:645
-#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:646
+#: src/protocols/oscar/oscar.c:4065 src/protocols/oscar/oscar.c:4081
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
-#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
-#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
-#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
+#. show it to the user
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1289
+#: src/protocols/msn/msn.c:1533 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2906 src/protocols/oscar/oscar.c:3228
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2796
+#: src/protocols/yahoo/yahoo.c:2818 src/protocols/yahoo/yahoo.c:2841
+#: src/protocols/yahoo/yahoo.c:2999 src/protocols/zephyr/zephyr.c:377
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4289,7 +4487,7 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1075
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1099
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "更改密码"
@@ -4327,7 +4525,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#. *  description
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4340,17 +4539,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
-#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
-#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:5218
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:189
-#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
-#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5143
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:5219
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4393,12 +4592,12 @@
 "<B>支持的 IRC 命令:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:470 src/protocols/jabber/chat.c:540
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为:%s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:542
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4448,6 +4647,14 @@
 msgid "Read error"
 msgstr "读取错误"
 
+#: src/protocols/irc/irc.c:492 src/protocols/yahoo/yahoochat.c:1320
+msgid "Users"
+msgstr "用户"
+
+#: src/protocols/irc/irc.c:495 src/protocols/yahoo/yahoochat.c:1329
+msgid "Topic"
+msgstr "话题"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4457,32 +4664,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:598
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:599
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1208 src/protocols/napster/napster.c:636
+#: src/protocols/irc/irc.c:616 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1238 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1223
-#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
-#: src/protocols/trepia/trepia.c:1344
+#: src/protocols/irc/irc.c:619 src/protocols/jabber/jabber.c:1259
+#: src/protocols/msn/msn.c:1665 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:622
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:605
+#: src/protocols/irc/irc.c:625 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:606
 msgid "Username"
 msgstr "用户名"
 
@@ -4507,7 +4714,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2899
 msgid "Realname"
 msgstr "真名"
 
@@ -4533,130 +4740,130 @@
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:277
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为:%s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:282
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为:%s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:296
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:370
+#: src/protocols/irc/msgs.c:400
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:411
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:414
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:419
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:439
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:495
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:496
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:592
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s:%s 踢出了"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "%3$s 模式(%1$s %2%s)"
-
-#: src/protocols/irc/msgs.c:670
+msgstr "由 %3$s 管理(%1$s %2$s)"
+
+#: src/protocols/irc/msgs.c:700
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:761
 msgid "Error: invalid PONG from server"
 msgstr "错误:服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:763
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后:%lu 秒"
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:838
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:839
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:869
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:165
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此信息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:296
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间:%lu 秒"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:297
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:297
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
+#: src/protocols/irc/parse.c:396 src/protocols/oscar/oscar.c:551
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
@@ -4666,53 +4873,56 @@
 msgid "Server requires SSL for login"
 msgstr "服务器需要 SSL 才能登录"
 
-#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
+#: src/protocols/jabber/auth.c:93 src/protocols/jabber/auth.c:193
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "服务器需要在不加密流上使用纯文本验证"
+
+#: src/protocols/jabber/auth.c:115 src/protocols/jabber/auth.c:198
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:459
+#: src/protocols/jabber/auth.c:179 src/protocols/jabber/jabber.c:463
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/auth.c:333
+#: src/protocols/jabber/auth.c:355
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/auth.c:427
+#: src/protocols/jabber/auth.c:449
 msgid "Bad Protocol"
 msgstr "无效的协议"
 
-#: src/protocols/jabber/auth.c:430
+#: src/protocols/jabber/auth.c:452
 msgid "Encryption Required"
 msgstr "需要加密"
 
-#: src/protocols/jabber/auth.c:433
+#: src/protocols/jabber/auth.c:455
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/auth.c:436
+#: src/protocols/jabber/auth.c:458
 msgid "Invalid Mechanism"
 msgstr "用户名算法"
 
-#: src/protocols/jabber/auth.c:438
+#: src/protocols/jabber/auth.c:460
 msgid "Invalid Realm"
 msgstr "用户名域"
 
-#: src/protocols/jabber/auth.c:441
+#: src/protocols/jabber/auth.c:463
 msgid "Mechanism Too Weak"
 msgstr "算法太弱"
 
-#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:148
-#: src/protocols/jabber/jabber.c:898 src/protocols/jabber/jabber.c:948
-#: src/protocols/oscar/oscar.c:5553
+#: src/protocols/jabber/auth.c:466 src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:896 src/protocols/oscar/oscar.c:5646
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/auth.c:447
+#: src/protocols/jabber/auth.c:469
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/auth.c:449
+#: src/protocols/jabber/auth.c:471
 msgid "Authentication Failure"
 msgstr "认证失败"
 
@@ -4729,11 +4939,11 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:625 src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/jabber/jabber.c:626 src/protocols/yahoo/yahoo.c:2895
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:665
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:666
 msgid "URL"
 msgstr "URL"
 
@@ -4754,7 +4964,7 @@
 msgstr "区域"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:656
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -4770,7 +4980,7 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2891
 msgid "Email"
 msgstr "电子邮件"
 
@@ -4791,7 +5001,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4045
 msgid "Birthday"
 msgstr "生日"
 
@@ -4805,17 +5015,16 @@
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:551
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:935
-#: src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:953
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1241
 msgid "Resource"
 msgstr "资源"
 
@@ -4823,8 +5032,8 @@
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:640
-#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:641
+#: src/protocols/oscar/oscar.c:4062 src/protocols/oscar/oscar.c:4078
 msgid "Address"
 msgstr "地址"
 
@@ -4840,31 +5049,31 @@
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:775
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:921
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:918
+#: src/protocols/jabber/buddy.c:924
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/buddy.c:926
+#: src/protocols/jabber/buddy.c:933
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:934
+#: src/protocols/jabber/buddy.c:941
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:947
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:942
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -4876,63 +5085,79 @@
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:161
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:162
+#: src/protocols/jabber/chat.c:165
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:167
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:173
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
-#: src/protocols/jabber/message.c:299
+#: src/protocols/jabber/chat.c:334 src/protocols/jabber/chat.c:485
+#: src/protocols/jabber/message.c:280
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
 
-#: src/protocols/jabber/chat.c:339
+#: src/protocols/jabber/chat.c:337
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:348 src/protocols/jabber/chat.c:499
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:364
+#: src/protocols/jabber/chat.c:362
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:363
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:492
+#: src/protocols/jabber/chat.c:488
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:569
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
+#: src/protocols/jabber/chat.c:658
+msgid "Invalid Server"
+msgstr "无效的服务器"
+
+#: src/protocols/jabber/chat.c:695
+msgid "Enter a Conference Server"
+msgstr "进入会议服务器"
+
+#: src/protocols/jabber/chat.c:696
+msgid "Select a conference server to query"
+msgstr "选择要查询的会议服务器"
+
+#: src/protocols/jabber/chat.c:698
+msgid "Find Rooms"
+msgstr "查找房间"
+
 #: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
 msgstr "初始化会话出错"
@@ -5033,7 +5258,7 @@
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:235 src/protocols/msn/httpmethod.c:234
+#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
 #: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
@@ -5043,163 +5268,188 @@
 #: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
 #: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
 #: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
-#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
-#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
-#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
-#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
-#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/msn/msn.c:1071 src/protocols/msn/msn.c:1104
+#: src/protocols/msn/msn.c:1125 src/protocols/msn/msn.c:1136
+#: src/protocols/msn/msn.c:1147 src/protocols/msn/msn.c:1171
+#: src/protocols/msn/msn.c:1183 src/protocols/msn/msn.c:1264
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
+#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
 #: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
 #: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
 #: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:273 src/protocols/jabber/jabber.c:293
+#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:347
+#: src/protocols/jabber/jabber.c:349
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:384 src/protocols/jabber/jabber.c:714
+#: src/protocols/jabber/jabber.c:388 src/protocols/jabber/jabber.c:715
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:412 src/protocols/jabber/jabber.c:741
+#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:742
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:422 src/protocols/jabber/jabber.c:751
+#: src/protocols/jabber/jabber.c:426 src/protocols/jabber/jabber.c:752
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:447
+#: src/protocols/jabber/jabber.c:451
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:449 src/protocols/jabber/jabber.c:450
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:462
+#: src/protocols/jabber/jabber.c:466
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "注册 %s@%s 失败:%s"
 
-#: src/protocols/jabber/jabber.c:464 src/protocols/jabber/jabber.c:465
+#: src/protocols/jabber/jabber.c:468 src/protocols/jabber/jabber.c:469
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:577 src/protocols/jabber/jabber.c:578
+#: src/protocols/jabber/jabber.c:581 src/protocols/jabber/jabber.c:582
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:609 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:1069
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:620
+#: src/protocols/jabber/jabber.c:621
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:650 src/protocols/oscar/oscar.c:4019
-#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:651 src/protocols/oscar/oscar.c:4068
+#: src/protocols/oscar/oscar.c:4084 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:670
+#: src/protocols/jabber/jabber.c:671
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/jabber.c:679
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:681 src/protocols/jabber/jabber.c:682
+#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:683
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:800 src/protocols/msn/dispatch.c:212
+#: src/protocols/jabber/jabber.c:796 src/protocols/msn/dispatch.c:212
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2073
+#: src/protocols/oscar/oscar.c:710 src/protocols/trepia/trepia.c:1110
+#: src/protocols/yahoo/yahoo.c:2084
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/jabber.c:800
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:810
+#: src/protocols/jabber/jabber.c:806
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:818
+#: src/protocols/jabber/jabber.c:816
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:996
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/jabber.c:928
+msgid "Both"
+msgstr "双向"
+
+#: src/protocols/jabber/jabber.c:930
+msgid "From (To pending)"
+msgstr "来自(待推迟)"
+
+#: src/protocols/jabber/jabber.c:932
+msgid "From"
+msgstr "来自"
+
+#: src/protocols/jabber/jabber.c:935
+msgid "To"
+msgstr "到"
+
+#: src/protocols/jabber/jabber.c:937
+msgid "None (To pending)"
+msgstr "无(待推迟)"
+
+#: src/protocols/jabber/jabber.c:941
+msgid "Subscription"
+msgstr "订阅"
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:1020
+#: src/protocols/jabber/presence.c:327
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:101
-#: src/protocols/jabber/presence.c:82
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jutil.c:102
+#: src/protocols/jabber/presence.c:59 src/protocols/jabber/presence.c:110
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:104
-#: src/protocols/jabber/presence.c:87
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jutil.c:105
+#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:115
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
+#: src/protocols/jabber/jabber.c:985 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+#: src/protocols/oscar/oscar.c:2854 src/protocols/oscar/oscar.c:4648
+#: src/protocols/oscar/oscar.c:6241
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:1002
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:1003
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:1013
 #, c-format
 msgid "Error changing password: %s"
 msgstr "更改密码出错: %s"
 
-#: src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:1017
 msgid "Unknown error occurred changing password"
 msgstr "更改密码时发生了未知错误"
 
-#: src/protocols/jabber/jabber.c:1050
+#: src/protocols/jabber/jabber.c:1074
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1056
+#: src/protocols/jabber/jabber.c:1079 src/protocols/jabber/jabber.c:1080
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1056
+#: src/protocols/jabber/jabber.c:1080
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1068 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1092 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -5213,43 +5463,52 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:1190
+#. *  description
+#: src/protocols/jabber/jabber.c:1217 src/protocols/jabber/jabber.c:1219
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1244
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1249
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/jabber/jabber.c:1254
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "允许在不加密流上的纯文本验证"
+
+#: src/protocols/jabber/jabber.c:1263
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/jabber.c:1280
+msgid "Hide Operating System"
+msgstr "隐藏操作系统"
+
+#: src/protocols/jabber/message.c:106
 #, c-format
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: src/protocols/jabber/message.c:187
+#: src/protocols/jabber/message.c:168
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为:%s"
 
-#: src/protocols/jabber/message.c:189
+#: src/protocols/jabber/message.c:170
 #, c-format
 msgid "The topic is: %s"
-msgstr "的话题为:%s"
-
-#: src/protocols/jabber/message.c:236
+msgstr "话题为:%s"
+
+#: src/protocols/jabber/message.c:217
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败:%s"
 
-#: src/protocols/jabber/message.c:239
+#: src/protocols/jabber/message.c:220
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
@@ -5257,64 +5516,63 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:178
+#: src/protocols/jabber/presence.c:222
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:183
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:244 src/protocols/jabber/presence.c:245
+#: src/protocols/jabber/presence.c:278 src/protocols/jabber/presence.c:279
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:246
+#: src/protocols/jabber/presence.c:280
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:248
+#: src/protocols/jabber/presence.c:282
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:284
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:283 src/protocols/oscar/oscar.c:2947
+#: src/protocols/jabber/presence.c:317 src/protocols/oscar/oscar.c:2965
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/presence.c:289
+#: src/protocols/jabber/presence.c:323
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/si.c:233
+#: src/protocols/jabber/si.c:230
 #, c-format
 msgid "Could not send %s to %s, protocol not supported."
 msgstr "无法向 %2$s 发送 %1$s,协议不支持。"
 
-#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
+#: src/protocols/jabber/si.c:231 src/protocols/jabber/si.c:232
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
 msgid "Unable to request USR\n"
 msgstr "无法请求 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
 msgid "Unable to login using MD5"
 msgstr "无法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
 msgid "Requesting to send password"
 msgstr "正在请求发送密码"
 
@@ -5322,15 +5580,15 @@
 msgid "Protocol version not supported"
 msgstr "协议版本不支持"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
 msgid "Unable to request CVR\n"
 msgstr "无法请求 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
@@ -5342,16 +5600,16 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
-#: src/protocols/msn/notification.c:2187
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:1811
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -5500,7 +5758,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:310
 msgid "Unable to write"
 msgstr "无法写入"
 
@@ -5532,7 +5790,7 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1092
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
@@ -5610,7 +5868,7 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2312
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
@@ -5621,31 +5879,31 @@
 msgstr "远离电脑"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
-#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2180
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2613
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
-#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2182
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2614
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2190
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/yahoo/yahoo.c:2618
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2194
+#: src/protocols/yahoo/yahoo.c:2519 src/protocols/yahoo/yahoo.c:2620
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
 #: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/zephyr/zephyr.c:960 src/protocols/zephyr/zephyr.c:975
 msgid "Hidden"
 msgstr "隐身"
 
@@ -5692,92 +5950,92 @@
 #: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
 msgstr ""
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
 #: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
-msgid "Invalid MSN screenname"
+msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
 #: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
 msgstr ""
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
+#: src/protocols/msn/msn.c:1290 src/protocols/yahoo/yahoo.c:2797
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
+#: src/protocols/msn/msn.c:1360 src/protocols/oscar/oscar.c:4050
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2907
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
+#: src/protocols/msn/msn.c:1367 src/protocols/oscar/oscar.c:4036
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:2915
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/msn/msn.c:1375 src/protocols/yahoo/yahoo.c:2911
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
+#: src/protocols/msn/msn.c:1382 src/protocols/yahoo/yahoo.c:2903
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/msn/msn.c:1390 src/protocols/yahoo/yahoo.c:2919
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
-#: src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1420 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1456
+#: src/protocols/msn/msn.c:1463
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/msn/msn.c:1482
+#: src/protocols/msn/msn.c:1472 src/protocols/msn/msn.c:1478
+#: src/protocols/msn/msn.c:1485
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/msn/msn.c:1494 src/protocols/msn/msn.c:1500
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/msn/msn.c:1508 src/protocols/yahoo/yahoo.c:2990
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1519 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1541 src/protocols/yahoo/yahoo.c:3005
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
+#: src/protocols/msn/msn.c:1543 src/protocols/yahoo/yahoo.c:3007
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
@@ -5791,91 +6049,80 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#. *  description
+#: src/protocols/msn/msn.c:1641 src/protocols/msn/msn.c:1643
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1660 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1670
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/notification.c:247
+#: src/protocols/msn/nexus.c:56
+msgid "Unable to connect to server"
+msgstr "无法连接到服务器"
+
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
+msgid "Unable to write to MSN Nexus server."
+msgstr "无法写入 MSN Nexus 服务器。"
+
+#: src/protocols/msn/nexus.c:147
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr "MSN Nexus 服务器返回了无效的重定向信息。"
+
+#: src/protocols/msn/nexus.c:204
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
+
+#: src/protocols/msn/notification.c:215
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误:%s\n"
 
-#: src/protocols/msn/notification.c:322
-msgid "Unable to connect to server"
-msgstr "无法连接到服务器"
-
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
-msgid "Unable to write to MSN Nexus server."
-msgstr "无法写入 MSN Nexus 服务器。"
-
-#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
-msgid "Unable to read from MSN Nexus server."
-msgstr "无法从 MSN Nexus 服务器读取。"
-
-#: src/protocols/msn/notification.c:406
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus 服务器返回了无效的重定向信息。"
-
-#: src/protocols/msn/notification.c:460
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
-
-#: src/protocols/msn/notification.c:572
-msgid "MSN Nexus server returned invalid information."
-msgstr "MSN Nexus 服务器返回了无效的信息。"
-
-#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:711
-msgid "Unable to connect to passport server"
-msgstr "无法连接到 Passport 服务器"
-
-#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
-#: src/protocols/oscar/oscar.c:1361
+#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
+#: src/protocols/oscar/oscar.c:1378
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:367
 msgid "Unable to send password"
 msgstr "无法发送密码"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:403
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/notification.c:826
+#: src/protocols/msn/notification.c:450
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:953
+#: src/protocols/msn/notification.c:577
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
+#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1972
+#: src/protocols/msn/notification.c:1596
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/notification.c:1752
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5956,7 +6203,11 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
+#: src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "信息"
+
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5289
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "组(_G):"
@@ -5971,7 +6222,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#. *  description
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -6071,78 +6323,78 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:491
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:493
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:563 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:579
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:650 src/protocols/oscar/oscar.c:706
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:660
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:677
+#: src/protocols/oscar/oscar.c:694
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
+#: src/protocols/oscar/oscar.c:795 src/protocols/oscar/oscar.c:1183
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:803
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
-#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
-#: src/protocols/yahoo/yahoo_filexfer.c:212
+#: src/protocols/oscar/oscar.c:870 src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:888 src/protocols/yahoo/yahoo_filexfer.c:202
+#: src/protocols/yahoo/yahoo_filexfer.c:210
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:854
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
-#: src/protocols/yahoo/yahoo_filexfer.c:213
+#: src/protocols/oscar/oscar.c:884 src/protocols/yahoo/yahoo_filexfer.c:203
+#: src/protocols/yahoo/yahoo_filexfer.c:211
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:889
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1069 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1057
+#: src/protocols/oscar/oscar.c:1074
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1078
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1083
 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."
@@ -6150,21 +6402,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1088
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1120
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1173
+#: src/protocols/oscar/oscar.c:1190
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1225 src/protocols/oscar/oscar.c:1255
+#: src/protocols/oscar/oscar.c:1343
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6172,29 +6424,30 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1228 src/protocols/oscar/oscar.c:1258
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1346
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
+#: src/protocols/oscar/oscar.c:1927 src/protocols/oscar/oscar.c:5747
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
+#: src/protocols/oscar/oscar.c:2256 src/protocols/oscar/oscar.c:2278
+#: src/protocols/oscar/oscar.c:3444
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2428
 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 "
@@ -6203,46 +6456,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:2433 src/protocols/oscar/oscar.c:6116
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2443
+#: src/protocols/oscar/oscar.c:2460
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2468
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2469
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2498
 #, 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:2485 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2503 src/protocols/oscar/oscar.c:2505
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
-#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
-#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:2541 src/protocols/oscar/oscar.c:2543
+#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2626
+#: src/protocols/oscar/oscar.c:2646 src/protocols/oscar/oscar.c:3002
+#: src/protocols/oscar/oscar.c:3062 src/protocols/oscar/oscar.c:5210
+#: src/protocols/oscar/oscar.c:5256
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:2549
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2626
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6251,11 +6504,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:2634 src/protocols/oscar/oscar.c:5216
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6265,17 +6518,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2647
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2644
+#: src/protocols/oscar/oscar.c:2662
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6288,7 +6541,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2652
+#: src/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6301,7 +6554,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2678
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6314,32 +6567,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2681
+#: src/protocols/oscar/oscar.c:2699
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2687
+#: src/protocols/oscar/oscar.c:2705
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2709
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2791
 #, 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:2782
+#: src/protocols/oscar/oscar.c:2800
 #, 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:2791
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6347,179 +6600,191 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2818
 #, 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:2809
+#: src/protocols/oscar/oscar.c:2827
 #, 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:2818
+#: src/protocols/oscar/oscar.c:2836
 #, 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:2834 src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:2852 src/protocols/oscar/oscar.c:4657
+#: src/protocols/oscar/oscar.c:6244
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:2856 src/protocols/oscar/oscar.c:4651
+#: src/protocols/oscar/oscar.c:6242
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
-#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:2858 src/protocols/oscar/oscar.c:4654
+#: src/protocols/oscar/oscar.c:6243
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:2862
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2905
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2946
+#: src/protocols/oscar/oscar.c:2964
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3000
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3059
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3098
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3101
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:3104
+msgid "Chat"
+msgstr "聊天"
+
+#: src/protocols/oscar/oscar.c:3107 src/protocols/oscar/oscar.c:6343
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
-#: src/protocols/yahoo/yahoo.c:2350
+#: src/protocols/oscar/oscar.c:3110 src/protocols/oscar/oscar.c:6335
+#: src/protocols/yahoo/yahoo.c:2361
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3114
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3117
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3120
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3123
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3126
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3129
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3132
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3135
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3138
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3141
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3144
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3147
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3150
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3153
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3157
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3160
+msgid "Live Video"
+msgstr "实时视频"
+
+#: src/protocols/oscar/oscar.c:3163
+msgid "Camera"
+msgstr "相机"
+
+#: src/protocols/oscar/oscar.c:3192
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "用户名: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3193
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr "警告级别: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3171
+msgstr "警告级别: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3196
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上线时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3200
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成员时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3205
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "瞌睡: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3208
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3222
+#: src/protocols/oscar/oscar.c:3247
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3616
+#: src/protocols/oscar/oscar.c:3665
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3617
+#: src/protocols/oscar/oscar.c:3666
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6527,162 +6792,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3729
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3682
+#: src/protocols/oscar/oscar.c:3731
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3762
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4028
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4033
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4053
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4056
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4060
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4071 src/protocols/oscar/oscar.c:4087
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4076
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4092
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4094
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4048
+#: src/protocols/oscar/oscar.c:4097
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4100
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4054
+#: src/protocols/oscar/oscar.c:4103
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4060
+#: src/protocols/oscar/oscar.c:4109
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4110
+#: src/protocols/oscar/oscar.c:4159
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4131
-#, c-format
-msgid "The following screennames are associated with %s"
+#: src/protocols/oscar/oscar.c:4180
+#, c-format
+msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4184
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4201
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4222
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4224
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4252
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4255
 #, 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:4209
+#: src/protocols/oscar/oscar.c:4258
 #, 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:4212
+#: src/protocols/oscar/oscar.c:4261
 #, 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:4215
+#: src/protocols/oscar/oscar.c:4264
 #, 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:4218
+#: src/protocols/oscar/oscar.c:4267
 #, 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:4221
+#: src/protocols/oscar/oscar.c:4270
 #, 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:4224
+#: src/protocols/oscar/oscar.c:4273
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4283
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6691,20 +6956,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4284 src/protocols/oscar/oscar.c:4291
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4289
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4521
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4522
 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 "
@@ -6713,7 +6978,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4549
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6723,15 +6988,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4505
+#: src/protocols/oscar/oscar.c:4554
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:4571
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4523
+#: src/protocols/oscar/oscar.c:4572
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6740,7 +7005,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4612
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6752,15 +7017,30 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4617
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4712
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+"无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
+"字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
+
+#: src/protocols/oscar/oscar.c:4713 src/protocols/oscar/oscar.c:5125
+#: src/protocols/oscar/oscar.c:5138
+msgid "Unable To Add"
+msgstr "无法添加"
+
+#: src/protocols/oscar/oscar.c:4849
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4783
+#: src/protocols/oscar/oscar.c:4850
 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 "
@@ -6769,12 +7049,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
-#: src/protocols/oscar/oscar.c:4881
+#: src/protocols/oscar/oscar.c:5026 src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5032
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5124
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6782,15 +7062,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5124 src/protocols/oscar/oscar.c:5137
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
-msgid "Unable To Add"
-msgstr "无法添加"
-
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5137
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6800,18 +7076,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:5171
 #, 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:5101
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5210
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6821,17 +7097,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5252
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5177
+#: src/protocols/oscar/oscar.c:5253
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5180
+#: src/protocols/oscar/oscar.c:5256
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6841,107 +7117,107 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5181
+#: src/protocols/oscar/oscar.c:5257
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5294 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5549
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5561
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 地址:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5569
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5578
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>好友注释:</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5587
 msgid "<b>Available:</b> "
 msgstr "<b>可用:</b>"
 
-#: src/protocols/oscar/oscar.c:5512
+#: src/protocols/oscar/oscar.c:5605
 msgid "<b>Away Message:</b> "
 msgstr "<b>离开消息:</b>"
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5614
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5648 src/protocols/yahoo/yahoo.c:2202
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6096
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6112
 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:6194
+#: src/protocols/oscar/oscar.c:6288
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6304
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6218
+#: src/protocols/oscar/oscar.c:6312
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6327
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6262
+#: src/protocols/oscar/oscar.c:6356
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6377
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Screenname formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6378
+msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6290
-msgid "New screenname formatting:"
+#: src/protocols/oscar/oscar.c:6384
+msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6433
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6477
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6386
+#: src/protocols/oscar/oscar.c:6480
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/oscar/oscar.c:6481
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6949,71 +7225,67 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6495
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6402
+#: src/protocols/oscar/oscar.c:6496
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6403
+#: src/protocols/oscar/oscar.c:6497
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6406
-msgid "Search"
-msgstr "搜索"
-
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6514
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6515
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6586
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6593
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6600
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6607
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6521
+#: src/protocols/oscar/oscar.c:6615
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6532
-msgid "Format Screenname..."
+#: src/protocols/oscar/oscar.c:6626
+msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6632
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6544
+#: src/protocols/oscar/oscar.c:6638
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6550
+#: src/protocols/oscar/oscar.c:6644
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6653
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6567
+#: src/protocols/oscar/oscar.c:6661
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
@@ -7027,15 +7299,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
+#. *  description
+#: src/protocols/oscar/oscar.c:6782 src/protocols/oscar/oscar.c:6784
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6801
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6806
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -7241,15 +7514,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#. *  description
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2178
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2182
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -7332,42 +7606,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#. *  description
+#: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:297
+#: src/protocols/yahoo/yahoo.c:305
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:730
+#: src/protocols/yahoo/yahoo.c:738
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:772
+#: src/protocols/yahoo/yahoo.c:780
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:838
+#: src/protocols/yahoo/yahoo.c:846
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:841
+#: src/protocols/yahoo/yahoo.c:849
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:844
+#: src/protocols/yahoo/yahoo.c:852
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/yahoo/yahoo.c:1506
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7377,11 +7652,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1509
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1570
+#: src/protocols/yahoo/yahoo.c:1582
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7389,145 +7664,146 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1585
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1606
+#: src/protocols/yahoo/yahoo.c:1618
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1621
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1624
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "您的账户已锁定,请登录到 Yahoo 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1615
+#: src/protocols/yahoo/yahoo.c:1627
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的错误代码 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1672
+#: src/protocols/yahoo/yahoo.c:1684
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1686
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
+#: src/protocols/yahoo/yahoo.c:1796 src/protocols/yahoo/yahoo.c:1927
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo.c:2059
+#: src/protocols/yahoo/yahoo.c:2100 src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1398
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2184 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2615
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2186 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo.c:2616
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2188 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/yahoo/yahoo.c:2617
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2192 src/protocols/yahoo/yahoo.c:2517
+#: src/protocols/yahoo/yahoo.c:2619
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2196 src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2621
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2260 src/protocols/yahoo/yahoo.c:2292
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2348
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2354
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2404
-msgid "Join who in chat?"
-msgstr "将谁加入聊天?"
-
 #: src/protocols/yahoo/yahoo.c:2415
+msgid "Join who in chat?"
+msgstr "将谁加入聊天?"
+
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2432
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2814
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
+#: src/protocols/yahoo/yahoo.c:2815 src/protocols/yahoo/yahoo.c:2838
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
 
-#: src/protocols/yahoo/yahoo.c:2826
+#: src/protocols/yahoo/yahoo.c:2837
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>抱歉,目前不支持非英语的个人资料。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2885 src/protocols/yahoo/yahoo.c:2886
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:2930 src/protocols/yahoo/yahoo.c:2933
+#: src/protocols/yahoo/yahoo.c:2936
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:2948
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:2951
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2974
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:2978
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/yahoo/yahoo.c:2980
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2986
 msgid "Member Since"
 msgstr "注册时间"
 
@@ -7541,79 +7817,108 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3192 src/protocols/yahoo/yahoo.c:3194
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3194
+#: src/protocols/yahoo/yahoo.c:3211
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3214
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3220
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3223
+msgid "Chat Room List Url"
+msgstr "聊天房间列表 URL"
+
+#: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:558
+#: src/protocols/yahoo/yahoochat.c:562
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:559
+#: src/protocols/yahoo/yahoochat.c:563
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/yahoo/yahoochat.c:1278
+msgid "Unable to connect"
+msgstr "无法连接"
+
+#: src/protocols/yahoo/yahoochat.c:1278
+msgid "Fetching the room list failed."
+msgstr "获取房间列表失败。"
+
+#: src/protocols/yahoo/yahoochat.c:1323
+msgid "Voices"
+msgstr "语音"
+
+#: src/protocols/yahoo/yahoochat.c:1326
+msgid "Webcams"
+msgstr "摄像头"
+
+#: src/protocols/yahoo/yahoochat.c:1337 src/protocols/yahoo/yahoochat.c:1398
+msgid "Unable to fetch room list."
+msgstr "无法获取房间列表。"
+
+#: src/protocols/yahoo/yahoochat.c:1391
+msgid "User Rooms"
+msgstr "用户房间"
+
+#: src/protocols/zephyr/zephyr.c:366
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:368
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:370
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:374
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:632 src/protocols/zephyr/zephyr.c:633
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:659
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:660
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7621,19 +7926,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:945
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:985
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:990
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:995
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
@@ -7647,67 +7952,80 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1145 src/protocols/zephyr/zephyr.c:1147
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
+#: src/protocols/zephyr/zephyr.c:1164
+msgid "Export to .anyone"
+msgstr "导出到 .anyone"
+
+#: src/protocols/zephyr/zephyr.c:1167
+msgid "Export to .zephyr.subs"
+msgstr "导出到 .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:1170
+msgid "Exposure"
+msgstr "暴露"
+
 #. Forbidden
-#: src/proxy.c:1014
+#: src/proxy.c:1015
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 80 流过。"
 
-#: src/proxy.c:1016
+#: src/proxy.c:1017
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1737
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1736
+#: src/proxy.c:1737
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:189
 msgid "Custom"
 msgstr "自定义"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1028
+#: src/request.h:1030
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:948
+#: src/server.c:951
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:961
+#: src/server.c:964
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1151 src/server.c:1161
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1178 src/server.c:1186
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1227
+#: src/server.c:1233
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7716,11 +8034,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1230
+#: src/server.c:1236
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1333
+#: src/server.c:1339
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7729,80 +8047,83 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1343
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1343
+#: src/server.c:1349
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "烦着呢,别理我"
 
-#: src/stock.c:83
+#: src/stock.c:85
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/stock.c:84
+#: src/stock.c:86
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/util.c:1893
+#: src/util.c:1855
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:1896
+#: src/util.c:1858
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
+#: src/util.c:1889 src/util.c:1894 src/util.c:1899 src/util.c:1902
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
+#: src/util.c:1890 src/util.c:1894 src/util.c:1908 src/util.c:1910
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
+#: src/util.c:1890 src/util.c:1899 src/util.c:1908 src/util.c:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2283
+#: src/util.c:2245
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
-#: src/win32/win32dep.c:271
+#: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."
 msgstr "正在移动 Gaim 设置..."
 
-#: src/win32/win32dep.c:274
+#: src/win32/win32dep.c:275
 msgid "Moving Gaim user settings to: "
 msgstr "正在将 Gaim 用户设置移动到:"
 
-#: src/win32/win32dep.c:276
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "提示"
 
-#~ msgid "First name"
-#~ msgstr "名"
-
-#~ msgid "Disconnected"
-#~ msgstr "已断开"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "服务器的响应无效"
-
-#~ msgid "Unable to connect"
-#~ msgstr "无法连接"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "无法连接进行传送!"
+#~ msgid "Downloading List..."
+#~ msgstr "正在下载列表..."
+
+#~ msgid "Unable to read from MSN Nexus server."
+#~ msgstr "无法从 MSN Nexus 服务器读取。"
+
+#~ msgid "MSN Nexus server returned invalid information."
+#~ msgstr "MSN Nexus 服务器返回了无效的信息。"
+
+#~ msgid "Unable to connect to passport server"
+#~ msgstr "无法连接到 Passport 服务器"
+
+#~ msgid "_Screenname:"
+#~ msgstr "用户名(_S):"
+
+#~ msgid "Browse"
+#~ msgstr "浏览"