changeset 5434:3034e83c1a49

[gaim-migrate @ 5816] Wang (fundawang) updated the zh_CN translation committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 18 May 2003 18:34:01 +0000
parents 19224d2ab31e
children a2f26666de42
files po/zh_CN.po
diffstat 1 files changed, 820 insertions(+), 675 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Sun May 18 18:33:02 2003 +0000
+++ b/po/zh_CN.po	Sun May 18 18:34:01 2003 +0000
@@ -1,13 +1,13 @@
 # gaim 软件包的简体中文翻译。
-# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2003 gaim team.
 # This file is distributed under the same license as the gaim package.
 # Funda Wang <fundawang@en2china.com>, 2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-05-12 17:00+0800\n"
-"PO-Revision-Date: 2003-05-11 21:32+0800\n"
+"POT-Creation-Date: 2003-05-18 22:57+0800\n"
+"PO-Revision-Date: 2003-05-18 22:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:296
+#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:359
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -33,10 +33,10 @@
 
 #: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
 #: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
-#: src/protocols/jabber/jabber.c:3487 src/protocols/jabber/jabber.c:3541
-#: src/protocols/oscar/oscar.c:2790 src/protocols/oscar/oscar.c:4466
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5689
-#: src/gtkblist.c:1488 src/gtkpounce.c:564 src/prefs.c:1072
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3489
+#: src/protocols/oscar/oscar.c:2780 src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:5333 src/protocols/oscar/oscar.c:5655
+#: src/gtkblist.c:1510 src/gtkpounce.c:564 src/prefs.c:1091
 msgid "Away"
 msgstr "离开"
 
@@ -60,7 +60,7 @@
 msgid "Preferences..."
 msgstr "首选项..."
 
-#: plugins/docklet/docklet.c:163 src/win32/systray.c:119
+#: plugins/docklet/docklet.c:163 src/win32/systray.c:159
 msgid "Signoff"
 msgstr "登出"
 
@@ -590,7 +590,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:586
+#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:605
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -655,13 +655,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1376
+#: plugins/perl/perl.c:1377
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
+#: plugins/perl/perl.c:1379 plugins/perl/perl.c:1380
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -686,9 +686,9 @@
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
 #: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
-#: src/protocols/msn/away.c:27 src/protocols/msn/away.c:28
-#: src/protocols/msn/away.c:35 src/protocols/msn/away.c:36
-#: src/protocols/msn/msn.c:124 src/protocols/yahoo/yahoo.c:1269
+#: src/protocols/msn/msn.c:314 src/protocols/msn/state.c:27
+#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1269
 #: src/protocols/yahoo/yahoo.c:1348
 msgid "Available"
 msgstr "可用"
@@ -701,10 +701,10 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3490
-#: src/protocols/jabber/jabber.c:3553 src/protocols/oscar/oscar.c:2794
-#: src/protocols/oscar/oscar.c:4454 src/protocols/oscar/oscar.c:4481
-#: src/protocols/oscar/oscar.c:5694 src/protocols/yahoo/yahoo.c:1086
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5660 src/protocols/yahoo/yahoo.c:1086
 #: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
 msgid "Invisible"
 msgstr "隐身"
@@ -819,11 +819,11 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1031
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1031
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1032
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1032
 msgid "No"
 msgstr "否"
 
@@ -949,8 +949,8 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4376
-#: src/protocols/oscar/oscar.c:5880 src/protocols/toc/toc.c:1449
+#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4324
+#: src/protocols/oscar/oscar.c:5846 src/protocols/toc/toc.c:1449
 #: src/dialogs.c:2194 src/dialogs.c:2203
 msgid "Change Password"
 msgstr "更改密码"
@@ -997,20 +997,20 @@
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2629
-#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3790
+#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3791
 #: src/prpl.c:706
 msgid "Add"
 msgstr "添加"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1432
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1430
 #: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
-#: src/protocols/oscar/oscar.c:5569 src/protocols/toc/toc.c:1979
+#: src/protocols/oscar/oscar.c:5534 src/protocols/toc/toc.c:1979
 #: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
 #: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
 #: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
-#: src/dialogs.c:4431 src/dialogs.c:5004 src/gtkft.c:1110 src/multi.c:1506
-#: src/multi.c:1870 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
+#: src/dialogs.c:4430 src/dialogs.c:5003 src/gtkft.c:1110 src/multi.c:1507
+#: src/multi.c:1871 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
 msgid "Cancel"
 msgstr "取消"
 
@@ -1019,15 +1019,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
-#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:602
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1715
+#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:649
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:603
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1715
+#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:650
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 #: src/dialogs.c:2479
 msgid "Deny"
 msgstr "拒绝"
@@ -1036,10 +1036,11 @@
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2385
-#: src/protocols/jabber/jabber.c:2420 src/protocols/jabber/jabber.c:4293
-#: src/protocols/jabber/jabber.c:4340 src/protocols/msn/dispatch.c:165
-#: src/protocols/msn/msn.c:187 src/protocols/msn/notification.c:1152
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2333
+#: src/protocols/jabber/jabber.c:2368 src/protocols/jabber/jabber.c:4241
+#: src/protocols/jabber/jabber.c:4288 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:429 src/protocols/msn/notification.c:1238
+#: src/protocols/napster/napster.c:512
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -1047,7 +1048,7 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3867
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3858
 msgid "Nick:"
 msgstr "昵称:"
 
@@ -1061,12 +1062,12 @@
 "the Account Editor)"
 msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2617
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2613
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2626
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2622
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "与 %s 的二人世界已建立"
@@ -1075,7 +1076,7 @@
 msgid "No topic is set"
 msgstr "没有设置话题"
 
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1754
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1752
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 已经将话题改为:%s</B>"
@@ -1094,7 +1095,7 @@
 msgstr "服务器"
 
 #: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1646
+#: src/protocols/irc/irc.c:1644
 msgid "IRC Operator"
 msgstr "IRC 管理者"
 
@@ -1124,7 +1125,7 @@
 
 #: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
 #: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1110
-#: src/protocols/irc/irc.c:1461 src/protocols/irc/irc.c:1604
+#: src/protocols/irc/irc.c:1459 src/protocols/irc/irc.c:1602
 msgid "IRC Error"
 msgstr "IRC 出错"
 
@@ -1149,92 +1150,92 @@
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "该昵称已经被其他人使用了。请输入新昵称"
 
-#: src/protocols/irc/irc.c:1395 src/protocols/irc/irc.c:1401
-#: src/protocols/irc/irc.c:1407 src/protocols/irc/irc.c:1421
+#: src/protocols/irc/irc.c:1393 src/protocols/irc/irc.c:1399
+#: src/protocols/irc/irc.c:1405 src/protocols/irc/irc.c:1419
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 信息"
 
-#: src/protocols/irc/irc.c:1431
+#: src/protocols/irc/irc.c:1429
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 想要建立二人世界"
 
-#: src/protocols/irc/irc.c:1432
+#: src/protocols/irc/irc.c:1430
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr "这需要在两台计算机之间建立直接连接。发送的消息不通过 IRC 服务器"
 
-#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2387
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/irc/irc.c:1430 src/protocols/oscar/oscar.c:2387
+#: src/protocols/oscar/oscar.c:5534
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/irc/irc.c:1458
+#: src/protocols/irc/irc.c:1456
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "收到了 %s 发出的无效文件发送请求。"
 
-#: src/protocols/irc/irc.c:1539 src/protocols/msn/error.c:132
-#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:612
+#: src/protocols/irc/irc.c:1537 src/protocols/msn/error.c:132
+#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:659
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/irc/irc.c:1602
+#: src/protocols/irc/irc.c:1600
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您已经被踢出了 %s: %s"
 
-#: src/protocols/irc/irc.c:1607
+#: src/protocols/irc/irc.c:1605
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2927
+#: src/protocols/irc/irc.c:1661 src/protocols/irc/irc.c:2923
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客户信息"
 
-#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2933
+#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2929
 msgid "CTCP UserInfo"
 msgstr "CTCP 用户信息"
 
-#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2939
+#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2935
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2945
+#: src/protocols/irc/irc.c:1701 src/protocols/irc/irc.c:2941
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1958 src/protocols/oscar/oscar.c:692
+#: src/protocols/irc/irc.c:1954 src/protocols/oscar/oscar.c:693
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:2214
+#: src/protocols/irc/irc.c:2210
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的话题是 %s"
 
