diff po/zh_CN.po @ 8778:8bf735cf9d1c

[gaim-migrate @ 9540] (17:44:08) Faceprint: ping (17:44:17) Me: semi-pong (17:44:26) Faceprint: in a position to commit, or not? (17:44:40) Me: more or less (17:44:48) Me: not in a possition to think though (17:44:56) Faceprint: no real thought required (17:45:29) Faceprint: jabber.c, in jabber_login_callback, before the check to see if gc is in gaim_connections_get_all(), please add: (17:45:32) Faceprint: if (source < 0) { gaim_connection_error(gc, _("Couldn't connect to host")); return; } (17:45:53) Faceprint: and change the if statement in irc_login_cb in irc.c to be the same oh and vi automatically tabbing sucks and sometime i ran make dist committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 Apr 2004 21:50:17 +0000
parents 075f2e7cec73
children a4c2a6ab4322
line wrap: on
line diff
--- a/po/zh_CN.po	Fri Apr 23 17:34:41 2004 +0000
+++ b/po/zh_CN.po	Fri Apr 23 21:50:17 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-19 17:05-0500\n"
+"POT-Creation-Date: 2004-04-22 22:29-0400\n"
 "PO-Revision-Date: 2004-04-17 00:23+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -30,6 +30,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
@@ -145,18 +146,19 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1623 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:951
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/oscar/oscar.c:2958
-#: src/protocols/oscar/oscar.c:4744 src/protocols/oscar/oscar.c:5769
-#: src/protocols/oscar/oscar.c:6387
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr "离开"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4662 src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "回来"
 
@@ -169,11 +171,11 @@
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:287
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2611 src/main.c:293
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
 msgid "Preferences"
 msgstr "首选项"
 
@@ -237,26 +239,39 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "未连接到 AIM"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "没有给出用户名。"
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "没有给出聊天室名。"
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
+#: plugins/gaim-remote/remote.c:651
+#, fuzzy, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr "存储图像失败: %s\n"
+
+#: plugins/gaim-remote/remote.c:674
+#, fuzzy
+msgid "Unable to open socket"
+msgstr "无法读取套接字"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -264,19 +279,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "远程控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "提供 gaim 程序的远程控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -367,22 +382,22 @@
 "向上再向右可切换到下个对话。"
 
 #: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:76
+#: plugins/gevolution/assoc-buddy.c:74
 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:2918 src/gtkprefs.c:870 src/gtkprefs.c:1651
-#: src/protocols/jabber/jabber.c:915
+#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
+#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
+#: src/protocols/jabber/jabber.c:916
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:2028
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1394 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -397,19 +412,19 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6658
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3936
-#: src/gtkblist.c:4264
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
 #: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:488
+#: plugins/gevolution/assoc-buddy.c:486
 msgid "New Person"
 msgstr "新建联系人"
 
@@ -419,28 +434,28 @@
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:372
+#: plugins/gevolution/assoc-buddy.c:370
 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
+#: plugins/gevolution/assoc-buddy.c:449
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:452
+#: plugins/gevolution/assoc-buddy.c:450
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:505
+#: plugins/gevolution/assoc-buddy.c:503
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3761
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
 msgid "Buddies"
 msgstr "好友"
@@ -477,6 +492,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
@@ -504,7 +520,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:3178
+#: src/protocols/oscar/oscar.c:425
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -520,15 +536,15 @@
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#: plugins/history.c:74
+#: plugins/history.c:70
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:76
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:77
+#: plugins/history.c:73
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -548,6 +564,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 "您离开后将好友列表和对话都变为图标。"
@@ -720,6 +737,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 "提供各种方法通知您有未读邮件。"
@@ -731,13 +749,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:530
+#: plugins/perl/perl.c:531
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
+#. *< summary
+#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -823,6 +842,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 "测试看看所有的信号是否都工作正确。"
@@ -841,6 +861,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
@@ -891,6 +912,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
@@ -909,6 +931,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
@@ -927,6 +950,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
@@ -965,17 +989,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:349
+#: plugins/tcl/tcl.c:350
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
+#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -993,6 +1018,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
@@ -1023,6 +1049,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 风格的时间戳。"
@@ -1047,7 +1074,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:873
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -1069,6 +1096,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1080,54 +1108,54 @@
 "\n"
 "* 注意:此插件需要 Win2000 或 WinXP。"
 
-#: plugins/win32/winprefs/winprefs.c:348
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:356
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:357
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2959
-#: src/gtkprefs.c:2527
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
+#: src/gtkprefs.c:2505
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:371
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "停靠的好友列表常居顶端(_B)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:381
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:911
-#: src/gtkprefs.c:2528 src/protocols/msn/msn.c:1731
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
+#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "对话"
 
-#: plugins/win32/winprefs/winprefs.c:387
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "收到信息时闪烁窗口(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:405
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:411 plugins/win32/winprefs/winprefs.c:412
+#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
@@ -1151,7 +1179,8 @@
 "行。<BR><BR>"
 
 #: src/about.c:104
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+#, fuzzy
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
 #: src/about.c:109
@@ -1350,7 +1379,7 @@
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:992
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
@@ -1383,13 +1412,13 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2317 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1037
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
-#: src/protocols/msn/msn.c:227 src/protocols/oscar/oscar.c:2562
-#: src/protocols/oscar/oscar.c:2643 src/protocols/oscar/oscar.c:6448
-#: src/protocols/oscar/oscar.c:6544 src/protocols/oscar/oscar.c:6593
-#: src/protocols/oscar/oscar.c:6675 src/protocols/yahoo/yahoo.c:2504
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
 #: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "确定"
@@ -1398,20 +1427,20 @@
 #: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
 #: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
 #: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2318 src/gtkblist.c:4303 src/gtkconn.c:168
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
 #: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
 #: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:659