-#: src/protocols/irc/irc.c:2310
+#: src/protocols/irc/irc.c:2306
 #, c-format
 msgid "You have left %s"
 msgstr "您已经离开了 %s"
 
-#: src/protocols/irc/irc.c:2311
+#: src/protocols/irc/irc.c:2307
 msgid "IRC Part"
 msgstr "IRC 部分"
 
-#: src/protocols/irc/irc.c:2366
+#: src/protocols/irc/irc.c:2362
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>正在请求二人世界</I>"
 
-#: src/protocols/irc/irc.c:2383
+#: src/protocols/irc/irc.c:2379
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2388
+#: src/protocols/irc/irc.c:2384
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1242,11 +1243,11 @@
 "<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
 "><BR>PING <昵称></B><BR>"
 
-#: src/protocols/irc/irc.c:2396
+#: src/protocols/irc/irc.c:2392
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
 
-#: src/protocols/irc/irc.c:2401
+#: src/protocols/irc/irc.c:2397
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1258,19 +1259,19 @@
 "入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
 "HELP DCC 可查看二人世界的命令"
 
-#: src/protocols/irc/irc.c:2424
+#: src/protocols/irc/irc.c:2420
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知命令</B>"
 
-#: src/protocols/irc/irc.c:2484
+#: src/protocols/irc/irc.c:2480
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:2489 src/main.c:346 src/multi.c:773
+#: src/protocols/irc/irc.c:2485 src/main.c:346 src/multi.c:773
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:2914
+#: src/protocols/irc/irc.c:2910
 msgid "DCC Chat"
 msgstr "二人世界"
 
@@ -1284,22 +1285,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3020 src/protocols/irc/irc.c:3022
+#: src/protocols/irc/irc.c:3016 src/protocols/irc/irc.c:3018
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
-#: src/protocols/irc/irc.c:3042 src/protocols/jabber/jabber.c:3006
-#: src/protocols/jabber/jabber.c:4473 src/protocols/napster/napster.c:609
+#: src/protocols/irc/irc.c:3038 src/protocols/jabber/jabber.c:2954
+#: src/protocols/jabber/jabber.c:4421 src/protocols/napster/napster.c:657
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/protocols/irc/irc.c:3047 src/protocols/jabber/jabber.c:4484
-#: src/protocols/msn/msn.c:964 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:3043 src/protocols/jabber/jabber.c:4432
+#: src/protocols/msn/msn.c:1208 src/protocols/napster/napster.c:663
 #: src/multi.c:1099
 msgid "Port:"
 msgstr "端口:"
 
-#: src/protocols/irc/irc.c:3053
+#: src/protocols/irc/irc.c:3049
 msgid "Encoding:"
 msgstr "编码:"
 
@@ -1323,266 +1324,267 @@
 "password remains the same."
 msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
 
-#: src/protocols/jabber/jabber.c:1172 src/blist.c:708 src/gtkpounce.c:296
+#: src/protocols/jabber/jabber.c:1172 src/blist.c:712 src/gtkpounce.c:296
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3486
-#: src/protocols/jabber/jabber.c:3537
+#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3434
+#: src/protocols/jabber/jabber.c:3485
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3488
-#: src/protocols/jabber/jabber.c:3545
+#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3493
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3489
-#: src/protocols/jabber/jabber.c:3549 src/protocols/oscar/oscar.c:2784
-#: src/protocols/oscar/oscar.c:4469 src/protocols/oscar/oscar.c:5690
+#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3437
+#: src/protocols/jabber/jabber.c:3497 src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:4459 src/protocols/oscar/oscar.c:5656
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/jabber.c:1424
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 错误 %s"
 
-#: src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1531
 #, c-format
 msgid "Error %s: %s"
 msgstr "错误 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/jabber.c:1534
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/jabber.c:1760
+#: src/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/jabber.c:1785
+#: src/protocols/jabber/jabber.c:1735
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr "Jabber 用户 %s 不存在,因此没有添加到您的人名单中。"
 
-#: src/protocols/jabber/jabber.c:1788
+#: src/protocols/jabber/jabber.c:1738
 msgid "No such user."
 msgstr "没有这样的用户。"
 
-#: src/protocols/jabber/jabber.c:1879 src/protocols/msn/notification.c:505
-#: src/protocols/msn/notification.c:658 src/protocols/msn/notification.c:659
+#: src/protocols/jabber/jabber.c:1829 src/protocols/msn/notification.c:549
+#: src/protocols/msn/notification.c:705 src/protocols/msn/notification.c:706
 #: src/blist.c:437 src/dialogs.c:960
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1952
+#: src/protocols/jabber/jabber.c:1902
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:1986
+#: src/protocols/jabber/jabber.c:1936
 msgid "Unknown login error"
 msgstr "未知的登录错误"
 
-#: src/protocols/jabber/jabber.c:2338
+#: src/protocols/jabber/jabber.c:2286
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2383 src/protocols/jabber/jabber.c:4291
+#: src/protocols/jabber/jabber.c:2331 src/protocols/jabber/jabber.c:4239
 msgid "Connection lost"
 msgstr "连接已丢失"
 
-#: src/protocols/jabber/jabber.c:2391
+#: src/protocols/jabber/jabber.c:2339
 msgid "Connected"
 msgstr "已连接"
 
-#: src/protocols/jabber/jabber.c:2394
+#: src/protocols/jabber/jabber.c:2342
 msgid "Requesting Authentication Method"
 msgstr "正在请求认证方法"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2414 src/protocols/msn/dispatch.c:170
-#: src/protocols/msn/msn.c:181 src/protocols/yahoo/yahoo.c:987
+#: src/protocols/jabber/jabber.c:2362 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:423 src/protocols/napster/napster.c:504
+#: src/protocols/yahoo/yahoo.c:987
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:2740
+#: src/protocols/jabber/jabber.c:2688
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "用户 %s 的 Jabber ID 无效,因此没有添加。"
 
-#: src/protocols/jabber/jabber.c:2742
+#: src/protocols/jabber/jabber.c:2690
 msgid "Jabber Error"
 msgstr "Jabber 错误"
 
-#: src/protocols/jabber/jabber.c:3001
+#: src/protocols/jabber/jabber.c:2949
 msgid "Room:"
 msgstr "房间:"
 
-#: src/protocols/jabber/jabber.c:3012
+#: src/protocols/jabber/jabber.c:2960
 msgid "Handle:"
 msgstr "门把手:"
 
-#: src/protocols/jabber/jabber.c:3042
+#: src/protocols/jabber/jabber.c:2990
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/jabber.c:3278 src/protocols/jabber/jabber.c:3329
-#: src/protocols/jabber/jabber.c:3754
+#: src/protocols/jabber/jabber.c:3226 src/protocols/jabber/jabber.c:3277
+#: src/protocols/jabber/jabber.c:3702
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3227
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:3330 src/protocols/jabber/jabber.c:3389
-#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3780
+#: src/protocols/jabber/jabber.c:3278 src/protocols/jabber/jabber.c:3337
+#: src/protocols/jabber/jabber.c:3348 src/protocols/jabber/jabber.c:3728
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3422
-#: src/protocols/oscar/oscar.c:5372
+#: src/protocols/jabber/jabber.c:3348 src/protocols/jabber/jabber.c:3370
+#: src/protocols/oscar/oscar.c:5337
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3435
+#: src/protocols/jabber/jabber.c:3383
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/protocols/jabber/jabber.c:3447 src/gtkconv.c:793
+#: src/protocols/jabber/jabber.c:3395 src/gtkconv.c:793
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/protocols/jabber/jabber.c:3454
+#: src/protocols/jabber/jabber.c:3402
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/jabber.c:3457
+#: src/protocols/jabber/jabber.c:3405
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/jabber.c:3464
+#: src/protocols/jabber/jabber.c:3412
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/jabber.c:3472
+#: src/protocols/jabber/jabber.c:3420
 msgid "Re-request authorization"
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3485 src/protocols/jabber/jabber.c:3535
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:4464
-#: src/protocols/oscar/oscar.c:5688 src/protocols/yahoo/yahoo.c:1090
+#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3483
+#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:5654 src/protocols/yahoo/yahoo.c:1090
 #: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
 #: src/multi.c:274
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:3675
+#: src/protocols/jabber/jabber.c:3623
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:3624
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3677
+#: src/protocols/jabber/jabber.c:3625
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3678
+#: src/protocols/jabber/jabber.c:3626
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3679 src/dialogs.c:2936
+#: src/protocols/jabber/jabber.c:3627 src/dialogs.c:2936
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3680
+#: src/protocols/jabber/jabber.c:3628
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3681
+#: src/protocols/jabber/jabber.c:3629
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3682
+#: src/protocols/jabber/jabber.c:3630
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3683
+#: src/protocols/jabber/jabber.c:3631
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3684
+#: src/protocols/jabber/jabber.c:3632
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3685 src/dialogs.c:2109 src/dialogs.c:2742
+#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2109 src/dialogs.c:2742
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/jabber.c:3686
+#: src/protocols/jabber/jabber.c:3634
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3687 src/dialogs.c:2800
+#: src/protocols/jabber/jabber.c:3635 src/dialogs.c:2800
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/jabber.c:3688
+#: src/protocols/jabber/jabber.c:3636
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3689
+#: src/protocols/jabber/jabber.c:3637
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3690
+#: src/protocols/jabber/jabber.c:3638
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3691
+#: src/protocols/jabber/jabber.c:3639
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3692
+#: src/protocols/jabber/jabber.c:3640
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3693 src/dialogs.c:2946 src/prefs.c:428
-#: src/prefs.c:1381
+#: src/protocols/jabber/jabber.c:3641 src/dialogs.c:2946 src/prefs.c:428
+#: src/prefs.c:1403
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3718
+#: src/protocols/jabber/jabber.c:3666
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
 
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/jabber.c:3667
 msgid "User Identity"
 msgstr "用户标识"
 
-#: src/protocols/jabber/jabber.c:4145
+#: src/protocols/jabber/jabber.c:4093
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4220
+#: src/protocols/jabber/jabber.c:4168
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4247
+#: src/protocols/jabber/jabber.c:4195
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/protocols/jabber/jabber.c:4362 src/protocols/oscar/oscar.c:5874
+#: src/protocols/jabber/jabber.c:4310 src/protocols/oscar/oscar.c:5840
 #: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
 msgid "Set User Info"
 msgstr "设置用户信息"
@@ -1597,52 +1599,18 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4451 src/protocols/jabber/jabber.c:4453
+#: src/protocols/jabber/jabber.c:4399 src/protocols/jabber/jabber.c:4401
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4479
+#: src/protocols/jabber/jabber.c:4427
 msgid "Resource:"
 msgstr "资源:"
 
-#: src/protocols/jabber/jabber.c:4490
+#: src/protocols/jabber/jabber.c:4438
 msgid "Connect Server:"
 msgstr "连接服务器:"
 
-#: src/protocols/msn/away.c:29 src/protocols/msn/msn.c:127
-#: src/protocols/msn/msn.c:320 src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
-msgid "Busy"
-msgstr "忙碌"
-
-#: src/protocols/msn/away.c:30 src/protocols/yahoo/yahoo.c:1088
-#: src/gtkpounce.c:568 src/prefs.c:1088
-msgid "Idle"
-msgstr "瞌睡"
-
-#: src/protocols/msn/away.c:31 src/protocols/msn/msn.c:126
-#: src/protocols/msn/msn.c:318 src/protocols/yahoo/yahoo.c:1068
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
-msgid "Be Right Back"
-msgstr "马上回来"
-
-#: src/protocols/msn/away.c:32 src/protocols/msn/msn.c:125
-#: src/protocols/msn/msn.c:316
-msgid "Away From Computer"
-msgstr "远离电脑"
-
-#: src/protocols/msn/away.c:33 src/protocols/msn/msn.c:128
-#: src/protocols/msn/msn.c:322 src/protocols/yahoo/yahoo.c:1078
-#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
-msgid "On The Phone"
-msgstr "接听电话"
-
-#: src/protocols/msn/away.c:34 src/protocols/msn/msn.c:129
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1082
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
-msgid "Out To Lunch"
-msgstr "外出就餐"
-
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
 msgid "Protocol not supported"
 msgstr "协议不支持"
@@ -1676,15 +1644,15 @@
 msgstr "无法处理消息。"
 
 #: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:330
-#: src/protocols/msn/notification.c:1162
+#: src/protocols/msn/notification.c:1248
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1167
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1255
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1180
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1268
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -1849,45 +1817,152 @@
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/msn.c:51
+#: src/protocols/msn/msn.c:59
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:64 src/protocols/msn/msn.c:231
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:356
-#: src/protocols/msn/msn.c:391 src/protocols/msn/msn.c:407
-#: src/protocols/msn/msn.c:439 src/protocols/msn/msn.c:448
-#: src/protocols/msn/msn.c:481 src/protocols/msn/msn.c:490
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:515
-#: src/protocols/msn/msn.c:530 src/protocols/msn/msn.c:540
-#: src/protocols/msn/msn.c:562 src/protocols/msn/msn.c:613
-#: src/protocols/msn/msn.c:652 src/protocols/msn/msn.c:744
-#: src/protocols/msn/msn.c:767 src/protocols/msn/msn.c:782
-#: src/protocols/msn/msn.c:794 src/protocols/msn/msn.c:816
-#: src/protocols/msn/msn.c:826 src/protocols/msn/notification.c:55
-#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:787
+#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:92
+#: src/protocols/msn/msn.c:150 src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:582 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:633 src/protocols/msn/msn.c:649
+#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:690
+#: src/protocols/msn/msn.c:723 src/protocols/msn/msn.c:732
+#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:757
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:782
+#: src/protocols/msn/msn.c:804 src/protocols/msn/msn.c:855
+#: src/protocols/msn/msn.c:894 src/protocols/msn/msn.c:986
+#: src/protocols/msn/msn.c:1009 src/protocols/msn/msn.c:1024
+#: src/protocols/msn/msn.c:1036 src/protocols/msn/msn.c:1058
+#: src/protocols/msn/msn.c:1068 src/protocols/msn/notification.c:55
+#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:858
+#: src/protocols/msn/buddyicon.c:169 src/protocols/msn/buddyicon.c:280
+#: src/protocols/msn/buddyicon.c:329 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:522
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:162
 msgid "Set Friendly Name:"
 msgstr "设置友好的名称:"
 
-#: src/protocols/msn/msn.c:112 src/protocols/yahoo/yahoo.c:1141
+#: src/protocols/msn/msn.c:171
+msgid "Set Home Phone Number:"
+msgstr "设置家庭电话号码:"
+
+#: src/protocols/msn/msn.c:181
+msgid "Set Work Phone Number:"
+msgstr "设置办公电话号码:"
+
+#: src/protocols/msn/msn.c:191
+msgid "Set Mobile Phone Number:"
+msgstr "设置移动电话号码:"
+
+#: src/protocols/msn/msn.c:202
+msgid "MSN Mobile Support"
+msgstr "MSN 移动支持"
+
+#: src/protocols/msn/msn.c:203
+msgid "Do you want to enable or disable MSN Mobile device support?"
+msgstr "您想要启用还是禁用 MSN 移动设备支持?"
+
+#: src/protocols/msn/msn.c:206
+msgid "Enable"
+msgstr "启用"
+
+#: src/protocols/msn/msn.c:207
+msgid "Disable"
+msgstr "禁用"
+
+#: src/protocols/msn/msn.c:217
+msgid "MSN Mobile Pages"
+msgstr "MSN 移动寻呼"
+
+#: src/protocols/msn/msn.c:218
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you "
+"mobile pages?"
+msgstr "您想要允许还是禁止您好友列表中的人给您发送移动寻呼?"
+
+#: src/protocols/msn/msn.c:221
+msgid "Allow"
+msgstr "允许"
+
+#: src/protocols/msn/msn.c:222
+msgid "Disallow"
+msgstr "禁止"
+
+#: src/protocols/msn/msn.c:239
+msgid "Send message:"
+msgstr "发送消息:"
+
+#: src/protocols/msn/msn.c:302 src/protocols/yahoo/yahoo.c:1141
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
 