-#: src/protocols/jabber/jabber.c:1038 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:195 src/protocols/msn/msn.c:206
-#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:228
-#: src/protocols/msn/msn.c:241 src/protocols/oscar/oscar.c:2526
-#: src/protocols/oscar/oscar.c:2563 src/protocols/oscar/oscar.c:2599
-#: src/protocols/oscar/oscar.c:2644 src/protocols/oscar/oscar.c:6266
-#: src/protocols/oscar/oscar.c:6449 src/protocols/oscar/oscar.c:6545
-#: src/protocols/oscar/oscar.c:6594 src/protocols/oscar/oscar.c:6659
-#: src/protocols/oscar/oscar.c:6676 src/protocols/trepia/trepia.c:347
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
 #: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
 #: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
@@ -1447,7 +1476,7 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:590 src/gtkprefs.c:2530
+#: src/blist.c:590 src/gtkprefs.c:2508
 msgid "Chats"
 msgstr "聊天"
 
@@ -1467,8 +1496,8 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
-#: src/protocols/jabber/buddy.c:569
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
 msgid "Unknown"
 msgstr "未知"
 
@@ -1511,59 +1540,59 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1968
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1971
+#: src/conversation.c:1972
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2063
+#: src/conversation.c:2064
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2066
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2111
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2184
+#: src/conversation.c:2185
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2187
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1399
+#: src/conversation.c:2469 src/gtkprefs.c:1413
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2473
 msgid "By account"
 msgstr "按账户"
 
@@ -1759,7 +1788,7 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gaim-remote.c:66
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1780,11 +1809,11 @@
 "    选项:\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:175 src/gaim-remote.c:191
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 未运行(会话 0)\n"
 
-#: src/gaim-remote.c:204
+#: src/gaim-remote.c:203
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1824,7 +1853,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:223
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1841,15 +1870,15 @@
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2920
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2921
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2922
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1873,7 +1902,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3908
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1881,7 +1910,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3922 src/gtkblist.c:4250
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "别名:"
 
@@ -1942,7 +1971,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1200
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -1958,15 +1987,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1194
+#: src/gtkaccount.c:937 src/gtkprefs.c:1208
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1224
+#: src/gtkaccount.c:946 src/gtkprefs.c:1238
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1242
+#: src/gtkaccount.c:950 src/gtkprefs.c:1256
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -1974,7 +2003,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1279
+#: src/gtkaccount.c:963 src/gtkprefs.c:1293
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -1996,7 +2025,7 @@
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "注册"
 
@@ -2009,14 +2038,14 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1857
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:949
-#: src/protocols/oscar/oscar.c:2964 src/protocols/oscar/oscar.c:4742
-#: src/protocols/oscar/oscar.c:6386 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1183
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "在线"
 
@@ -2048,13 +2077,13 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4302 src/gtkconv.c:1108
-#: src/gtkconv.c:3339 src/gtkconv.c:3430 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2806
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
+#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4190
+#: src/gtkblist.c:801 src/gtkblist.c:4236
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2074,186 +2103,186 @@
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1086 src/gtkblist.c:3109
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1089 src/gtkblist.c:3100
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1091
+#: src/gtkblist.c:1092
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1113 src/gtkblist.c:1214 src/gtkblist.c:1228
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1216 src/gtkblist.c:1233
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1160
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1192 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1194
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1230 src/gtkblist.c:1256
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1918 src/gtkconv.c:3917
+#: src/gtkblist.c:1964 src/gtkconv.c:3911
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2266
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2267
+#: src/gtkblist.c:2313
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2268
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:2315
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2271
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2272
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2273
+#: src/gtkblist.c:2319
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2274
+#: src/gtkblist.c:2320
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2321
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2277
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2278
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2281
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2282
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2283
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2284
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2333
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2334
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2335
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
@@ -2262,16 +2291,16 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2422
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2438
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2279,7 +2308,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2439
+#: src/gtkblist.c:2485
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2287,7 +2316,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2440
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2295,7 +2324,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2441
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2303,7 +2332,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2442
+#: src/gtkblist.c:2488
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2311,7 +2340,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2443
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2319,7 +2348,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2444
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2327,7 +2356,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2335,7 +2364,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2447
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2343,7 +2372,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:2448
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2351,77 +2380,77 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:2718
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2720
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2725
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2728
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:2986
+#: src/gtkblist.c:3032
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:2989
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:2992
+#: src/gtkblist.c:3038
 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:3080
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3106
+#: src/gtkblist.c:3152
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3115
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3118
+#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3123
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3172
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3131
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3863 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3886
+#: src/gtkblist.c:3932
 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. "
@@ -2431,29 +2460,29 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3946 src/gtkblist.c:4230
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4197
+#: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4220
+#: src/gtkblist.c:4266
 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:4299
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4300
+#: src/gtkblist.c:4346
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4820
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2502,322 +2531,322 @@
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:173
+#: src/gtkconv.c:172
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:191
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:192 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:506
+#: src/gtkconv.c:505
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:534
+#: src/gtkconv.c:533
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:555
+#: src/gtkconv.c:554
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:575
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:668
+#: src/gtkconv.c:667
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:694
+#: src/gtkconv.c:693
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1066
+#: src/gtkconv.c:1071
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1074
+#: src/gtkconv.c:1079
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1076 src/gtkprefs.c:803
+#: src/gtkconv.c:1081 src/gtkprefs.c:817
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1085 src/gtkconv.c:3353
+#: src/gtkconv.c:1090 src/gtkconv.c:3346
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1094
+#: src/gtkconv.c:1099
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
 #. Remove button
-#: src/gtkconv.c:1106 src/gtkconv.c:3346 src/gtkconv.c:3437
+#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2208
+#: src/gtkconv.c:2201
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2213
+#: src/gtkconv.c:2206
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2219
+#: src/gtkconv.c:2212
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2586
+#: src/gtkconv.c:2579
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2594
+#: src/gtkconv.c:2587
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2697
+#: src/gtkconv.c:2690
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3117
+#: src/gtkconv.c:3110
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3127
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3129
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3134
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3143
+#: src/gtkconv.c:3136
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3137
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3142
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3144
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3146
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3148
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3153
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3155
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3157
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3159
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3164
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3166
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3182
+#: src/gtkconv.c:3175
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3176
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3184
+#: src/gtkconv.c:3177
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3185
+#: src/gtkconv.c:3178
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3227
+#: src/gtkconv.c:3220
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3232
+#: src/gtkconv.c:3225
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3238
+#: src/gtkconv.c:3231
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3235
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3246
+#: src/gtkconv.c:3239
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3252
+#: src/gtkconv.c:3245
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3256
+#: src/gtkconv.c:3249
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3260
+#: src/gtkconv.c:3253
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3264
+#: src/gtkconv.c:3257
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3270
+#: src/gtkconv.c:3263
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3274
+#: src/gtkconv.c:3267
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3280
+#: src/gtkconv.c:3273
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3283
+#: src/gtkconv.c:3276
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3279
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3309 src/gtkconv.c:3311 src/gtkconv.c:3409 src/gtkconv.c:3411
+#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3325
+#: src/gtkconv.c:3318
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3321
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3332 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3328
 msgid "Block the user"
 msgstr "屏蔽用户"
 
+#: src/gtkconv.c:3335
+msgid "Add the user to your buddy list"
+msgstr "将用户加为好友"
+
 #: src/gtkconv.c:3342
-msgid "Add the user to your buddy list"
-msgstr "将用户加为好友"
-
-#: src/gtkconv.c:3349
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3356 src/gtkconv.c:3678
+#: src/gtkconv.c:3349 src/gtkconv.c:3671
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3416
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3419
 msgid "Invite a user"
 msgstr "邀请用户"
 
+#: src/gtkconv.c:3426
+msgid "Add the chat to your buddy list"
+msgstr "将聊天添加到您的好友列表"
+
 #: src/gtkconv.c:3433
-msgid "Add the chat to your buddy list"
-msgstr "将聊天添加到您的好友列表"
-
-#: src/gtkconv.c:3440
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3533
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3600
+#: src/gtkconv.c:3593
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3648
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3660
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4208
+#: src/gtkconv.c:4202
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4736 src/gtkconv.c:4768 src/gtkconv.c:4889 src/gtkconv.c:4956
+#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5475 src/gtkconv.c:5478
+#: src/gtkconv.c:5484 src/gtkconv.c:5487
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2970,34 +2999,34 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/gtkimhtml.c:1107
+#: src/gtkimhtml.c:1139
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1119
+#: src/gtkimhtml.c:1151
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1129
+#: src/gtkimhtml.c:1161
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2614
+#: src/gtkimhtml.c:2643
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2622
+#: src/gtkimhtml.c:2651
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:2631
+#: src/gtkimhtml.c:2660
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2654
+#: src/gtkimhtml.c:2683
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3297,42 +3326,42 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:385
+#: src/gtkprefs.c:399
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:387
+#: src/gtkprefs.c:401
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:581
+#: src/gtkprefs.c:595
 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:616
+#: src/gtkprefs.c:630
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:623 src/gtkprefs.c:2065 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:690
+#: src/gtkprefs.c:704
 msgid "Style"
 msgstr "样式"
 
-#: src/gtkprefs.c:691
+#: src/gtkprefs.c:705
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/gtkprefs.c:693
+#: src/gtkprefs.c:707
 msgid "_Italic"
 msgstr "斜体(_I)"
 
-#: src/gtkprefs.c:695
+#: src/gtkprefs.c:709
 msgid "_Underline"
 msgstr "下划线(_U)"
 
@@ -3343,388 +3372,388 @@
 #. *
 #. * remove this after string freeze ends
 #.
-#: src/gtkprefs.c:705
+#: src/gtkprefs.c:719
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/gtkprefs.c:708
+#: src/gtkprefs.c:722
 msgid "Face"
 msgstr "字体"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:725
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/gtkprefs.c:728
+#: src/gtkprefs.c:742
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/gtkprefs.c:740
+#: src/gtkprefs.c:754
 msgid "Color"
 msgstr "颜色"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:758
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:777
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:791 src/gtkprefs.c:1023 src/gtkprefs.c:1071
+#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:806
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:808
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:810
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/gtkprefs.c:800
+#: src/gtkprefs.c:814
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:818
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:820
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:822
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:835
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:836
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:838
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:845
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:832
+#: src/gtkprefs.c:846
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:848
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:864
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:873
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:878
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:865 src/gtkprefs.c:996 src/gtkprefs.c:1047
+#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:867 src/gtkprefs.c:998 src/gtkprefs.c:1049
+#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
+#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:869 src/gtkprefs.c:1000 src/gtkprefs.c:1051
+#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:874 src/gtkprefs.c:1011 src/gtkprefs.c:1062
+#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:891
 msgid "Group Display"
 msgstr "分组显示"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:892
 msgid "Show _numbers in groups"
 msgstr "在分组旁显示数字(_N)"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:895
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1018
+#: src/gtkprefs.c:896 src/gtkprefs.c:1032
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:898
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:900
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:888
+#: src/gtkprefs.c:902
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:890
+#: src/gtkprefs.c:904
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:929
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:936
 msgid "Send _URLs as links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:939
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:942
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:931
+#: src/gtkprefs.c:945
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:933
+#: src/gtkprefs.c:947
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:949
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:950
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:951
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:952
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:958
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:947
+#: src/gtkprefs.c:961
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:957
+#: src/gtkprefs.c:971
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:982
 msgid "Show status _icons on tabs"
 msgstr "在标签上显示状态图标(_I)"
 
-#: src/gtkprefs.c:995 src/gtkprefs.c:1046
+#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:1005 src/gtkprefs.c:1056
+#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:1007 src/gtkprefs.c:1058
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1027
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1031
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1034
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1038
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/gtkprefs.c:1027
+#: src/gtkprefs.c:1041
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1042
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1079
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1080
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1082
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1072
+#: src/gtkprefs.c:1086
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1074
+#: src/gtkprefs.c:1088
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1076
+#: src/gtkprefs.c:1090
 msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1097 src/protocols/oscar/oscar.c:4138