-#: src/protocols/msn/msn.c:130 src/protocols/msn/msn.c:326
+#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:558
+#: src/protocols/msn/state.c:32
+msgid "Away From Computer"
+msgstr "远离电脑"
+
+#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:560
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1068
+#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
+msgid "Be Right Back"
+msgstr "马上回来"
+
+#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:562
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1070
+#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
+msgid "Busy"
+msgstr "忙碌"
+
+#: src/protocols/msn/msn.c:318 src/protocols/msn/msn.c:564
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
+msgid "On The Phone"
+msgstr "接听电话"
+
+#: src/protocols/msn/msn.c:319 src/protocols/msn/msn.c:566
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1082
+#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
+msgid "Out To Lunch"
+msgstr "外出就餐"
+
+#: src/protocols/msn/msn.c:320 src/protocols/msn/msn.c:568
 #: src/protocols/zephyr/zephyr.c:859 src/protocols/zephyr/zephyr.c:874
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:142
+#: src/protocols/msn/msn.c:332
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:420
+#: src/protocols/msn/msn.c:340
+msgid "Set Home Phone Number"
+msgstr "设置家庭电话号码"
+
+#: src/protocols/msn/msn.c:346
+msgid "Set Work Phone Number"
+msgstr "设置工作电话号码"
+
+#: src/protocols/msn/msn.c:352
+msgid "Set Mobile Phone Number"
+msgstr "设置移动电话号码"
+
+#: src/protocols/msn/msn.c:361
+msgid "Enable/Disable Mobile Devices"
+msgstr "启用/禁用移动设备"
+
+#: src/protocols/msn/msn.c:368
+msgid "Allow/Disallow Mobile Pages"
+msgstr "允许/禁止移动寻呼"
+
+#: src/protocols/msn/msn.c:390
+msgid "Send to Mobile"
+msgstr "发送到移动设备"
+
+#: src/protocols/msn/msn.c:662
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1896,11 +1971,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:424 src/protocols/msn/msn.c:465
+#: src/protocols/msn/msn.c:666 src/protocols/msn/msn.c:707
 msgid "Invalid MSN screenname"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:461
+#: src/protocols/msn/msn.c:703
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1919,11 +1994,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:938 src/protocols/msn/msn.c:940
+#: src/protocols/msn/msn.c:1182 src/protocols/msn/msn.c:1184
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:958
+#: src/protocols/msn/msn.c:1202
 msgid "Login Server:"
 msgstr "登录服务器:"
 
@@ -1960,16 +2035,20 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/notification.c:596
+#: src/protocols/msn/notification.c:643
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:969
+#: src/protocols/msn/notification.c:1040
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
-#: src/protocols/msn/notification.c:1123
+#: src/protocols/msn/notification.c:1083
+msgid "Unable to transfer to notification server"
+msgstr "无法传送到通知服务器。"
+
+#: src/protocols/msn/notification.c:1209
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -1984,6 +2063,11 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1088
+#: src/gtkpounce.c:568 src/prefs.c:1107
+msgid "Idle"
+msgstr "瞌睡"
+
 #: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
@@ -2001,7 +2085,52 @@
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
-#: src/protocols/napster/napster.c:460 src/protocols/oscar/oscar.c:5095
+#: src/protocols/napster/napster.c:249
+msgid "Unable to read header from server"
+msgstr "无法从服务器读取头"
+
+#: src/protocols/napster/napster.c:326
+#, c-format
+msgid "users: %s, files: %s, size: %sGB"
+msgstr "用户数:%s,文件数:%s,大小:%sGB"
+
+#. MSG_SERVER_HOTLIST_ERROR
+#: src/protocols/napster/napster.c:337
+#, c-format
+msgid "Unable to add \"%s\" to your Napster hotlist"
+msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:344
+msgid "You were disconnected from the server."
+msgstr "您已经断开与服务器的连接。"
+
+#. MSG_CLIENT_WHOIS
+#: src/protocols/napster/napster.c:400
+#, c-format
+msgid "%s requested your information"
+msgstr "%s 请求您的信息"
+
+#. MSG_SERVER_GHOST
+#. Looks like someone logged in as us! =-O
+#: src/protocols/napster/napster.c:429
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
+
+#. MSG_CLIENT_PING
+#: src/protocols/napster/napster.c:434
+#, c-format
+msgid "%s requested a PING"
+msgstr "%s 请求 PING"
+
+#: src/protocols/napster/napster.c:548 src/gtkblist.c:1493
+msgid "Get Info"
+msgstr "信息"
+
+#: src/protocols/napster/napster.c:562 src/protocols/oscar/oscar.c:5060
 #: src/protocols/toc/toc.c:1191
 msgid "Join what group:"
 msgstr "加入组:"
@@ -2016,7 +2145,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:700 src/protocols/napster/napster.c:702
+#: src/protocols/napster/napster.c:638 src/protocols/napster/napster.c:640
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -2136,60 +2265,60 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:571
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:643 src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:706
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:687
+#: src/protocols/oscar/oscar.c:688
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:798 src/protocols/oscar/oscar.c:1181
+#: src/protocols/oscar/oscar.c:799 src/protocols/oscar/oscar.c:1182
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:806
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:872 src/protocols/oscar/oscar.c:883
-#: src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:873 src/protocols/oscar/oscar.c:884
+#: src/protocols/oscar/oscar.c:888
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:873
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:884
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:888
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1071 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1075
+#: src/protocols/oscar/oscar.c:1076
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1079
+#: src/protocols/oscar/oscar.c:1080
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1083
+#: src/protocols/oscar/oscar.c:1084
 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."
@@ -2198,20 +2327,20 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1087
+#: src/protocols/oscar/oscar.c:1088
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1091 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1092 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1120
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
+#: src/protocols/oscar/oscar.c:1221 src/protocols/oscar/oscar.c:1250
 #: src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid ""
@@ -2220,7 +2349,7 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1222 src/protocols/oscar/oscar.c:1252
+#: src/protocols/oscar/oscar.c:1223 src/protocols/oscar/oscar.c:1252
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
@@ -2228,7 +2357,7 @@
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5378
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
@@ -2276,9 +2405,9 @@
 
 #: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
 #: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
-#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2950
-#: src/protocols/oscar/oscar.c:3001 src/protocols/oscar/oscar.c:5020
-#: src/protocols/oscar/oscar.c:5062
+#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2940
+#: src/protocols/oscar/oscar.c:2991 src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5027
 msgid "No reason given."
 msgstr "没有给出理由。"
 
@@ -2295,7 +2424,7 @@
 "用户 %lu 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 msgid "Authorization Request"
 msgstr "认证请求"
 
@@ -2371,19 +2500,19 @@
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2711
 #, 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:2724
+#: src/protocols/oscar/oscar.c:2720
 #, 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:2735
+#: src/protocols/oscar/oscar.c:2729
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2391,167 +2520,167 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2746
+#: src/protocols/oscar/oscar.c:2738
 #, 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:2757
+#: src/protocols/oscar/oscar.c:2747
 #, 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:2767
+#: src/protocols/oscar/oscar.c:2756
 #, 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:2782 src/protocols/oscar/oscar.c:4478
-#: src/protocols/oscar/oscar.c:5693
+#: src/protocols/oscar/oscar.c:2772 src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:5659
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4472
-#: src/protocols/oscar/oscar.c:5691
+#: src/protocols/oscar/oscar.c:2776 src/protocols/oscar/oscar.c:4462
+#: src/protocols/oscar/oscar.c:5657
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2788 src/protocols/oscar/oscar.c:4475
-#: src/protocols/oscar/oscar.c:5692
+#: src/protocols/oscar/oscar.c:2778 src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5658
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2782
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:2842
 #, 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:2854
+#: src/protocols/oscar/oscar.c:2844
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2913
+#: src/protocols/oscar/oscar.c:2903
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2914
+#: src/protocols/oscar/oscar.c:2904
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2939
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2990
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/protocols/oscar/oscar.c:3032
+#: src/protocols/oscar/oscar.c:3023
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:3035
+#: src/protocols/oscar/oscar.c:3026
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:3029 src/protocols/oscar/oscar.c:5683
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:3041 src/gtkblist.c:1480
+#: src/protocols/oscar/oscar.c:3032 src/gtkblist.c:1502
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5729
+#: src/protocols/oscar/oscar.c:3035 src/protocols/oscar/oscar.c:5695
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5723
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5689
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3042
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3045
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3048
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3060
+#: src/protocols/oscar/oscar.c:3051
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3054
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3057
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3060
 msgid "Nihilist"
 msgstr "Nihilist"
 
+#: src/protocols/oscar/oscar.c:3063
+msgid "ICQ Server Relay"
+msgstr "ICQ 服务器转发"
+
+#: src/protocols/oscar/oscar.c:3066
+msgid "ICQ Unknown"
+msgstr "ICQ 未知"
+
+#: src/protocols/oscar/oscar.c:3069
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
 #: src/protocols/oscar/oscar.c:3072