-#: src/protocols/oscar/oscar.c:5708
+#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1099
+#: src/gtkprefs.c:1113
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1122
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1132
+#: src/gtkprefs.c:1146
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1149
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1152
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1145
+#: src/gtkprefs.c:1159
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1207
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1196
+#: src/gtkprefs.c:1210
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1217
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1275
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1319
+#: src/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1335
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1338
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1347
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1409
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1411
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1412
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1414
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1428
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3733,83 +3762,84 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1465
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1468
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1471
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1473
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1462
+#: src/gtkprefs.c:1476
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1478
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1467
+#: src/gtkprefs.c:1481
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1487
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1493
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1499
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1536
+#: src/gtkprefs.c:1550
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1537
-msgid "_No sounds when you log in"
+#: src/gtkprefs.c:1551
+#, fuzzy
+msgid "Sounds when you _log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1539
+#: src/gtkprefs.c:1553
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1541
+#: src/gtkprefs.c:1555
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1545
+#: src/gtkprefs.c:1559
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1560
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1548
+#: src/gtkprefs.c:1562
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1564
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1557
+#: src/gtkprefs.c:1571
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1567
+#: src/gtkprefs.c:1581
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3818,72 +3848,73 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1624
+#: src/gtkprefs.c:1638
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1626
+#: src/gtkprefs.c:1640
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1629
+#: src/gtkprefs.c:1643
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1632
+#: src/gtkprefs.c:1646
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1649
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1651
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1639
+#: src/gtkprefs.c:1653
 msgid "Send auto-response in _active conversations"
 msgstr "在当前对话中发送自动回复(_A)"
 
-#: src/gtkprefs.c:1648 src/protocols/msn/state.c:30
+#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
 #: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1663
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1666
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1669
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1671
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1665
+#: src/gtkprefs.c:1679
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1680
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1670
+#: src/gtkprefs.c:1684
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1678
+#: src/gtkprefs.c:1692
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1833
+#: src/gtkprefs.c:1767
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3898,7 +3929,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1838
+#: src/gtkprefs.c:1772
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3913,108 +3944,108 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2021
+#: src/gtkprefs.c:1999
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2035
+#: src/gtkprefs.c:2013
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2083
+#: src/gtkprefs.c:2061
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2210
+#: src/gtkprefs.c:2188
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2317
+#: src/gtkprefs.c:2295
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2324
+#: src/gtkprefs.c:2302
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2343
+#: src/gtkprefs.c:2321
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:2347
+#: src/gtkprefs.c:2325
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2351
+#: src/gtkprefs.c:2329
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2486
+#: src/gtkprefs.c:2464
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2500
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2501
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2524
+#: src/gtkprefs.c:2502
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2525
+#: src/gtkprefs.c:2503
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2526
+#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2529
+#: src/gtkprefs.c:2507
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2531
+#: src/gtkprefs.c:2509
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2532
+#: src/gtkprefs.c:2510
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2535
+#: src/gtkprefs.c:2513
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2537
+#: src/gtkprefs.c:2515
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2538
+#: src/gtkprefs.c:2516
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2539
+#: src/gtkprefs.c:2517
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2540
+#: src/gtkprefs.c:2518
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2541
+#: src/gtkprefs.c:2519
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2543
+#: src/gtkprefs.c:2522
 msgid "Protocols"
 msgstr "协议"
 
-#: src/gtkprefs.c:2559
+#: src/gtkprefs.c:2523
 msgid "Plugins"
 msgstr "插件"
 
@@ -4038,7 +4069,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1398
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4102,11 +4133,13 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "否"
 
@@ -4114,7 +4147,7 @@
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:260
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
 msgid "Close"
 msgstr "关闭"
 
@@ -4191,11 +4224,11 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
 
-#: src/gtkutils.c:297
+#: src/gtkutils.c:133
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:332
+#: src/gtkutils.c:168
 msgid "Save Icon"
 msgstr "保存图标"
 
@@ -4247,28 +4280,28 @@
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:156
+#: src/main.c:155
 msgid "Please create an account."
 msgstr "请创建一个账户。"
 
-#: src/main.c:238
+#: src/main.c:237
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:256
+#: src/main.c:255
 msgid "<b>Screen Name:</b>"
 msgstr "<b>用户名:</b>"
 
-#: src/main.c:270
+#: src/main.c:269
 msgid "<b>Password:</b>"
 msgstr "<b>密码:</b>"
 
-#: src/main.c:299
+#: src/main.c:298
 msgid "Sign on"
 msgstr "登入"
 
 #. full help text
-#: src/main.c:523
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4301,23 +4334,23 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:538
+#: src/main.c:537
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/plugin.c:269
+#: src/plugin.c:277
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:274 src/plugin.c:302
+#: src/plugin.c:282 src/plugin.c:310
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:298
+#: src/plugin.c:306
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4327,10 +4360,12 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:360 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/oscar/oscar.c:5727
-#: src/protocols/yahoo/yahoo.c:2599 src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "可用"
 
@@ -4342,11 +4377,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:955
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:4657 src/protocols/oscar/oscar.c:4735
-#: src/protocols/oscar/oscar.c:4759 src/protocols/oscar/oscar.c:6392
-#: src/protocols/oscar/oscar.c:6397 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
 #: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隐身"
@@ -4363,14 +4398,14 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:103
+#: src/protocols/jabber/jabber.c:104
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4405,7 +4440,7 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:513
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
 #: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
 #: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
 #: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
@@ -4472,25 +4507,24 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4130
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4141 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4142 src/protocols/oscar/oscar.c:4143
-#: src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4131
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 msgid "Nick"
 msgstr "昵称"
 
@@ -4504,16 +4538,17 @@
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4185 src/protocols/oscar/oscar.c:4193
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1330
-#: src/protocols/msn/msn.c:1574 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3004 src/protocols/oscar/oscar.c:3315
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
 #: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
 #: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
 #: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
@@ -4612,7 +4647,7 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1054
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "更改密码"
@@ -4650,6 +4685,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
@@ -4665,15 +4701,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
 #: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2734
-#: src/protocols/oscar/oscar.c:5370
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
 #: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2736
-#: src/protocols/oscar/oscar.c:5371
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4757,7 +4793,7 @@
 msgstr "查看 MOTD"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3193 src/protocols/oscar/oscar.c:6493
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
 #: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "发送文件"