-msgid "ICQ Server Relay"
-msgstr "ICQ 服务器转发"
-
-#: src/protocols/oscar/oscar.c:3075
-msgid "ICQ Unknown"
-msgstr "ICQ 未知"
-
-#: src/protocols/oscar/oscar.c:3078
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-#: src/protocols/oscar/oscar.c:3081
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3111
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3127
+#: src/protocols/oscar/oscar.c:3118
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3123
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3129
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3132
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3134
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2564,206 +2693,206 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3166
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3177
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3183
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3215
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3576
+#: src/protocols/oscar/oscar.c:3567
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3577
+#: src/protocols/oscar/oscar.c:3568
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "最后一条消息未送出,原因是您已经得到了速度极限。请等 10 秒,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3627
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3638
+#: src/protocols/oscar/oscar.c:3629
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3856
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3870
+#: src/protocols/oscar/oscar.c:3861
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3873
+#: src/protocols/oscar/oscar.c:3864
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3876 src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3867 src/protocols/oscar/oscar.c:3873
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3878
 msgid "Mobile Phone:"
 msgstr "移动电话:"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3881
 msgid "Gender:"
 msgstr "性别:"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3881
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3881
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:3890
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3895
 msgid "Age:"
 msgstr "年龄:"
 
-#: src/protocols/oscar/oscar.c:3907
+#: src/protocols/oscar/oscar.c:3898
 msgid "Personal Web Page:"
 msgstr "个人主页:"
 
-#: src/protocols/oscar/oscar.c:3910
+#: src/protocols/oscar/oscar.c:3901
 msgid "Additional Information:"
 msgstr "额外信息:"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:3905
 msgid "Home Address:"
 msgstr "家庭住址:"
 
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
+#: src/protocols/oscar/oscar.c:3907 src/protocols/oscar/oscar.c:3923
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3919 src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:3910 src/protocols/oscar/oscar.c:3926
 msgid "City:"
 msgstr "城市:"
 
-#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:3929
 msgid "State:"
 msgstr "州/省:"
 
-#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
 msgid "Zip Code:"
 msgstr "邮政编码:"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3921
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:3946
+#: src/protocols/oscar/oscar.c:3937
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3939
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3942
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:3954
+#: src/protocols/oscar/oscar.c:3945
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3948
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 拥有下列用户名:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4034
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4067
+#: src/protocols/oscar/oscar.c:4057
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4095
+#: src/protocols/oscar/oscar.c:4085
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4098
+#: src/protocols/oscar/oscar.c:4088
 #, 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:4101
+#: src/protocols/oscar/oscar.c:4091
 #, 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:4104
+#: src/protocols/oscar/oscar.c:4094
 #, 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:4107
+#: src/protocols/oscar/oscar.c:4097
 #, 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:4110
+#: src/protocols/oscar/oscar.c:4100
 #, 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:4113
+#: src/protocols/oscar/oscar.c:4103
 #, 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:4116
+#: src/protocols/oscar/oscar.c:4106
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4116
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2772,20 +2901,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4127 src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4132
+#: src/protocols/oscar/oscar.c:4122
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4354
+#: src/protocols/oscar/oscar.c:4344
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4355
+#: src/protocols/oscar/oscar.c:4345
 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 "
@@ -2794,22 +2923,22 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4382
+#: src/protocols/oscar/oscar.c:4372
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4374
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4390
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4391
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2818,7 +2947,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:4427
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -2827,15 +2956,15 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4439
+#: src/protocols/oscar/oscar.c:4429
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4642
 msgid "Unable To Retrive Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4642
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2844,25 +2973,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4742 src/protocols/oscar/oscar.c:4743
-#: src/protocols/oscar/oscar.c:4748
+#: src/protocols/oscar/oscar.c:4732 src/protocols/oscar/oscar.c:4733
+#: src/protocols/oscar/oscar.c:4738
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:4893
-#, c-format
-msgid ""
-"The maximum number of buddies allowed in your buddy list is %d, and you have "
-"%d.  Until you are below the limit, some buddies will not show up as online."
-msgstr ""
-"您的好友列表中最多可容纳 %d 人,而您现在已经有 %d 人了。除非您的人数在允许范"
-"围之内,否则某些好友的在线状态不会显示出来。"
-
-#: src/protocols/oscar/oscar.c:4896
-msgid "Maximum buddy list length exceeded."
-msgstr "达到了好友列表的最多人数。"
-
-#: src/protocols/oscar/oscar.c:4936
+#: src/protocols/oscar/oscar.c:4902
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2870,31 +2986,36 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:4936 src/protocols/oscar/oscar.c:4950
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4915
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:4937 src/protocols/oscar/oscar.c:4951
+#: src/protocols/oscar/oscar.c:4903 src/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr "无法添加"
 
+#: src/protocols/oscar/oscar.c:4915
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr ""
+"无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
+"允许的最大值。"
+
 #: src/protocols/oscar/oscar.c:4950
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "无法添加好友 %s,原因未知。"
-
-#: src/protocols/oscar/oscar.c:4985
-#, 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:4990
+#: src/protocols/oscar/oscar.c:4955
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5020
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2904,17 +3025,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5023
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5059
+#: src/protocols/oscar/oscar.c:5024
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5062
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -2924,87 +3045,87 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5028
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5100 src/protocols/toc/toc.c:1196
+#: src/protocols/oscar/oscar.c:5065 src/protocols/toc/toc.c:1196
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5320
+#: src/protocols/oscar/oscar.c:5285
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5329
+#: src/protocols/oscar/oscar.c:5294
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5336
+#: src/protocols/oscar/oscar.c:5301
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5344
+#: src/protocols/oscar/oscar.c:5309
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5348 src/gtkblist.c:845
+#: src/protocols/oscar/oscar.c:5313 src/gtkblist.c:855
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5339
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5520
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/oscar/oscar.c:5534
 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:5707
+#: src/protocols/oscar/oscar.c:5673
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5741
+#: src/protocols/oscar/oscar.c:5707
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5762
+#: src/protocols/oscar/oscar.c:5728
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5763
+#: src/protocols/oscar/oscar.c:5729
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5735
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:5814
+#: src/protocols/oscar/oscar.c:5780
 msgid "Change Address To: "
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5824
+#: src/protocols/oscar/oscar.c:5790
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:5849
+#: src/protocols/oscar/oscar.c:5815
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:5854
+#: src/protocols/oscar/oscar.c:5820
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3013,31 +3134,31 @@
 "%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
 "单击“重新请求认证”。"
 
-#: src/protocols/oscar/oscar.c:5887
+#: src/protocols/oscar/oscar.c:5853
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:5898
+#: src/protocols/oscar/oscar.c:5864
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:5904
+#: src/protocols/oscar/oscar.c:5870
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:5910
+#: src/protocols/oscar/oscar.c:5876
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:5882
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5925
+#: src/protocols/oscar/oscar.c:5891
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5899
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -3051,10 +3172,18 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6053 src/protocols/oscar/oscar.c:6055
+#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6021
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
+#: src/protocols/oscar/oscar.c:6039
+msgid "Auth Host:"
+msgstr "认证主机:"
+
+#: src/protocols/oscar/oscar.c:6045
+msgid "Auth Port:"
+msgstr "认证端口:"
+
 #: src/protocols/toc/toc.c:190
 #, c-format
 msgid "Looking up %s"
@@ -3482,46 +3611,46 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:365 src/prefs.c:1790
+#: src/blist.c:365 src/prefs.c:1812
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:673
+#: src/blist.c:677
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies, and the group were not removed.\n"
 msgstr ""
-"%2$s 组中的 %1:d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
+"%2$s 组中的 %1$d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:677
+#: src/blist.c:681
 msgid "Group Not Removed"
 msgstr "组未删除"
 
-#: src/blist.c:844
+#: src/blist.c:848
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:1566
+#: src/blist.c:1570
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:1568
+#: src/blist.c:1572
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1574
+#: src/blist.c:1578
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 正在将您旧的好友列表转换为新格式,并存放在 %s"
 
-#: src/blist.c:1577
+#: src/blist.c:1581
 msgid "Converting Buddy List"
 msgstr "正在转换好友列表"
 
@@ -3708,7 +3837,7 @@
 msgid "Please enter the name of the group to be added.\n"
 msgstr "请输入要添加的组名称。\n"
 
-#: src/dialogs.c:1020 src/dialogs.c:4328
+#: src/dialogs.c:1020 src/dialogs.c:4327
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -3839,7 +3968,7 @@
 msgstr "州/省"
 
 #: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
-#: src/dialogs.c:4999
+#: src/dialogs.c:4998
 msgid "Save"
 msgstr "保存"
 