@@ -4814,22 +4850,22 @@
 msgstr "错误更少的 IRC 协议插件"
 
 #: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1361 src/protocols/napster/napster.c:658
+#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1382
-#: src/protocols/msn/msn.c:1714 src/protocols/napster/napster.c:663
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
+#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
 #: src/protocols/trepia/trepia.c:1307
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "编码"
 
 #: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:580
+#: src/protocols/jabber/jabber.c:581
 msgid "Username"
 msgstr "用户名"
 
@@ -5003,7 +5039,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:582
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
 #: 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."
@@ -5049,11 +5085,11 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
 msgid "URL"
 msgstr "URL"
 
@@ -5074,7 +5110,7 @@
 msgstr "区域"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:630
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -5111,7 +5147,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "生日"
 
@@ -5130,14 +5166,14 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:929
-#: src/protocols/msn/msn.c:347 src/protocols/oscar/oscar.c:5698
-#: src/protocols/oscar/oscar.c:5752 src/protocols/oscar/oscar.c:5754
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
 #: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
 msgid "Resource"
 msgstr "资源"
 
@@ -5145,8 +5181,8 @@
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4184 src/protocols/oscar/oscar.c:4192
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 msgid "Address"
 msgstr "地址"
 
@@ -5273,24 +5309,24 @@
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:73
+#: src/protocols/jabber/jabber.c:74
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
-#: src/protocols/msn/msn.c:173 src/protocols/msn/msn.c:273
-#: src/protocols/msn/msn.c:570 src/protocols/msn/msn.c:742
-#: src/protocols/msn/msn.c:771 src/protocols/msn/msn.c:803
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:844
-#: src/protocols/msn/msn.c:852 src/protocols/msn/msn.c:866
-#: src/protocols/msn/msn.c:875 src/protocols/msn/msn.c:890
-#: src/protocols/msn/msn.c:900 src/protocols/msn/msn.c:922
-#: src/protocols/msn/msn.c:972 src/protocols/msn/msn.c:1010
-#: src/protocols/msn/msn.c:1112 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1166 src/protocols/msn/msn.c:1177
-#: src/protocols/msn/msn.c:1188 src/protocols/msn/msn.c:1212
-#: src/protocols/msn/msn.c:1224 src/protocols/msn/msn.c:1305
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
 #: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
 #: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
 #: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
@@ -5300,377 +5336,383 @@
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:316
+#: src/protocols/jabber/jabber.c:317
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:319
+#: src/protocols/jabber/jabber.c:320
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:425
+#: src/protocols/jabber/jabber.c:426
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1025
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:595
+#: src/protocols/jabber/jabber.c:596
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4186
-#: src/protocols/oscar/oscar.c:4194 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:635
+#: src/protocols/jabber/jabber.c:636
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:645
+#: src/protocols/jabber/jabber.c:646
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:654
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:504 src/protocols/napster/napster.c:499
-#: src/protocols/oscar/oscar.c:749 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/zephyr/zephyr.c:864
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:778
+#: src/protocols/jabber/jabber.c:779
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:785
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:794
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1152
-#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1226
-#: src/protocols/oscar/oscar.c:5752 src/protocols/oscar/oscar.c:5777
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:904
+#: src/protocols/jabber/jabber.c:905
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:906
+#: src/protocols/jabber/jabber.c:907
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:908
+#: src/protocols/jabber/jabber.c:909
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:911
+#: src/protocols/jabber/jabber.c:912
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/jabber.c:914
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/jabber.c:918
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:938
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:950 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:952 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:2952 src/protocols/oscar/oscar.c:4747
-#: src/protocols/oscar/oscar.c:6388
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:970
-msgid "Password Changed"
-msgstr "密码已更改"
-
 #: src/protocols/jabber/jabber.c:971
+msgid "Password Changed"
+msgstr "密码已更改"
+
+#: src/protocols/jabber/jabber.c:972
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1030
+#: src/protocols/jabber/jabber.c:1031
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1035 src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1037
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1047 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1132
+#: src/protocols/jabber/jabber.c:1133
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1134
+#: src/protocols/jabber/jabber.c:1135
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1136
+#: src/protocols/jabber/jabber.c:1137
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1142 src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1148
+#: src/protocols/jabber/jabber.c:1149
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1164
+#: src/protocols/jabber/jabber.c:1165
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1180
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1182
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1184
+#: src/protocols/jabber/jabber.c:1185
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1196
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1198
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1207
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1209
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1211
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1215
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1223
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1233
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Stream Error"
 msgstr "流错误"
 
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
+msgstr "隐藏操作系统"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5681,30 +5723,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1340 src/protocols/jabber/jabber.c:1342
+#. *  description
+#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1389
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/jabber.c:1394
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1377
+#: src/protocols/jabber/jabber.c:1399
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
-#: src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/jabber.c:1408
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/jabber.c:1403
-msgid "Hide Operating System"
-msgstr "隐藏操作系统"
-
 #: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
@@ -6026,7 +6065,7 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1162
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
@@ -6061,35 +6100,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误:%s\n"
 
-#: src/protocols/msn/msn.c:71
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:192
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:204
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:226
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:234
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:236
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6097,89 +6136,91 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:258
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:259
+#: src/protocols/msn/msn.c:260
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:661
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
 #: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:665
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:667
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
 #: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:669
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
 #: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:671
-#: src/protocols/zephyr/zephyr.c:1170 src/protocols/zephyr/zephyr.c:1185
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:378
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:386
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:392
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:397
+#: src/protocols/msn/msn.c:398
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:406
+#: src/protocols/msn/msn.c:407
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:439
+#: src/protocols/msn/msn.c:440
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:448
+#: src/protocols/msn/msn.c:449
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:472
+#: src/protocols/msn/msn.c:473
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6187,7 +6228,7 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:784
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6196,11 +6237,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:828
+#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
 msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:824
+#: src/protocols/msn/msn.c:825
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6209,76 +6250,84 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1401 src/protocols/oscar/oscar.c:4171
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1408 src/protocols/oscar/oscar.c:4158
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1416 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1423 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1431 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
-#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1468
-#: src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1497
-#: src/protocols/msn/msn.c:1504
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1513 src/protocols/msn/msn.c:1519
-#: src/protocols/msn/msn.c:1526
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1535 src/protocols/msn/msn.c:1541
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
 #: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1560 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1582 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1584 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr "显示对话关闭通知"
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr "显示超时通知"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6289,26 +6338,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1689 src/protocols/msn/msn.c:1691
+#. *  description
+#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1709 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1718
+#: src/protocols/msn/msn.c:1746
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/msn.c:1736
-msgid "Display conversation closed notices"
-msgstr "显示对话关闭通知"
-
-#: src/protocols/msn/msn.c:1741
-msgid "Display timeout notices"
-msgstr "显示超时通知"
-
 #: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "无法连接到服务器"
@@ -6330,7 +6372,7 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1451
+#: src/protocols/oscar/oscar.c:1646
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6460,7 +6502,7 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5441
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "组(_G):"
@@ -6475,10 +6517,210 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, fuzzy, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr "无法发送消息。消息太大。"
+
+#: src/protocols/novell/novell.c:371
+#, fuzzy, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, fuzzy, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "无法发送消息。"
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, fuzzy, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr "无法发送消息。消息太大。"
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, fuzzy, c-format
+msgid "GroupWise Conference %d"
+msgstr "发起会议"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+#, fuzzy
+msgid "Error communicating with server. Closing connection."
+msgstr "与 Gadu-Gadu 服务器通讯出错"
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "用户"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "全名"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "用户选项"
+
+#: src/protocols/novell/novell.c:1084
+#, fuzzy
+msgid "Unable to make SSL connection to server."
+msgstr "无法连接到服务器。"
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+#, fuzzy
+msgid "Authenticating..."
+msgstr "正在认证"
+
+#: src/protocols/novell/novell.c:1162
+#, fuzzy
+msgid "Waiting for response..."
+msgstr "正在等候回复..."
+
+#: src/protocols/novell/novell.c:1302
+#, fuzzy
+msgid "Invitation to Conversation"
+msgstr "保存对话"
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+#, fuzzy
+msgid "Would you like to join the conversation?"
+msgstr "您是否想要覆盖?"
+
+#: src/protocols/novell/novell.c:1408
+#, fuzzy
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "请输入您想要屏蔽的用户名称。"
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "离线"
+
+#: src/protocols/novell/novell.c:2164
+#, c-format
+msgid ""
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2168
+#, fuzzy, c-format
+msgid "<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#, fuzzy
+msgid "Appear Offline"
+msgstr "离线"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server address"
+msgstr "街道地址"
+
+#: src/protocols/novell/novell.c:2432
+#, fuzzy
+msgid "Server port"
+msgstr "服务器"
+
 #: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "无效错误"
@@ -6575,34 +6817,145 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:521
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "语音"
+
+#: src/protocols/oscar/oscar.c:431
+msgid "AIM Direct IM"
+msgstr "AIM 二人世界"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "聊天"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr "获取文件"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "游戏"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "外挂"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "发送好友列表"
+
+#: src/protocols/oscar/oscar.c:453
+msgid "ICQ Direct Connect"
+msgstr "ICQ 直接连接"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "AP 用户"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "ICQ 服务器转发"
+
+#: src/protocols/oscar/oscar.c:468
+msgid "Old ICQ UTF8"
+msgstr "旧的 ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr "安全已启用"
+
+#: src/protocols/oscar/oscar.c:483
+msgid "Video Chat"
+msgstr "可视聊天"
+
+#: src/protocols/oscar/oscar.c:487
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr "实时视频"
+
+#: src/protocols/oscar/oscar.c:493
+msgid "Camera"
+msgstr "相机"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr "无事闲聊"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+msgid "Not Available"
+msgstr "不可用"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr "琐事缠身"
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr "网上留意"
+
+#: src/protocols/oscar/oscar.c:590
+msgid "Capabilities"
+msgstr "能力"
+
+#: src/protocols/oscar/oscar.c:596
+msgid "Buddy Comment"
+msgstr "好友注释"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:523
+#: src/protocols/oscar/oscar.c:718
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:594 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:745
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:886
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:900
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6612,45 +6965,45 @@
 "无法登入:无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:733
+#: src/protocols/oscar/oscar.c:928
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:837 src/protocols/oscar/oscar.c:1255
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:845
+#: src/protocols/oscar/oscar.c:1040
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:958 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:963
+#: src/protocols/oscar/oscar.c:1158
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1034
+#: src/protocols/oscar/oscar.c:1229
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1139 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1144
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1148
+#: src/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1153
+#: src/protocols/oscar/oscar.c:1348
 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."
@@ -6658,21 +7011,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1190
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1262
+#: src/protocols/oscar/oscar.c:1457
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:1298 src/protocols/oscar/oscar.c:1328
-#: src/protocols/oscar/oscar.c:1416
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6680,29 +7033,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1301 src/protocols/oscar/oscar.c:1331
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1419
+#: src/protocols/oscar/oscar.c:1614
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2001 src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2334 src/protocols/oscar/oscar.c:2356
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2517
+#: src/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2716
 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 "
@@ -6711,46 +7064,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:6265
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:2750
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2560
+#: src/protocols/oscar/oscar.c:2758
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2561
+#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2788
 #, 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:2595 src/protocols/oscar/oscar.c:2597
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2633 src/protocols/oscar/oscar.c:2635
-#: src/protocols/oscar/oscar.c:2642 src/protocols/oscar/oscar.c:2724
-#: src/protocols/oscar/oscar.c:2744 src/protocols/oscar/oscar.c:3100
-#: src/protocols/oscar/oscar.c:3160 src/protocols/oscar/oscar.c:5362
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2641
+#: src/protocols/oscar/oscar.c:2839
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6759,11 +7112,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2732 src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2744
+#: src/protocols/oscar/oscar.c:2942
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6773,17 +7126,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2745
+#: src/protocols/oscar/oscar.c:2943
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2752
+#: src/protocols/oscar/oscar.c:2950
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6796,7 +7149,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2768
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6809,7 +7162,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2776
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6822,32 +7175,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2803
+#: src/protocols/oscar/oscar.c:3001
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2807
+#: src/protocols/oscar/oscar.c:3005
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:3090
 #, 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:2898