@@ -3870,7 +3999,7 @@
 
 #. Build OK Button
 #: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
-#: src/dialogs.c:3945 src/dialogs.c:4425 src/prpl.c:245
+#: src/dialogs.c:3945 src/dialogs.c:4424 src/prpl.c:245
 msgid "OK"
 msgstr "确定"
 
@@ -4039,26 +4168,26 @@
 msgstr "日期"
 
 #: src/dialogs.c:4221
-msgid "Conversation"
-msgstr "对话"
+msgid "Log"
+msgstr "日志"
 
 #: src/dialogs.c:4243
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4302
+#: src/dialogs.c:4301
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:4319
+#: src/dialogs.c:4318
 msgid "Please enter a new name for the selected group.\n"
 msgstr "请输入选中组的新名字。\n"
 
-#: src/dialogs.c:4395 src/dialogs.c:4404
+#: src/dialogs.c:4394 src/dialogs.c:4403
 msgid "Rename Buddy"
 msgstr "重命名好友"
 
-#: src/dialogs.c:4411
+#: src/dialogs.c:4410
 msgid "New name:"
 msgstr "新名字:"
 
@@ -4168,169 +4297,169 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1448
+#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1546
+#: src/gaimrc.c:1549
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1606
 msgid "Unable to Save Preferences"
 msgstr "无法保存首选项"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1606
 msgid ""
 "Gaim was unable to save your preferences.  Please verify that you have "
 "enough free space."
 msgstr "Gaim 无法保存您的首选项。请检查您是否有足够的剩余空间。"
 
-#: src/gtkblist.c:382
-msgid "_Add a Buddy"
-msgstr "添加好友(_A)"
-
-#: src/gtkblist.c:383
+#: src/gtkblist.c:392
+msgid "Add a _Buddy"
+msgstr "添加好友(_B)"
+
+#: src/gtkblist.c:393
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:384
+#: src/gtkblist.c:394
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:385
+#: src/gtkblist.c:395
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:387
+#: src/gtkblist.c:397
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:388 src/gtkblist.c:419
+#: src/gtkblist.c:398 src/gtkblist.c:429
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkblist.c:389 src/gtkblist.c:420
+#: src/gtkblist.c:399 src/gtkblist.c:430
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:398
+#: src/gtkblist.c:408
 msgid "_Get Info"
 msgstr "获取信息(_G)"
 
-#: src/gtkblist.c:400
+#: src/gtkblist.c:410
 msgid "_IM"
 msgstr "开聊(_I)"
 
-#: src/gtkblist.c:401
+#: src/gtkblist.c:411
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:402
+#: src/gtkblist.c:412
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:733
+#: src/gtkblist.c:743
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:734
+#: src/gtkblist.c:744
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/新即时消息(_I)..."
 
-#: src/gtkblist.c:735
+#: src/gtkblist.c:745
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:736
+#: src/gtkblist.c:746
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/获取用户信息(_U)..."
 
-#: src/gtkblist.c:738
-msgid "/Buddies/_Show Offline Buddies"
-msgstr "/好友(B)/显示离线好友(_S)"
-
-#: src/gtkblist.c:739
+#: src/gtkblist.c:748
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/好友(B)/显示离线好友(_O)"
+
+#: src/gtkblist.c:749
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:740
+#: src/gtkblist.c:750
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:741
+#: src/gtkblist.c:751
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:742
+#: src/gtkblist.c:752
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:744
+#: src/gtkblist.c:754
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:755
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:748
+#: src/gtkblist.c:758
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:759
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:760
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:761
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:753
+#: src/gtkblist.c:763
 msgid "/Tools/A_ccounts..."
 msgstr "/工具(T)/账户(_C)..."
 
-#: src/gtkblist.c:754
+#: src/gtkblist.c:764
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件传送(_F)..."
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:765
 msgid "/Tools/Preferences..."
 msgstr "/工具(T)/首选项..."
 
-#: src/gtkblist.c:756
+#: src/gtkblist.c:766
 msgid "/Tools/Pr_ivacy..."
 msgstr "/工具(T)/隐私(_I)..."
 
-#: src/gtkblist.c:758
+#: src/gtkblist.c:768
 msgid "/Tools/View System _Log..."
 msgstr "/工具(T)/查看系统日志(_L)..."
 
 #. Help
-#: src/gtkblist.c:761
+#: src/gtkblist.c:771
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:772
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:773
 msgid "/Help/_Debug Window..."
 msgstr "/帮助(H)/调试窗口(_D)..."
 
-#: src/gtkblist.c:764
+#: src/gtkblist.c:774
 msgid "/Help/_About..."
 msgstr "/帮助(H)/关于(_A)..."
 
-#: src/gtkblist.c:798
+#: src/gtkblist.c:808
 #, c-format
 msgid ""
 "\n"
@@ -4339,12 +4468,12 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:857
+#: src/gtkblist.c:867
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:871
+#: src/gtkblist.c:881
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4352,7 +4481,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:872
+#: src/gtkblist.c:882
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4360,7 +4489,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:873
+#: src/gtkblist.c:883
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4368,7 +4497,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:874
+#: src/gtkblist.c:884
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4376,7 +4505,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:875
+#: src/gtkblist.c:885
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4384,7 +4513,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:877
+#: src/gtkblist.c:887
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4392,69 +4521,65 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:1169
+#: src/gtkblist.c:1179
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1171
+#: src/gtkblist.c:1181
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1175
+#: src/gtkblist.c:1185
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1332 src/prefs.c:1787
+#: src/gtkblist.c:1351 src/prefs.c:1809
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: src/gtkblist.c:1356
+#: src/gtkblist.c:1375
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:1359
+#: src/gtkblist.c:1378
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:1362
+#: src/gtkblist.c:1381
 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:1442
+#: src/gtkblist.c:1464
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/好友(B)/显示离线好友(S)"
-
-#: src/gtkblist.c:1444
+msgstr "/好友(B)/显示离线好友(O)"
+
+#: src/gtkblist.c:1466
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1462 src/gtkconv.c:765
+#: src/gtkblist.c:1484 src/gtkconv.c:765
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1490
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:1471
-msgid "Get Info"
-msgstr "信息"
-
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1499
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1507
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1515
 msgid "Set an away message"
 msgstr "设置离开消息"
 
@@ -4475,7 +4600,7 @@
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3781
+#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3782
 msgid "Remove"
 msgstr "删除"
 
@@ -4572,15 +4697,15 @@
 #. From right to left...
 #. Send button
 #: src/gtkconv.c:2625 src/gtkconv.c:2627 src/gtkconv.c:2725 src/gtkconv.c:2727
-#: src/gtkconv.c:5019
+#: src/gtkconv.c:5022
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2648 src/gtkconv.c:3793
+#: src/gtkconv.c:2648 src/gtkconv.c:3794
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2654 src/gtkconv.c:3784
+#: src/gtkconv.c:2654 src/gtkconv.c:3785
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
@@ -4607,7 +4732,7 @@
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:2737 src/gtkconv.c:5022
+#: src/gtkconv.c:2737 src/gtkconv.c:5025
 msgid "Invite"
 msgstr "邀请"
 
@@ -4684,25 +4809,25 @@
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4225 src/gtkconv.c:4347
+#: src/gtkconv.c:4228 src/gtkconv.c:4350
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:4707
+#: src/gtkconv.c:4710
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:4716
+#: src/gtkconv.c:4719
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:4723
+#: src/gtkconv.c:4726
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:4729
+#: src/gtkconv.c:4732
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
@@ -4878,7 +5003,7 @@
 #: src/gtkpounce.c:347
 #, c-format
 msgid "%s has signed off"
-msgstr "%d 已登出"
+msgstr "%s 已登出"
 
 #: src/gtkpounce.c:348
 #, c-format
@@ -4970,7 +5095,7 @@
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:621 src/prefs.c:1614
+#: src/gtkpounce.c:621 src/prefs.c:1636
 msgid "Test"
 msgstr "测试"
 
@@ -5126,11 +5251,11 @@
 msgid "Accounts"
 msgstr "账户"
 
-#: src/main.c:372 src/prefs.c:1854 src/win32/systray.c:294
+#: src/main.c:372 src/prefs.c:1876 src/win32/systray.c:355
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/main.c:378 src/win32/systray.c:146
+#: src/main.c:378 src/win32/systray.c:191
 msgid "Sign On"
 msgstr "登入"
 