+#: src/protocols/oscar/oscar.c:3099
 #, 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:2907
+#: src/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6855,197 +7208,79 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2916
+#: src/protocols/oscar/oscar.c:3117
 #, 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:2925
+#: src/protocols/oscar/oscar.c:3126
 #, 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:2934
+#: src/protocols/oscar/oscar.c:3135
 #, 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:2950 src/protocols/oscar/oscar.c:4756
-#: src/protocols/oscar/oscar.c:6391
-msgid "Free For Chat"
-msgstr "无事闲聊"
-
-#: src/protocols/oscar/oscar.c:2954 src/protocols/oscar/oscar.c:4750
-#: src/protocols/oscar/oscar.c:6389
-msgid "Not Available"
-msgstr "不可用"
-
-#: src/protocols/oscar/oscar.c:2956 src/protocols/oscar/oscar.c:4753
-#: src/protocols/oscar/oscar.c:6390
-msgid "Occupied"
-msgstr "琐事缠身"
-
-#: src/protocols/oscar/oscar.c:2960
-msgid "Web Aware"
-msgstr "网上留意"
-
-#: src/protocols/oscar/oscar.c:3003
+#: src/protocols/oscar/oscar.c:3189
 #, 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:3062
+#: src/protocols/oscar/oscar.c:3248
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3249
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3157
+#: src/protocols/oscar/oscar.c:3343
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid "Voice"
-msgstr "语音"
-
-#: src/protocols/oscar/oscar.c:3184
-msgid "AIM Direct IM"
-msgstr "AIM 二人世界"
-
-#: src/protocols/oscar/oscar.c:3187
-msgid "Chat"
-msgstr "聊天"
-
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:6501
-msgid "Get File"
-msgstr "获取文件"
-
-#: src/protocols/oscar/oscar.c:3197
-msgid "Games"
-msgstr "游戏"
-
-#: src/protocols/oscar/oscar.c:3200
-msgid "Add-Ins"
-msgstr "外挂"
-
-#: src/protocols/oscar/oscar.c:3203
-msgid "Send Buddy List"
-msgstr "发送好友列表"
-
-#: src/protocols/oscar/oscar.c:3206
-msgid "ICQ Direct Connect"
-msgstr "ICQ 直接连接"
-
-#: src/protocols/oscar/oscar.c:3209
-msgid "AP User"
-msgstr "AP 用户"
-
-#: src/protocols/oscar/oscar.c:3212
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3215
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3218
-msgid "ICQ Server Relay"
-msgstr "ICQ 服务器转发"
-
-#: src/protocols/oscar/oscar.c:3221
-msgid "Old ICQ UTF8"
-msgstr "旧的 ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3224
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-#: src/protocols/oscar/oscar.c:3227
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3230
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:3233
-msgid "Security Enabled"
-msgstr "安全已启用"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "Video Chat"
-msgstr "可视聊天"
-
-#: src/protocols/oscar/oscar.c:3240
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:3243
-msgid "Live Video"
-msgstr "实时视频"
-
-#: src/protocols/oscar/oscar.c:3246
-msgid "Camera"
-msgstr "相机"
-
-#: src/protocols/oscar/oscar.c:3275
-#, c-format
-msgid "Username: <b>%s</b><br>\n"
-msgstr "用户名: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3276
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr "警告级别: <b>%d%%</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3279
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr "上线时间: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3283
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr "成员时间: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3288
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "瞌睡: <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3291
-msgid "Idle: <b>Active</b>"
-msgstr "瞌睡:<b>活跃</b>"
-
-#: src/protocols/oscar/oscar.c:3363
+#: src/protocols/oscar/oscar.c:3366
+#, fuzzy
+msgid "Warning Level"
+msgstr "显示警告级别(_W)"
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "上线时间"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr "注册时间"
+
+#: src/protocols/oscar/oscar.c:3455
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3641
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:3859
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3768
+#: src/protocols/oscar/oscar.c:3860
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7053,162 +7288,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3831
+#: src/protocols/oscar/oscar.c:3923
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3833
+#: src/protocols/oscar/oscar.c:3925
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3956
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4145 src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4157
+#: src/protocols/oscar/oscar.c:4238
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4158 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4158 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4174
+#: src/protocols/oscar/oscar.c:4255
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4178
+#: src/protocols/oscar/oscar.c:4259
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4183
+#: src/protocols/oscar/oscar.c:4264
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4187 src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4191
+#: src/protocols/oscar/oscar.c:4272
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4280
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4281
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4283
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4285
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4291
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4260
+#: src/protocols/oscar/oscar.c:4341
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4362
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4366
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4302
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4323
+#: src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4325
+#: src/protocols/oscar/oscar.c:4406
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4353
+#: src/protocols/oscar/oscar.c:4434
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4437
 #, 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:4359
+#: src/protocols/oscar/oscar.c:4440
 #, 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:4362
+#: src/protocols/oscar/oscar.c:4443
 #, 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:4365
+#: src/protocols/oscar/oscar.c:4446
 #, 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:4368
+#: src/protocols/oscar/oscar.c:4449
 #, 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:4371
+#: src/protocols/oscar/oscar.c:4452
 #, 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:4374
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7217,20 +7452,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4385 src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4390
+#: src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:4686
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:4687
 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 "
@@ -7239,7 +7474,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4633
+#: src/protocols/oscar/oscar.c:4714
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7249,19 +7484,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4638
+#: src/protocols/oscar/oscar.c:4719
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4654 src/protocols/oscar/oscar.c:6396
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:4672
+#: src/protocols/oscar/oscar.c:4753
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4673
+#: src/protocols/oscar/oscar.c:4754
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7270,7 +7505,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4713
+#: src/protocols/oscar/oscar.c:4794
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7282,11 +7517,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4718
+#: src/protocols/oscar/oscar.c:4799
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4811
+#: src/protocols/oscar/oscar.c:4892
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7296,16 +7531,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:4812 src/protocols/oscar/oscar.c:5229
-#: src/protocols/oscar/oscar.c:5242
+#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:4948
+#: src/protocols/oscar/oscar.c:5029
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4949
+#: src/protocols/oscar/oscar.c:5030
 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 "