@@ -5150,7 +5275,7 @@
 msgid "Buddy Icon File:"
 msgstr "好友图标文件:"
 
-#: src/multi.c:684 src/prefs.c:1618
+#: src/multi.c:684 src/prefs.c:1640
 msgid "Reset"
 msgstr "重置"
 
@@ -5219,23 +5344,23 @@
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/multi.c:1208
+#: src/multi.c:1209
 msgid "Modify Account"
 msgstr "修改账户"
 
-#: src/multi.c:1227
+#: src/multi.c:1228
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/multi.c:1227
+#: src/multi.c:1228
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
-#: src/multi.c:1338
+#: src/multi.c:1339
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: src/multi.c:1356
+#: src/multi.c:1357
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
@@ -5244,15 +5369,15 @@
 "请输入您作为 %s 的密码。\n"
 "\n"
 
-#: src/multi.c:1367
+#: src/multi.c:1368
 msgid "_Password"
 msgstr "密码(_P)"
 
-#: src/multi.c:1418
+#: src/multi.c:1419
 msgid "TOC not found."
 msgstr "TOC 未找到。"
 
-#: src/multi.c:1419
+#: src/multi.c:1420
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -5261,51 +5386,51 @@
 "您试图使用 TOC 协议登入即时通讯账户。由于此协议优先于 OSCAR,所以该协议现在默"
 "认被编译为插件。如果要登入的话,请编辑此账户使用 OSCAR 或者装入 TOC 插件。"
 
-#: src/multi.c:1425
+#: src/multi.c:1426
 msgid "Protocol not found."
 msgstr "协议未找到。"
 
-#: src/multi.c:1426
+#: src/multi.c:1427
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
 "您无法登入此账户;您没有装入该账户所使用的协议,或者该协议未提供登录功能。"
 
-#: src/multi.c:1505
+#: src/multi.c:1506
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/multi.c:1506
+#: src/multi.c:1507
 msgid "Delete"
 msgstr "删除"
 
-#: src/multi.c:1535
+#: src/multi.c:1536
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: src/multi.c:1574
+#: src/multi.c:1575
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/multi.c:1624
+#: src/multi.c:1625
 msgid "Done."
 msgstr "完成。"
 
-#: src/multi.c:1860
+#: src/multi.c:1861
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/multi.c:1919
+#: src/multi.c:1920
 msgid "Signon"
 msgstr "登入"
 
-#: src/multi.c:1931
+#: src/multi.c:1932
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/multi.c:1986
+#: src/multi.c:1987
 #, c-format
 msgid ""
 "%s\n"
@@ -5314,25 +5439,25 @@
 "%s\n"
 "%s:%s"
 
-#: src/multi.c:2008
+#: src/multi.c:2009
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 无法登入"
 
-#: src/multi.c:2009
+#: src/multi.c:2010
 msgid "Signon Error"
 msgstr "登入出错"
 
-#: src/multi.c:2020
+#: src/multi.c:2021
 msgid "Notice"
 msgstr "注意"
 
-#: src/multi.c:2032
+#: src/multi.c:2033
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已经登出"
 
-#: src/multi.c:2033
+#: src/multi.c:2034
 msgid "Connection Error"
 msgstr "连接错误"
 
@@ -5398,7 +5523,7 @@
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/prefs.c:534 src/prefs.c:676 src/prefs.c:717
+#: src/prefs.c:534 src/prefs.c:695 src/prefs.c:736
 msgid "Display"
 msgstr "显示"
 
@@ -5462,347 +5587,355 @@
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl+数字键插入笑脸(_S)"
 
-#: src/prefs.c:579
+#: src/prefs.c:584
+msgid "Buddy List Sorting"
+msgstr "好友列表排序"
+
+#: src/prefs.c:593
+msgid "Sorting:"
+msgstr "排序:"
+
+#: src/prefs.c:598
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/prefs.c:580 src/prefs.c:659 src/prefs.c:702
+#: src/prefs.c:599 src/prefs.c:678 src/prefs.c:721
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/prefs.c:581 src/prefs.c:660 src/prefs.c:703
+#: src/prefs.c:600 src/prefs.c:679 src/prefs.c:722
 msgid "Pictures"
 msgstr "图片"
 
-#: src/prefs.c:582 src/prefs.c:661 src/prefs.c:704
+#: src/prefs.c:601 src/prefs.c:680 src/prefs.c:723
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:583 src/prefs.c:662 src/prefs.c:705
+#: src/prefs.c:602 src/prefs.c:681 src/prefs.c:724
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/prefs.c:584 src/prefs.c:1090
+#: src/prefs.c:603 src/prefs.c:1109
 msgid "None"
 msgstr "无"
 
-#: src/prefs.c:587
+#: src/prefs.c:606
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:589
+#: src/prefs.c:608
 msgid "Group Display"
 msgstr "组显示"
 
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:591
+#: src/prefs.c:610
 msgid "Show _numbers in groups"
 msgstr "在组旁显示数字(_N)"
 
-#: src/prefs.c:593
+#: src/prefs.c:612
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/prefs.c:594
+#: src/prefs.c:613
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/prefs.c:595
+#: src/prefs.c:614
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/prefs.c:600
+#: src/prefs.c:619
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/prefs.c:605
+#: src/prefs.c:624
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/prefs.c:623 src/prefs.c:1788
+#: src/prefs.c:642 src/prefs.c:1810
 msgid "Conversations"
 msgstr "对话"
 
-#: src/prefs.c:631
+#: src/prefs.c:650
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/prefs.c:639
+#: src/prefs.c:658
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)。"
 
-#: src/prefs.c:658 src/prefs.c:701
+#: src/prefs.c:677 src/prefs.c:720
 msgid "Window"
 msgstr "窗口"
 
-#: src/prefs.c:665 src/prefs.c:708
+#: src/prefs.c:684 src/prefs.c:727
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/prefs.c:666 src/prefs.c:709
+#: src/prefs.c:685 src/prefs.c:728
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/prefs.c:667 src/prefs.c:710
+#: src/prefs.c:686 src/prefs.c:729
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/prefs.c:668 src/prefs.c:711
+#: src/prefs.c:687 src/prefs.c:730
 msgid "_Raise windows on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:669
+#: src/prefs.c:688
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/prefs.c:672
+#: src/prefs.c:691
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/prefs.c:673
+#: src/prefs.c:692
 msgid "Hide buddy _icons"
 msgstr "隐藏好友图标(_I)"
 
-#: src/prefs.c:674
+#: src/prefs.c:693
 msgid "Disable buddy icon a_nimation"
 msgstr "禁用好友图标动画(_N)"
 
-#: src/prefs.c:677
+#: src/prefs.c:696
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/prefs.c:678
+#: src/prefs.c:697
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/prefs.c:680
+#: src/prefs.c:699
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/prefs.c:681
+#: src/prefs.c:700
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/prefs.c:713
+#: src/prefs.c:732
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/prefs.c:714
+#: src/prefs.c:733
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/prefs.c:715
+#: src/prefs.c:734
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/prefs.c:718
+#: src/prefs.c:737
 msgid "_Show people joining/leaving in window"
 msgstr "在窗口中显示加入/离开的人(_S)"
 
-#: src/prefs.c:719
+#: src/prefs.c:738
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/prefs.c:736
+#: src/prefs.c:755
 msgid "IM Tabs"
 msgstr "即时消息标签"
 
-#: src/prefs.c:737 src/prefs.c:747
+#: src/prefs.c:756 src/prefs.c:766
 msgid "Tab _placement:"
 msgstr "标签位置(_P):"
 
-#: src/prefs.c:738 src/prefs.c:748
+#: src/prefs.c:757 src/prefs.c:767
 msgid "Top"
 msgstr "上"
 
-#: src/prefs.c:739 src/prefs.c:749
+#: src/prefs.c:758 src/prefs.c:768
 msgid "Bottom"
 msgstr "下"
 
-#: src/prefs.c:740 src/prefs.c:750
+#: src/prefs.c:759 src/prefs.c:769
 msgid "Left"
 msgstr "左"
 
-#: src/prefs.c:741 src/prefs.c:751
+#: src/prefs.c:760 src/prefs.c:770
 msgid "Right"
 msgstr "右"
 
-#: src/prefs.c:743
+#: src/prefs.c:762
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
 msgstr "在一个标签式窗口内显示所有即时消息(_I)"
 
-#: src/prefs.c:746
+#: src/prefs.c:765
 msgid "Chat Tabs"
 msgstr "聊天标签"
 
-#: src/prefs.c:753
+#: src/prefs.c:772
 msgid "Show all c_hats in one tabbed window"
 msgstr "在一个标签窗口内显示所有聊天(_H)"
 
-#: src/prefs.c:756
+#: src/prefs.c:775
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/prefs.c:757
+#: src/prefs.c:776
 msgid "Show _close button on tabs."
 msgstr "在标签上显示关闭按钮(_C)。"
 
-#: src/prefs.c:777
+#: src/prefs.c:796
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/prefs.c:778
+#: src/prefs.c:797
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/prefs.c:779
+#: src/prefs.c:798
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/prefs.c:784
+#: src/prefs.c:803
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/prefs.c:797
+#: src/prefs.c:816
 msgid "_Host"
 msgstr "主机(_H)"
 
-#: src/prefs.c:811
+#: src/prefs.c:830
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:827
+#: src/prefs.c:846
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/prefs.c:841
+#: src/prefs.c:860
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/prefs.c:862
+#: src/prefs.c:881
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "输入的手动浏览器“%s”无效。超级链接无法工作。"
 
-#: src/prefs.c:883
+#: src/prefs.c:902
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/prefs.c:884
+#: src/prefs.c:903
 msgid "Opera"
 msgstr "Opera"
 
-#: src/prefs.c:885
+#: src/prefs.c:904
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:886
+#: src/prefs.c:905
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:887
+#: src/prefs.c:906
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/prefs.c:895
+#: src/prefs.c:914
 msgid "Manual"
 msgstr "手动"
 
-#: src/prefs.c:919
+#: src/prefs.c:938
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/prefs.c:923
+#: src/prefs.c:942
 msgid "_Browser"
 msgstr "浏览器(_B)"
 
-#: src/prefs.c:931
+#: src/prefs.c:950
 msgid "_Manual: "
 msgstr "手动(_M):"
 
-#: src/prefs.c:946
+#: src/prefs.c:965
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/prefs.c:947
+#: src/prefs.c:966
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/prefs.c:961
+#: src/prefs.c:980
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/prefs.c:962
+#: src/prefs.c:981
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/prefs.c:963
+#: src/prefs.c:982
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/prefs.c:964
+#: src/prefs.c:983
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/prefs.c:966
+#: src/prefs.c:985
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/prefs.c:967
+#: src/prefs.c:986
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/prefs.c:969
+#: src/prefs.c:988
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡(_I)"
 
-#: src/prefs.c:971
+#: src/prefs.c:990
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/prefs.c:972
+#: src/prefs.c:991
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/prefs.c:974
+#: src/prefs.c:993
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1026
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/prefs.c:1008
+#: src/prefs.c:1027
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/prefs.c:1009
+#: src/prefs.c:1028
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/prefs.c:1012
+#: src/prefs.c:1031
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/prefs.c:1013
+#: src/prefs.c:1032
 msgid "_Method"
 msgstr "方式(_M)"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1035
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1037
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs.c:1025
+#: src/prefs.c:1044
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1053
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5811,67 +5944,67 @@
 "声音命令(_O)\n"
 "(%s 代表文件名)"
 
-#: src/prefs.c:1073
+#: src/prefs.c:1092
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1093
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1095
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1098
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1100
 msgid "_Don't send auto-response"
 msgstr "不发送自动回复(_D)"
 
-#: src/prefs.c:1082
+#: src/prefs.c:1101
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/prefs.c:1083
+#: src/prefs.c:1102
 msgid "Do_n't send auto-response in active conversations"
 msgstr "不在当前对话中发送自动回复(_N)"
 
-#: src/prefs.c:1089
+#: src/prefs.c:1108
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/prefs.c:1091
+#: src/prefs.c:1110
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/prefs.c:1094
+#: src/prefs.c:1113
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/prefs.c:1096
+#: src/prefs.c:1115
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/prefs.c:1103
+#: src/prefs.c:1122
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/prefs.c:1104
+#: src/prefs.c:1123
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1124
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1130
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/prefs.c:1166
+#: src/prefs.c:1187
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5886,7 +6019,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1192
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5901,96 +6034,96 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/prefs.c:1345
+#: src/prefs.c:1367
 msgid "Load"
 msgstr "装入"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1374
 msgid "Name"
 msgstr "名称"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1421
 msgid "Details"
 msgstr "细节"
 
-#: src/prefs.c:1498
+#: src/prefs.c:1520
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/prefs.c:1591
+#: src/prefs.c:1613
 msgid "Play"
 msgstr "播放"
 
-#: src/prefs.c:1598
+#: src/prefs.c:1620
 msgid "Event"
 msgstr "事件"
 
-#: src/prefs.c:1622
+#: src/prefs.c:1644
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/prefs.c:1746
+#: src/prefs.c:1768
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/prefs.c:1782
+#: src/prefs.c:1804
 msgid "Interface"
 msgstr "界面"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1805
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/prefs.c:1784
+#: src/prefs.c:1806
 msgid "Fonts"
 msgstr "字体"
 
-#: src/prefs.c:1785
+#: src/prefs.c:1807
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/prefs.c:1786
+#: src/prefs.c:1808
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/prefs.c:1789
+#: src/prefs.c:1811
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1813
 msgid "Tabs"
 msgstr "标签"
 
-#: src/prefs.c:1792
+#: src/prefs.c:1814
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1795
+#: src/prefs.c:1817
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/prefs.c:1797
+#: src/prefs.c:1819
 msgid "Logging"
 msgstr "日志"
 
-#: src/prefs.c:1798
+#: src/prefs.c:1820
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:1799
+#: src/prefs.c:1821
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/prefs.c:1800
+#: src/prefs.c:1822
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/prefs.c:1801
+#: src/prefs.c:1823
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/prefs.c:1804
+#: src/prefs.c:1826
 msgid "Plugins"
 msgstr "插件"
 
@@ -6125,6 +6258,10 @@
 msgid "Buddy Chat Invite"
 msgstr "好友聊天邀请"
 
+#: src/server.c:1406
+msgid "Gaim - Popup"
+msgstr "Gaim - 弹出窗口"
+
 #: src/server.c:1433
 msgid "More Info"
 msgstr "更多信息"
@@ -6203,7 +6340,7 @@
 msgstr[0] "分"
 
 #. full help text
-#: src/util.c:717
+#: src/util.c:710
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6235,55 +6372,55 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/util.c:732
+#: src/util.c:725
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/util.c:1020
+#: src/util.c:1013
 msgid "Not connected to AIM"
 msgstr "未连接到 AIM"
 
-#: src/util.c:1029 src/util.c:1068
+#: src/util.c:1022 src/util.c:1061
 msgid "No screenname given."
 msgstr "没有给出用户名。"
 
-#: src/util.c:1105
+#: src/util.c:1098
 msgid "No roomname given."
 msgstr "没有给出聊天室名。"
 
-#: src/util.c:1124
+#: src/util.c:1117
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
-#. 
+#.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:20
+#: src/win32/systray.c:36
 msgid "Gaim Instant Messenger"
 msgstr "Gaim 即时通讯程序"
 
-#: src/win32/systray.c:21
+#: src/win32/systray.c:37
 msgid "Gaim Instant Messenger - Signed off"
 msgstr "Gaim 即时通讯程序 - 已登出"
 
-#: src/win32/systray.c:22
+#: src/win32/systray.c:38
 msgid "Gaim Instant Messenger - Away"
 msgstr "Gaim 即时通讯程序 - 离开"
 
-#: src/win32/systray.c:104
+#: src/win32/systray.c:134
 msgid "New"
 msgstr "新建"
 
-#: src/win32/systray.c:128
+#: src/win32/systray.c:167
 msgid "Set Away Message"
 msgstr "设置离开消息"
 
-#: src/win32/systray.c:135
+#: src/win32/systray.c:176
 msgid "I'm Back"
 msgstr "我回来了"
 
-#: src/win32/systray.c:300
+#: src/win32/systray.c:365
 msgid "Exit"
 msgstr "退出"
 
@@ -6297,10 +6434,18 @@
 msgstr "Gaim 无法装入您的插件。"
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:172
 msgid "Custom"
 msgstr "自定义"
 
-#: src/gtkdebug.c:71
+#: src/gtkdebug.c:94
 msgid "Debug Window"
 msgstr "调试窗口"
+
+#: src/gtkdebug.c:130
+msgid "Pause"
+msgstr "暂停"
+
+#: src/gtkdebug.c:136
+msgid "Timestamps"
+msgstr "时间戳"