@@ -7314,13 +7549,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5125 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5131 src/protocols/oscar/oscar.c:5286
-#: src/protocols/oscar/oscar.c:5287 src/protocols/oscar/oscar.c:5292
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5228
+#: src/protocols/oscar/oscar.c:5309
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7328,11 +7563,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5228 src/protocols/oscar/oscar.c:5241
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5241
+#: src/protocols/oscar/oscar.c:5322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7342,18 +7577,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5404
 #, 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:5329
+#: src/protocols/oscar/oscar.c:5410
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5362
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7363,17 +7598,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:5485
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5405
+#: src/protocols/oscar/oscar.c:5486
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5489
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7383,96 +7618,83 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5490
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5446 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5549
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:5714
-msgid "Capabilities"
-msgstr "能力"
-
-#: src/protocols/oscar/oscar.c:5720
-msgid "Buddy Comment"
-msgstr "好友注释"
-
-#: src/protocols/oscar/oscar.c:5746
+#: src/protocols/oscar/oscar.c:5790
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:5754 src/protocols/oscar/oscar.c:5779
-#: src/protocols/yahoo/yahoo.c:2297
-msgid "Offline"
-msgstr "离线"
-
-#: src/protocols/oscar/oscar.c:6245
+#: src/protocols/oscar/oscar.c:6284
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:6258
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:6261
+#: src/protocols/oscar/oscar.c:6300
 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:6446
+#: src/protocols/oscar/oscar.c:6485
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6462
+#: src/protocols/oscar/oscar.c:6501
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6470
+#: src/protocols/oscar/oscar.c:6509
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6524
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6514
+#: src/protocols/oscar/oscar.c:6553
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6535
+#: src/protocols/oscar/oscar.c:6574
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6575
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6542
+#: src/protocols/oscar/oscar.c:6581
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6591
+#: src/protocols/oscar/oscar.c:6630
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6635
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6677
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6639
+#: src/protocols/oscar/oscar.c:6678
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7480,75 +7702,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6653
+#: src/protocols/oscar/oscar.c:6692
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6654
+#: src/protocols/oscar/oscar.c:6693
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6655
+#: src/protocols/oscar/oscar.c:6694
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6672
+#: src/protocols/oscar/oscar.c:6711
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6673
+#: src/protocols/oscar/oscar.c:6712
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6788
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6795
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:6764
+#: src/protocols/oscar/oscar.c:6803
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6771
+#: src/protocols/oscar/oscar.c:6810
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6778
+#: src/protocols/oscar/oscar.c:6817
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6786
+#: src/protocols/oscar/oscar.c:6825
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6797
+#: src/protocols/oscar/oscar.c:6836
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:6842
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6809
+#: src/protocols/oscar/oscar.c:6848
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6815
+#: src/protocols/oscar/oscar.c:6854
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:6824
+#: src/protocols/oscar/oscar.c:6863
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6832
+#: src/protocols/oscar/oscar.c:6871
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:6839
+#: src/protocols/oscar/oscar.c:6878
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -7562,15 +7784,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6963 src/protocols/oscar/oscar.c:6965
+#. *  description
+#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6982
+#: src/protocols/oscar/oscar.c:7021
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6987
+#: src/protocols/oscar/oscar.c:7026
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -7776,6 +7999,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
@@ -7867,6 +8091,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
@@ -8076,10 +8301,6 @@
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:3088
-msgid "Member Since"
-msgstr "注册时间"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8090,6 +8311,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
@@ -8209,19 +8431,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1155
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1197
+#: src/protocols/zephyr/zephyr.c:1206
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:1212
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1209
+#: src/protocols/zephyr/zephyr.c:1218
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
@@ -8235,19 +8457,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1364 src/protocols/zephyr/zephyr.c:1366
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1389
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "Exposure"
 msgstr "暴露"
 
@@ -8272,7 +8495,7 @@
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:194
+#: src/prpl.h:195
 msgid "Custom"
 msgstr "自定义"
 
@@ -8297,47 +8520,47 @@
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1155 src/server.c:1165
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1179
+#: src/server.c:1184
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1195
+#: src/server.c:1200
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1197
+#: src/server.c:1202
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1212
+#: src/server.c:1217
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/server.c:1226
+#: src/server.c:1231
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1239 src/server.c:1247
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1262
+#: src/server.c:1267
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1312
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8346,11 +8569,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1315
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1425
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8359,12 +8582,12 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1429
+#: src/server.c:1434
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1435
+#: src/server.c:1440
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -8391,30 +8614,30 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2039
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2042
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2073 src/util.c:2078 src/util.c:2083 src/util.c:2086
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2074 src/util.c:2078 src/util.c:2092 src/util.c:2094
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2074 src/util.c:2083 src/util.c:2092 src/util.c:2097
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2429
+#: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
@@ -8429,3 +8652,21 @@
 #: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "提示"
+
+#~ msgid "Username: <b>%s</b><br>\n"
+#~ msgstr "用户名: <b>%s</b><br>\n"
+
+#~ msgid "Warning Level: <b>%d%%</b><br>\n"
+#~ msgstr "警告级别: <b>%d%%</b><br>\n"
+
+#~ msgid "Online Since: <b>%s</b><br>\n"
+#~ msgstr "上线时间: <b>%s</b><br>\n"
+
+#~ msgid "Member Since: <b>%s</b><br>\n"
+#~ msgstr "成员时间: <b>%s</b><br>\n"
+
+#~ msgid "Idle: <b>%s</b>"
+#~ msgstr "瞌睡: <b>%s</b>"
+
+#~ msgid "Idle: <b>Active</b>"
+#~ msgstr "瞌睡:<b>活跃</b>"