diff po/zh_CN.po @ 3145:8d2881f554cc

[gaim-migrate @ 3160] popopopo committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 12 Apr 2002 02:57:20 +0000
parents 2e324d44dd65
children c47ae88151ac
line wrap: on
line diff
--- a/po/zh_CN.po	Fri Apr 12 02:54:48 2002 +0000
+++ b/po/zh_CN.po	Fri Apr 12 02:57:20 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-03-14 22:24-0800\n"
+"POT-Creation-Date: 2002-04-11 22:46-0700\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <hashao@china.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -37,12 +37,12 @@
 
 #: src/protocols/gg/gg.c:194
 #, fuzzy
-msgid "Error while writting to socket."
+msgid "Error while writing to socket."
 msgstr "写入文件 %s 发生错误"
 
 #: src/protocols/gg/gg.c:197
 #, fuzzy
-msgid "Authentification failed."
+msgid "Authentication failed."
 msgstr "身份验证失败"
 
 #: src/protocols/gg/gg.c:200
@@ -123,7 +123,7 @@
 msgstr "连接已关闭"
 
 #: src/protocols/gg/gg.c:594
-msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
+msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
 #: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
@@ -187,7 +187,7 @@
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:1577 src/dialogs.c:2281 src/protocols/gg/gg.c:729
+#: src/dialogs.c:1582 src/dialogs.c:2290 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "市"
 
@@ -200,7 +200,7 @@
 msgstr ""
 
 #: src/protocols/gg/gg.c:815
-msgid "Buddies List sucessfully transfered into Server"
+msgid "Buddy List successfully transferred to server"
 msgstr ""
 
 #: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
@@ -209,20 +209,22 @@
 msgstr ""
 
 #: src/protocols/gg/gg.c:821
-msgid "Couldn't transfer Buddies List into Server"
-msgstr ""
+#, fuzzy
+msgid "Couldn't transfer Buddy List to server"
+msgstr "导出朋友列表"
 
 #: src/protocols/gg/gg.c:827
-msgid "Buddies List sucessfully deleted from Server"
+msgid "Buddy List sucessfully deleted from server"
 msgstr ""
 
 #: src/protocols/gg/gg.c:833
-msgid "Couldn't delete Buddies List from Server"
-msgstr ""
+#, fuzzy
+msgid "Couldn't delete Buddy List from server"
+msgstr "导入朋友列表"
 
 #: src/protocols/gg/gg.c:839
 #, fuzzy
-msgid "Password changed sucessfully"
+msgid "Password changed successfully"
 msgstr "Gaim - 更改密码"
 
 #: src/protocols/gg/gg.c:845
@@ -264,7 +266,7 @@
 msgid "Directory Search"
 msgstr "姓名地址录"
 
-#: src/dialogs.c:1694 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/dialogs.c:1699 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -287,383 +289,405 @@
 msgid "Send message through server"
 msgstr "发送信息"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1836
-#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:3293
-#: src/protocols/toc/toc.c:1201
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
+#: src/protocols/jabber/jabber.c:2112 src/protocols/oscar/oscar.c:3436
+#: src/protocols/toc/toc.c:1216
 msgid "Get Info"
 msgstr "用户详细资料"
 
-#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:1768
+#: src/protocols/irc/irc.c:444 src/protocols/irc/irc.c:1783
 #, fuzzy, c-format
 msgid "DCC Chat with %s closed"
 msgstr "<HR><B>和 %s 之间的直接连接已经关闭。</B><BR><HR>"
 
-#: src/protocols/irc/irc.c:557 src/protocols/irc/irc.c:1129
+#: src/protocols/irc/irc.c:572 src/protocols/irc/irc.c:1144
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr ""
 
-#: src/protocols/irc/irc.c:810
+#: src/protocols/irc/irc.c:825
 msgid "No such nick/channel"
 msgstr ""
 
-#: src/protocols/irc/irc.c:810 src/protocols/irc/irc.c:813
-#: src/protocols/irc/irc.c:815 src/protocols/irc/irc.c:1058
+#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
 #, fuzzy
 msgid "IRC Error"
 msgstr "聊天错误"
 
-#: src/protocols/irc/irc.c:813
+#: src/protocols/irc/irc.c:828
 msgid "No such server"
 msgstr ""
 
-#: src/protocols/irc/irc.c:815
+#: src/protocols/irc/irc.c:830
 msgid "No nickname given"
 msgstr ""
 
-#: src/protocols/irc/irc.c:961
+#: src/protocols/irc/irc.c:976
 #, c-format
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
 msgstr ""
 
-#: src/protocols/irc/irc.c:986
+#: src/protocols/irc/irc.c:1001
 #, fuzzy
 msgid "Unable to write"
 msgstr "不能写入文件 %s。"
 
-#: src/protocols/irc/irc.c:1056
+#: src/protocols/irc/irc.c:1071
 #, fuzzy, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "你被从聊天室 (%s) 里赶出来了!"
 
-#: src/protocols/irc/irc.c:1061
+#: src/protocols/irc/irc.c:1076
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1566
+#: src/protocols/irc/irc.c:1581
 #, c-format
 msgid "You have left %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1567
+#: src/protocols/irc/irc.c:1582
 msgid "IRC Part"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1656
+#: src/protocols/irc/irc.c:1671
 #, fuzzy
 msgid "Channel:"
 msgstr "取消"
 
-#: src/multi.c:522 src/protocols/irc/irc.c:1660
+#: src/multi.c:547 src/protocols/irc/irc.c:1675
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:1841
+#: src/protocols/irc/irc.c:1856
 #, fuzzy
 msgid "DCC Chat"
 msgstr "聊天"
 
-#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2375 src/buddy.c:2511
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:699
+msgid "Unavailable"
+msgstr ""
+
+#: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
+#: src/protocols/jabber/jabber.c:703
 msgid "Away"
 msgstr "暂时离开"
 
-#: src/buddy.c:2670 src/protocols/jabber/jabber.c:695
-#: src/protocols/jabber/jabber.c:1971 src/protocols/jabber/jabber.c:2310
+#: src/buddy.c:2801 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:723
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:697
+#: src/protocols/jabber/jabber.c:707
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:699
+#: src/protocols/jabber/jabber.c:709
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/dialogs.c:844 src/protocols/jabber/jabber.c:1088
+#: src/protocols/jabber/jabber.c:1042
+msgid "No such user"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1044
+#, fuzzy
+msgid "Jabber Error"
+msgstr "消息内容"
+
+#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
 msgid "Buddies"
 msgstr "哥们儿们"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1188
 #, fuzzy
 msgid "Authenticating"
 msgstr "身份验证失败"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1225
 #, fuzzy
 msgid "Unknown login error"
 msgstr "登录错误"
 
-#: src/protocols/jabber/jabber.c:1408 src/protocols/jabber/jabber.c:1438
-#: src/protocols/jabber/jabber.c:2811 src/protocols/jabber/jabber.c:2855
+#: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
+#, fuzzy
+msgid "Connection lost"
+msgstr "连接已关闭"
+
+#: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
+#: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
 #, fuzzy
 msgid "Unable to connect"
 msgstr "不能建立直接连接"
 
-#: src/protocols/jabber/jabber.c:1412
+#: src/protocols/jabber/jabber.c:1463
 #, fuzzy
 msgid "Connected"
 msgstr "已断开。"
 
-#: src/protocols/jabber/jabber.c:1415
+#: src/protocols/jabber/jabber.c:1466
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "身份验证失败"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:1433
+#: src/protocols/jabber/jabber.c:1484
 #, fuzzy
 msgid "Connecting"
 msgstr "连接已关闭"
 
-#: src/protocols/jabber/jabber.c:1692
+#: src/protocols/jabber/jabber.c:1783
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1696
+#: src/protocols/jabber/jabber.c:1787
 #, fuzzy
 msgid "Server:"
 msgstr "代理服务器设置"
 
-#: src/protocols/jabber/jabber.c:1701
+#: src/protocols/jabber/jabber.c:1792
 #, fuzzy
 msgid "Handle:"
 msgstr "空闲时间:"
 
-#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
-#: src/protocols/oscar/oscar.c:3300
+#: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
+msgid "Unknown"
+msgstr ""
+
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
+#: src/protocols/oscar/oscar.c:3443
 msgid "Get Away Msg"
 msgstr "收到暂时离开信息"
 
-#: src/protocols/jabber/jabber.c:2208
+#: src/protocols/jabber/jabber.c:2299
 #, fuzzy
 msgid "Full Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:2209
+#: src/protocols/jabber/jabber.c:2300
 #, fuzzy
 msgid "Family Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:2210
+#: src/protocols/jabber/jabber.c:2301
 #, fuzzy
 msgid "Given Name"
 msgstr "娘家姓"
 
-#: src/protocols/jabber/jabber.c:2211
+#: src/protocols/jabber/jabber.c:2302
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2474 src/protocols/jabber/jabber.c:2212
+#: src/dialogs.c:2483 src/protocols/jabber/jabber.c:2303
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:2213
+#: src/protocols/jabber/jabber.c:2304
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2214
+#: src/protocols/jabber/jabber.c:2305
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2215
+#: src/protocols/jabber/jabber.c:2306
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2216
+#: src/protocols/jabber/jabber.c:2307
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2217
+#: src/protocols/jabber/jabber.c:2308
 msgid "Postal Code"
 msgstr ""
 
 #. Line 7
-#: src/dialogs.c:1599 src/dialogs.c:2303 src/protocols/jabber/jabber.c:2218
+#: src/dialogs.c:1604 src/dialogs.c:2312 src/protocols/jabber/jabber.c:2309
 msgid "Country"
 msgstr "国"
 
-#: src/protocols/jabber/jabber.c:2219
+#: src/protocols/jabber/jabber.c:2310
 #, fuzzy
 msgid "Telephone"
 msgstr "全部不选"
 
-#: src/dialogs.c:2379 src/protocols/jabber/jabber.c:2220
+#: src/dialogs.c:2388 src/protocols/jabber/jabber.c:2311
 msgid "Email"
 msgstr "电邮"
 
-#: src/protocols/jabber/jabber.c:2221
+#: src/protocols/jabber/jabber.c:2312
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2222
+#: src/protocols/jabber/jabber.c:2313
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:1998 src/protocols/jabber/jabber.c:2223
+#: src/prefs.c:1988 src/protocols/jabber/jabber.c:2314
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:2224
+#: src/protocols/jabber/jabber.c:2315
 #, fuzzy
 msgid "Role"
 msgstr "删除"
 
-#: src/protocols/jabber/jabber.c:2225
+#: src/protocols/jabber/jabber.c:2316
 msgid "Birthday"
 msgstr ""
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2482 src/plugins.c:211 src/protocols/jabber/jabber.c:2226
+#: src/dialogs.c:2491 src/plugins.c:211 src/protocols/jabber/jabber.c:2317
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:2251
+#: src/protocols/jabber/jabber.c:2342
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2252
+#: src/protocols/jabber/jabber.c:2343
 #, fuzzy
 msgid "User Identity"
 msgstr "用户详细资料"
 
-#: src/protocols/jabber/jabber.c:2668
+#: src/protocols/jabber/jabber.c:2759
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2742
+#: src/protocols/jabber/jabber.c:2833
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "新用户注册"
 
-#: src/protocols/jabber/jabber.c:2769
+#: src/protocols/jabber/jabber.c:2860
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2873 src/protocols/jabber/jabber.c:2888
+#: src/protocols/jabber/jabber.c:2969 src/protocols/jabber/jabber.c:2984
 #, fuzzy
 msgid "Set User Info"
 msgstr "用户详细资料"
 
-#: src/protocols/msn/msn.c:717 src/protocols/msn/msn.c:2021
-#: src/protocols/msn/msn.c:2054
+#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2074
 #, fuzzy
 msgid "MSN Error"
 msgstr "错误"
 
-#: src/protocols/msn/msn.c:717
+#: src/protocols/msn/msn.c:719
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr ""
 "%s\n"
 "%s 无法登录: %s"
 
-#: src/protocols/msn/msn.c:1049
+#: src/protocols/msn/msn.c:1069
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "你被从聊天室 (%s) 里赶出来了!"
 
-#: src/protocols/msn/msn.c:2021 src/protocols/msn/msn.c:2054
+#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
 #, fuzzy
 msgid "Invalid name"
 msgstr "娘家姓"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2937
-#: src/protocols/toc/toc.c:1088
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
+#: src/protocols/toc/toc.c:1101
 msgid "Join what group:"
 msgstr "要加入的组:"
 
-#: src/protocols/oscar/oscar.c:322
+#: src/protocols/oscar/oscar.c:333
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "<HR><B>和 %s 之间的直接连接已经关闭。</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:324
+#: src/protocols/oscar/oscar.c:335
 #, fuzzy, c-format
 msgid "Direct IM with %s failed"
 msgstr "<HR><B>和 %s 之间的直接连接已经关闭。</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:362
+#: src/protocols/oscar/oscar.c:373
 msgid "connection error (rend)\n"
 msgstr "连接错误!\n"
 
-#: src/protocols/oscar/oscar.c:373
+#: src/protocols/oscar/oscar.c:384
 msgid "major connection error\n"
 msgstr "重大连接错误!\n"
 
-#: src/protocols/oscar/oscar.c:374 src/protocols/toc/toc.c:509
-#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
+#: src/protocols/oscar/oscar.c:385 src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:524 src/protocols/toc/toc.c:590
 msgid "Disconnected."
 msgstr "已断开。"
 
-#: src/protocols/oscar/oscar.c:386 src/protocols/toc/toc.c:756
+#: src/protocols/oscar/oscar.c:397 src/protocols/toc/toc.c:761
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "你被从聊天室 (%s) 里赶出来了!"
 
-#: src/protocols/oscar/oscar.c:387
+#: src/protocols/oscar/oscar.c:398
 msgid "Chat Error!"
 msgstr "聊天错误!"
 
-#: src/protocols/oscar/oscar.c:399
+#: src/protocols/oscar/oscar.c:410
 msgid "Chat is currently unavailable"
 msgstr "现在没有聊天。"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:411
 msgid "Gaim - Chat"
 msgstr "Gaim 聊天"
 
-#: src/protocols/oscar/oscar.c:459 src/protocols/oscar/oscar.c:519
+#: src/protocols/oscar/oscar.c:470 src/protocols/oscar/oscar.c:530
 msgid "Couldn't connect to host"
 msgstr "不能连接到主机"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:478
 msgid "Password sent, waiting for response\n"
 msgstr "密码已送出,等候回应\n"
 
-#: src/protocols/oscar/oscar.c:500
+#: src/protocols/oscar/oscar.c:511
 msgid "internal connection error\n"
 msgstr "内部连接错误\n"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:512
 msgid "Unable to login to AIM"
 msgstr "不能登录到 AIM"
 
-#: src/protocols/oscar/oscar.c:506
+#: src/protocols/oscar/oscar.c:517
 #, c-format
 msgid "Signon: %s"
 msgstr "登录: %s"
 
-#: src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:589
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
-#: src/protocols/oscar/oscar.c:597 src/protocols/oscar/oscar.c:721
+#: src/protocols/oscar/oscar.c:608 src/protocols/oscar/oscar.c:732
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:616
 msgid "Connection established, cookie sent"
 msgstr "连接成功,送出饼干。。啊!饼干?!"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:631 src/protocols/toc/toc.c:457
+#: src/protocols/oscar/oscar.c:642 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "昵名或者密码错误。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:636
+#: src/protocols/oscar/oscar.c:647
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:640
+#: src/protocols/oscar/oscar.c:651
 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."
@@ -671,190 +695,216 @@
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:656
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "你所使用的软件版本太旧了。让你妈妈给你买个新的吧!"
 
-#: src/protocols/oscar/oscar.c:649 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:660 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "身份验证失败"
 
-#: src/protocols/oscar/oscar.c:671
+#: src/protocols/oscar/oscar.c:682
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1237 src/protocols/oscar/oscar.c:3146
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3286
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>已建立和 %s 的直接连接。</B><BR><HR>"
 
-#: src/protocols/oscar/oscar.c:1489
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+#, c-format
+msgid ""
+"The user %d has denied your request to add them to your contact list for the "
+"following reason:\n"
+"\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
+msgid "No reason given."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
+msgid "Gaim - ICQ Authorization Denied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
+#, c-format
+msgid "The user %d has granted your request to add them to your contact list."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
+msgid "Gaim - ICQ Authorization Granted"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1577
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1578
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1499
+#: src/protocols/oscar/oscar.c:1587
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1500
+#: src/protocols/oscar/oscar.c:1588
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1597
 #, fuzzy, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1510
+#: src/protocols/oscar/oscar.c:1598
 #, fuzzy, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1519
+#: src/protocols/oscar/oscar.c:1607
 #, fuzzy, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1520
+#: src/protocols/oscar/oscar.c:1608
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1617
 #, fuzzy, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1530
+#: src/protocols/oscar/oscar.c:1618
 #, fuzzy, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/oscar/oscar.c:1538
+#: src/protocols/oscar/oscar.c:1626
 #, fuzzy, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "你莫名其妙地丢失了一条 %s 发来的消息"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1627
 #, fuzzy, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "你莫名其妙地丢失了一条 %s 发来的消息"
 
-#: src/dialogs.c:3025 src/dialogs.c:3031 src/protocols/oscar/oscar.c:1544
-#: src/protocols/oscar/oscar.c:1582 src/protocols/oscar/oscar.c:1600
-#: src/protocols/oscar/oscar.c:2045 src/protocols/yahoo/yahoo.c:585
+#: src/dialogs.c:3034 src/dialogs.c:3040 src/protocols/oscar/oscar.c:1632
+#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:1688
+#: src/protocols/oscar/oscar.c:2141 src/protocols/yahoo/yahoo.c:585
 msgid "Gaim - Error"
 msgstr "Gaim - 错误"
 
-#: src/protocols/oscar/oscar.c:1561
+#: src/protocols/oscar/oscar.c:1649
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1563
+#: src/protocols/oscar/oscar.c:1651
 #, fuzzy
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - 错误"
 
-#: src/protocols/oscar/oscar.c:1580
+#: src/protocols/oscar/oscar.c:1668
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "你给 %s 的消息没有被发送"
 
-#: src/protocols/oscar/oscar.c:1581 src/protocols/oscar/oscar.c:1599
+#: src/protocols/oscar/oscar.c:1669 src/protocols/oscar/oscar.c:1687
 msgid "Reason unknown"
 msgstr "原因不明"
 
-#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:1686
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "无法查到用户 %s 的信息"
 
-#: src/buddy.c:1935 src/protocols/oscar/oscar.c:1626
+#: src/buddy.c:2060 src/protocols/oscar/oscar.c:1717
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "朋友图标"
 
-#: src/buddy.c:1938 src/protocols/oscar/oscar.c:1629
+#: src/buddy.c:2063 src/protocols/oscar/oscar.c:1720
 msgid "Voice"
 msgstr "声音"
 
-#: src/buddy.c:1941 src/protocols/oscar/oscar.c:1632
+#: src/buddy.c:2066 src/protocols/oscar/oscar.c:1723
 msgid "IM Image"
 msgstr "IM 图案"
 
-#: src/buddy.c:488 src/buddy.c:1944 src/buddy.c:2374 src/prefs.c:2922
-#: src/protocols/oscar/oscar.c:1635
+#: src/buddy.c:494 src/buddy.c:2069 src/buddy.c:2507 src/prefs.c:2912
+#: src/protocols/oscar/oscar.c:1726
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:1947 src/protocols/oscar/oscar.c:1638
+#: src/buddy.c:2072 src/protocols/oscar/oscar.c:1729
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/buddy.c:1950 src/protocols/oscar/oscar.c:1641
+#: src/buddy.c:2075 src/protocols/oscar/oscar.c:1732
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/buddy.c:1954 src/protocols/oscar/oscar.c:1645
+#: src/buddy.c:2079 src/protocols/oscar/oscar.c:1736
 msgid "Games"
 msgstr "游戏"
 
-#: src/buddy.c:1957 src/protocols/oscar/oscar.c:1648
+#: src/buddy.c:2082 src/protocols/oscar/oscar.c:1739
 msgid "Stocks"
 msgstr "股票"
 
-#: src/buddy.c:1960 src/protocols/oscar/oscar.c:1651
+#: src/buddy.c:2085 src/protocols/oscar/oscar.c:1742
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:1963 src/protocols/oscar/oscar.c:1654
+#: src/buddy.c:2088 src/protocols/oscar/oscar.c:1745
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:1966 src/protocols/oscar/oscar.c:1657
+#: src/buddy.c:2091 src/protocols/oscar/oscar.c:1748
 #, fuzzy
 msgid "AP User"
 msgstr "登录用户"
 
-#: src/buddy.c:1969 src/protocols/oscar/oscar.c:1660
+#: src/buddy.c:2094 src/protocols/oscar/oscar.c:1751
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:1972 src/protocols/oscar/oscar.c:1663
+#: src/buddy.c:2097 src/protocols/oscar/oscar.c:1754
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:1975 src/protocols/oscar/oscar.c:1666
+#: src/buddy.c:2100 src/protocols/oscar/oscar.c:1757
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:1978 src/protocols/oscar/oscar.c:1669
+#: src/buddy.c:2103 src/protocols/oscar/oscar.c:1760
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:1981 src/protocols/oscar/oscar.c:1672
+#: src/buddy.c:2106 src/protocols/oscar/oscar.c:1763
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1709
+#: src/protocols/oscar/oscar.c:1801
 #, fuzzy
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
 "SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
 "User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
 "SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
-"ActiveBuddy Interactive Agent<br>"
+"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
+"Device User<br>"
 msgstr ""
 "用户名: <B>%s</B>  %s <BR>\n"
 "%s 警告级别 : <B>%d %%</B><BR>\n"
@@ -867,7 +917,7 @@
 "用户 <br><IMG SRC=\"dt_icon.gif\"> : AIM 试用用户 <br><IMG "
 "SRC=\"admin_icon.gif\"> : 管理员"
 
-#: src/protocols/oscar/oscar.c:1733
+#: src/protocols/oscar/oscar.c:1829
 #, fuzzy
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -880,50 +930,50 @@
 "<BR>连线时刻: <B>%s</B><BR>空转时间(分钟): <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/protocols/oscar/oscar.c:1765
+#: src/protocols/oscar/oscar.c:1861
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户离开时没有留下口信</i>"
 
-#: src/protocols/oscar/oscar.c:1777
+#: src/protocols/oscar/oscar.c:1873
 #, fuzzy
 msgid "Client Capabilities: "
 msgstr "兼容性:%s\n"
 
-#: src/protocols/oscar/oscar.c:1785
+#: src/protocols/oscar/oscar.c:1881
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1904
 msgid "Your connection may be lost."
 msgstr "你的连接可能已经断开了"
 
-#: src/protocols/oscar/oscar.c:1809
+#: src/protocols/oscar/oscar.c:1905
 msgid "AOL error"
 msgstr "AOL 错误"
 
-#: src/protocols/oscar/oscar.c:2044
+#: src/protocols/oscar/oscar.c:2140
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3553 src/protocols/oscar/oscar.c:2355
-#: src/protocols/oscar/oscar.c:3264 src/protocols/toc/toc.c:1546
-#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
-#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
-#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
+#: src/dialogs.c:3563 src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:3407 src/protocols/toc/toc.c:1561
+#: src/protocols/toc/toc.c:1578 src/protocols/toc/toc.c:1638
+#: src/protocols/toc/toc.c:1680 src/protocols/toc/toc.c:1799
+#: src/protocols/toc/toc.c:1829 src/protocols/toc/toc.c:1885
 msgid "Error"
 msgstr "错误"
 
-#: src/protocols/oscar/oscar.c:2941 src/protocols/toc/toc.c:1092
+#: src/protocols/oscar/oscar.c:3079 src/protocols/toc/toc.c:1105
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:3264
+#: src/protocols/oscar/oscar.c:3407
 msgid "Unable to open Direct IM"
 msgstr "不能建立直接连接"
 
-#: src/protocols/oscar/oscar.c:3274
+#: src/protocols/oscar/oscar.c:3417
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -931,159 +981,160 @@
 "continue?"
 msgstr "你想跟 %s 套近乎。这样会露出你的狐狸尾巴,这有风险。你想继续吗?"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3450
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3315
+#: src/protocols/oscar/oscar.c:3458
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "兼容性:%s\n"
 
-#: src/protocols/toc/toc.c:396
+#: src/protocols/toc/toc.c:398
 #, c-format
 msgid "Unable to write file %s."
 msgstr "不能写入文件 %s。"
 
-#: src/protocols/toc/toc.c:399
+#: src/protocols/toc/toc.c:401
 #, c-format
 msgid "Unable to read file %s."
 msgstr "不能读入文件 %s。"
 
-#: src/protocols/toc/toc.c:402
+#: src/protocols/toc/toc.c:404
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "信息太长,后面 %s 字元被砍掉了。"
 
-#: src/protocols/toc/toc.c:405
+#: src/protocols/toc/toc.c:407
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 现在尚未登录。"
 
-#: src/protocols/toc/toc.c:408
+#: src/protocols/toc/toc.c:410
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许警告 %s 。"
 
-#: src/protocols/toc/toc.c:411
+#: src/protocols/toc/toc.c:413
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "取消了一个信息,你超出了服侍器的速度限制。"
 
-#: src/protocols/toc/toc.c:414
+#: src/protocols/toc/toc.c:416
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:417
+#: src/protocols/toc/toc.c:419
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "你发送给 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:420
+#: src/protocols/toc/toc.c:422
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/protocols/toc/toc.c:423
+#: src/protocols/toc/toc.c:425
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息发送的速度太快。"
 
-#: src/protocols/toc/toc.c:426
+#: src/protocols/toc/toc.c:428
 msgid "Failure."
 msgstr "失败了。"
 
-#: src/protocols/toc/toc.c:429
+#: src/protocols/toc/toc.c:431
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:432
+#: src/protocols/toc/toc.c:434
 msgid "Need more qualifiers."
 msgstr "需要更多的参数。"
 
-#: src/protocols/toc/toc.c:435
+#: src/protocols/toc/toc.c:437
 msgid "Dir service temporarily unavailable."
 msgstr "姓名地址录服务器暂时连不上。"
 
-#: src/protocols/toc/toc.c:438
+#: src/protocols/toc/toc.c:440
 msgid "Email lookup restricted."
 msgstr "电邮查找限制。"
 
-#: src/protocols/toc/toc.c:441
+#: src/protocols/toc/toc.c:443
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:444
+#: src/protocols/toc/toc.c:446
 msgid "No keywords."
 msgstr "没有关键字。"
 
-#: src/protocols/toc/toc.c:447
+#: src/protocols/toc/toc.c:449
 msgid "User has no directory information."
 msgstr "该用户没有姓名地址录"
 
-#: src/protocols/toc/toc.c:451
+#: src/protocols/toc/toc.c:453
 msgid "Country not supported."
 msgstr "不支持这个国家。"
 
-#: src/protocols/toc/toc.c:454
+#: src/protocols/toc/toc.c:456
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "不明错误: %s 。"
 
-#: src/protocols/toc/toc.c:460
+#: src/protocols/toc/toc.c:462
 msgid "The service is temporarily unavailable."
 msgstr "暂时没有该服务。"
 
-#: src/protocols/toc/toc.c:463
+#: src/protocols/toc/toc.c:465
 msgid "Your warning level is currently too high to log in."
 msgstr "你目前的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:466
+#: src/protocols/toc/toc.c:468
 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."
 msgstr ""
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
-#: src/protocols/toc/toc.c:469
+#: src/protocols/toc/toc.c:471
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生不明的登录错误: %s。"
 
-#: src/protocols/toc/toc.c:472
-#, c-format
-msgid "An unknown error, %d, has occured.  Info: %s"
+#: src/protocols/toc/toc.c:474
+#, fuzzy, c-format
+msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "不明错误 %d 发生了。具体讯息: %s"
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:491
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:529
 msgid "Waiting for reply..."
 msgstr "等待响应"
 
-#: src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:598
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 取消暂停。现在你可以继续发送消息了。"
 
-#: src/protocols/toc/toc.c:597
+#: src/protocols/toc/toc.c:599
 msgid "TOC Resume"
 msgstr "TOC 恢复"
 
-#: src/protocols/toc/toc.c:758
+#: src/protocols/toc/toc.c:763
 msgid "Chat Error"
 msgstr "聊天错误"
 
-#: src/protocols/toc/toc.c:777
-msgid "Password Change Successeful"
+#: src/protocols/toc/toc.c:782
+#, fuzzy
+msgid "Password Change Successful"
 msgstr "Gaim - 更改密码"
 
-#: src/dialogs.c:1683 src/protocols/toc/toc.c:777
+#: src/dialogs.c:1688 src/protocols/toc/toc.c:782
 msgid "Gaim - Password Change"
 msgstr "Gaim - 更改密码"
 
-#: src/protocols/toc/toc.c:780
+#: src/protocols/toc/toc.c:785
 msgid ""
 "TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
@@ -1093,38 +1144,38 @@
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:783
+#: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
 msgstr "TOC 暂停"
 
-#: src/protocols/toc/toc.c:1207
+#: src/protocols/toc/toc.c:1222
 msgid "Get Dir Info"
 msgstr "姓名地址录"
 
-#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
-#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
+#: src/protocols/toc/toc.c:1638 src/protocols/toc/toc.c:1680
+#: src/protocols/toc/toc.c:1799 src/protocols/toc/toc.c:1885
 msgid "Could not connect for transfer!"
 msgstr "无法建立传输连接。"
 
-#: src/protocols/toc/toc.c:1814
+#: src/protocols/toc/toc.c:1829
 msgid "Could not write file header!"
 msgstr "无法写文件头!"
 
-#: src/protocols/toc/toc.c:1903
+#: src/protocols/toc/toc.c:1918
 msgid "Gaim - Save As..."
 msgstr "Gaim - 存盘为……"
 
-#: src/protocols/toc/toc.c:1944
+#: src/protocols/toc/toc.c:1959
 #, fuzzy, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s 请求 %s 接受 %d 个文件 %s  %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1960
 #, fuzzy, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s 请求 %s 接受 %d 个文件 %s  %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1950
+#: src/protocols/toc/toc.c:1965
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求你给他们发送一个文件"
@@ -1188,10 +1239,10 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:155 src/aim.c:296 src/buddy.c:2500 src/buddy_chat.c:1311
-#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2734
-#: src/dialogs.c:567 src/dialogs.c:3848 src/multi.c:1026 src/plugins.c:277
-#: src/prefs.c:2545 src/prpl.c:438 src/prpl.c:679 src/server.c:1023
+#: src/about.c:155 src/aim.c:318 src/buddy.c:2633 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2795
+#: src/dialogs.c:568 src/dialogs.c:3858 src/multi.c:1057 src/plugins.c:277
+#: src/prefs.c:2535 src/prpl.c:438 src/prpl.c:679 src/server.c:1050
 msgid "Close"
 msgstr "关闭"
 
@@ -1202,55 +1253,55 @@
 msgid "Web Site"
 msgstr "网址"
 
-#: src/aim.c:129 src/buddy.c:2493
+#: src/aim.c:151 src/buddy.c:2626
 msgid "Signoff"
 msgstr "离开"
 
-#: src/aim.c:141
+#: src/aim.c:163
 msgid "Please enter your logon"
 msgstr "请输入您的登录名称"
 
-#: src/aim.c:141 src/multi.c:1276 src/server.c:55
+#: src/aim.c:163 src/multi.c:1388 src/server.c:55
 msgid "Signon Error"
 msgstr "登录错误"
 
-#: src/aim.c:239
+#: src/aim.c:261
 msgid "Gaim - Login"
 msgstr "Gaim - 登录"
 
-#: src/aim.c:257
+#: src/aim.c:279
 msgid "Screen Name: "
 msgstr "登录名:"
 
-#: src/aim.c:273
+#: src/aim.c:295
 msgid "Password: "
 msgstr "密码:"
 
-#: src/aim.c:294 src/buddy.c:2497
+#: src/aim.c:316 src/buddy.c:2630
 msgid "Quit"
 msgstr "退出"
 
-#: src/aim.c:299 src/aim.c:755 src/buddy.c:2523
+#: src/aim.c:321 src/aim.c:819 src/buddy.c:2656
 msgid "Accounts"
 msgstr "所有帐号"
 
-#: src/aim.c:301 src/multi.c:878
+#: src/aim.c:323 src/multi.c:903
 msgid "Signon"
 msgstr "登录"
 
-#: src/aim.c:333
+#: src/aim.c:355
 msgid "About"
 msgstr "关于"
 
-#: src/aim.c:334 src/prefs.c:1619 src/prefs.c:1903
+#: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
 msgid "Options"
 msgstr "选  项"
 
-#: src/aim.c:336 src/aim.c:758 src/buddy.c:2541
+#: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
 msgid "Plugins"
 msgstr "插    件"
 
-#: src/aim.c:752 src/buddy.c:2533
+#: src/aim.c:816 src/buddy.c:2666
 msgid "Preferences"
 msgstr "属性设置"
 
@@ -1276,11 +1327,11 @@
 msgid "New Away Message"
 msgstr "新的暂时离开信息"
 
-#: src/applet.c:443
+#: src/applet.c:444
 msgid "Can't create Gaim applet!"
 msgstr "无法创建 Gaim 小程序!"
 
-#: src/applet.c:464
+#: src/applet.c:465
 msgid "About..."
 msgstr "关于……"
 
@@ -1305,86 +1356,86 @@
 msgstr "将所有帐号设为离开"
 
 #. Put the buttons in the box
-#: src/buddy.c:482 src/buddy.c:2610 src/buddy_chat.c:1443
-#: src/conversation.c:2268 src/conversation.c:2749 src/dialogs.c:889
-#: src/dialogs.c:1071 src/dialogs.c:2044 src/multi.c:1010 src/prefs.c:2039
-#: src/prefs.c:2381 src/prefs.c:2415
+#: src/buddy.c:488 src/buddy.c:2741 src/buddy_chat.c:1443
+#: src/conversation.c:2328 src/conversation.c:2810 src/dialogs.c:890
+#: src/dialogs.c:1072 src/dialogs.c:2053 src/multi.c:1041 src/prefs.c:2029
+#: src/prefs.c:2371 src/prefs.c:2405
 msgid "Add"
 msgstr "增加"
 
-#: src/buddy.c:483 src/buddy.c:2611 src/dialogs.c:899 src/dialogs.c:1046
+#: src/buddy.c:489 src/buddy.c:2742 src/dialogs.c:900 src/dialogs.c:1047
 msgid "Group"
 msgstr "组群"
 
-#: src/buddy.c:484 src/buddy.c:2612 src/buddy_chat.c:1445
-#: src/conversation.c:2254 src/conversation.c:2746 src/prefs.c:2053
-#: src/prefs.c:2385 src/prefs.c:2419
+#: src/buddy.c:490 src/buddy.c:2743 src/buddy_chat.c:1445
+#: src/conversation.c:2314 src/conversation.c:2807 src/prefs.c:2043
+#: src/prefs.c:2375 src/prefs.c:2409
 msgid "Remove"
 msgstr "删除"
 
-#: src/buddy.c:489 src/buddy.c:640 src/buddy.c:791 src/buddy.c:2372
+#: src/buddy.c:495 src/buddy.c:646 src/buddy.c:798 src/buddy.c:2505
 #: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "即时信息"
 
-#: src/buddy.c:490 src/buddy.c:2373 src/buddy_chat.c:866 src/buddy_chat.c:1275
-#: src/buddy_chat.c:1451 src/conversation.c:2767
+#: src/buddy.c:496 src/buddy.c:2506 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2828
 msgid "Info"
 msgstr "详细资料"
 
 #. Put the buttons in the box
-#: src/buddy.c:645 src/buddy.c:796 src/dialogs.c:1038 src/dialogs.c:3407
-#: src/dialogs.c:3422
+#: src/buddy.c:651 src/buddy.c:803 src/dialogs.c:1039 src/dialogs.c:3417
+#: src/dialogs.c:3432
 msgid "Alias"
 msgstr "外号儿"
 
-#: src/buddy.c:650 src/buddy.c:815
+#: src/buddy.c:656 src/buddy.c:822
 msgid "Add Buddy Pounce"
 msgstr "增加监视朋友"
 
-#: src/buddy.c:657 src/buddy.c:821
+#: src/buddy.c:663 src/buddy.c:828
 msgid "View Log"
 msgstr "查看记录"
 
-#: src/buddy.c:778 src/buddy.c:809
+#: src/buddy.c:785 src/buddy.c:816
 msgid "Rename"
 msgstr "重命名"
 
-#: src/buddy.c:803
+#: src/buddy.c:810
 msgid "Un-Alias"
 msgstr "去除外号儿"
 
-#: src/buddy.c:1511 src/buddy.c:2516
+#: src/buddy.c:1581 src/buddy.c:2649
 msgid "Buddy Pounce"
 msgstr "监视朋友"
 
-#: src/buddy.c:1593
+#: src/buddy.c:1661
 msgid "New Buddy Pounce"
 msgstr "新增监视朋友"
 
-#: src/buddy.c:1611
+#: src/buddy.c:1679
 msgid "Remove Buddy Pounce"
 msgstr "取消监视朋友"
 
-#: src/buddy.c:1639
+#: src/buddy.c:1707
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2058
+#: src/buddy.c:2183
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "已登录帐号: %s\n"
 
-#: src/buddy.c:2070
+#: src/buddy.c:2195
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:2082
+#: src/buddy.c:2207
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "兼容性:%s\n"
 
-#: src/buddy.c:2086
+#: src/buddy.c:2211
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1395,118 +1446,118 @@
 "登录名:%s\n"
 "%s%s%s"
 
-#: src/buddy.c:2090
+#: src/buddy.c:2215
 msgid "Idle: "
 msgstr "空闲时间:"
 
-#: src/buddy.c:2161 src/buddy.c:2166
+#: src/buddy.c:2286 src/buddy.c:2291
 #, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s 已登录。</B><BR><HR>"
 
-#: src/buddy.c:2225 src/buddy.c:2230
+#: src/buddy.c:2350 src/buddy.c:2355
 #, c-format
 msgid "%s logged out."
 msgstr "<HR><B>%s 离开了 %s%s 。</B><BR><HR>"
 
-#: src/buddy.c:2407
+#: src/buddy.c:2540
 msgid "Information on selected Buddy"
 msgstr "选中的朋友的资料"
 
-#: src/buddy.c:2408 src/dialogs.c:696
+#: src/buddy.c:2541 src/dialogs.c:697
 msgid "Send Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2409
+#: src/buddy.c:2542
 msgid "Start/join a Buddy Chat"
 msgstr "发起或加入一个聊天室"
 
-#: src/buddy.c:2410
+#: src/buddy.c:2543
 msgid "Activate Away Message"
 msgstr "激活暂时离开信息"
 
-#: src/buddy.c:2473
+#: src/buddy.c:2606
 msgid "File"
 msgstr "文件"
 
-#: src/buddy.c:2477
+#: src/buddy.c:2610
 msgid "Add A Buddy"
 msgstr "加入一个哥们儿"
 
-#: src/buddy.c:2479
+#: src/buddy.c:2612
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2481
+#: src/buddy.c:2614
 msgid "New Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2483 src/dialogs.c:748
+#: src/buddy.c:2616 src/dialogs.c:749
 msgid "Get User Info"
 msgstr "用户详细资料"
 
-#: src/buddy.c:2488
+#: src/buddy.c:2621
 msgid "Import Buddy List"
 msgstr "导入朋友列表"
 
-#: src/buddy.c:2506
+#: src/buddy.c:2639
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2529
+#: src/buddy.c:2662
 msgid "Protocol Actions"
 msgstr "协议动作"
 
-#: src/buddy.c:2535
+#: src/buddy.c:2668
 msgid "View System Log"
 msgstr "查看系统记录"
 
-#: src/buddy.c:2547
+#: src/buddy.c:2680
 msgid "Perl"
 msgstr "Perl 插件"
 
-#: src/buddy.c:2550
+#: src/buddy.c:2683
 msgid "Load Script"
 msgstr "加载脚本"
 
-#: src/buddy.c:2554
+#: src/buddy.c:2687
 msgid "Unload All Scripts"
 msgstr "卸载脚本"
 
-#: src/buddy.c:2558
+#: src/buddy.c:2691
 msgid "List Scripts"
 msgstr "列出已加载脚本"
 
-#: src/buddy.c:2566
+#: src/buddy.c:2699
 msgid "Help"
 msgstr "帮助"
 
-#: src/buddy.c:2571
+#: src/buddy.c:2704
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/buddy.c:2590 src/prefs.c:2901
+#: src/buddy.c:2721 src/prefs.c:2891
 msgid "Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:2643
+#: src/buddy.c:2774
 msgid "Add a new Buddy"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2644
+#: src/buddy.c:2775
 msgid "Add a new Group"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2645
+#: src/buddy.c:2776
 #, fuzzy
 msgid "Remove selected Buddy/Group"
 msgstr "删除选中的哥们儿"
 
-#: src/buddy.c:2672
+#: src/buddy.c:2803
 msgid "Edit Buddies"
 msgstr "修改朋友列表"
 
-#: src/buddy.c:2715
+#: src/buddy.c:2846
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 朋友列表"
 
@@ -1522,13 +1573,13 @@
 msgid "Join Chat As:"
 msgstr "设定加入聊天使用的昵称:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:448
-#: src/dialogs.c:539 src/dialogs.c:714 src/dialogs.c:772 src/dialogs.c:891
-#: src/dialogs.c:1067 src/dialogs.c:1426 src/dialogs.c:1631 src/dialogs.c:1755
-#: src/dialogs.c:1815 src/dialogs.c:2033 src/dialogs.c:2215 src/dialogs.c:2390
-#: src/dialogs.c:2461 src/dialogs.c:3157 src/dialogs.c:3409 src/dialogs.c:3590
-#: src/dialogs.c:3961 src/dialogs.c:4067 src/dialogs.c:4726 src/multi.c:744
-#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:450
+#: src/dialogs.c:540 src/dialogs.c:715 src/dialogs.c:773 src/dialogs.c:892
+#: src/dialogs.c:1068 src/dialogs.c:1431 src/dialogs.c:1636 src/dialogs.c:1760
+#: src/dialogs.c:1820 src/dialogs.c:2042 src/dialogs.c:2224 src/dialogs.c:2399
+#: src/dialogs.c:2470 src/dialogs.c:3166 src/dialogs.c:3419 src/dialogs.c:3600
+#: src/dialogs.c:3971 src/dialogs.c:4077 src/dialogs.c:4736 src/multi.c:769
+#: src/multi.c:899 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "取消"
 
@@ -1541,11 +1592,11 @@
 msgid "Invite"
 msgstr "邀请"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1254 src/dialogs.c:3417
+#: src/buddy_chat.c:412 src/dialogs.c:1259 src/dialogs.c:3427
 msgid "Buddy"
 msgstr "朋友"
 
-#: src/buddy_chat.c:417 src/prefs.c:2002
+#: src/buddy_chat.c:417 src/prefs.c:1992
 msgid "Message"
 msgstr "消息内容"
 
@@ -1607,601 +1658,601 @@
 msgstr "悄悄话"
 
 #: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
-#: src/conversation.c:2778
+#: src/conversation.c:2839
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1447 src/conversation.c:2755
+#: src/buddy_chat.c:1447 src/conversation.c:2816
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/buddy_chat.c:1449 src/conversation.c:2761 src/dialogs.c:423
-#: src/dialogs.c:452
+#: src/buddy_chat.c:1449 src/conversation.c:2822 src/dialogs.c:425
+#: src/dialogs.c:454
 msgid "Warn"
 msgstr "警告"
 
-#: src/conversation.c:399
+#: src/conversation.c:413
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 记录对话内容"
 
-#: src/conversation.c:460
+#: src/conversation.c:474
 #, fuzzy
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 即时信息用户"
 
-#: src/conversation.c:1219
+#: src/conversation.c:1278
 msgid "Unable to send message: too large"
 msgstr ""
 
-#: src/conversation.c:1219 src/conversation.c:1223
+#: src/conversation.c:1278 src/conversation.c:1282
 #, fuzzy
 msgid "Message Error"
 msgstr "消息内容"
 
-#: src/conversation.c:1223
+#: src/conversation.c:1282
 #, fuzzy
 msgid "Unable to send message: Unknown reason"
 msgstr "你莫名其妙地丢失了一条 %s 发来的消息"
 
-#: src/conversation.c:1442
+#: src/conversation.c:1501
 #, c-format
 msgid "Currently at %d, "
 msgstr "目前在 %d,"
 
-#: src/conversation.c:1450
+#: src/conversation.c:1509
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "把位置设定到 %d\n"
 
-#: src/conversation.c:2051 src/prefs.c:1307
+#: src/conversation.c:2110 src/prefs.c:1305
 msgid "Bold Text"
 msgstr "粗体文字"
 
-#: src/conversation.c:2051
+#: src/conversation.c:2110
 msgid "Bold"
 msgstr "粗体"
 
-#: src/conversation.c:2055
+#: src/conversation.c:2114
 msgid "Italics Text"
 msgstr "斜体文字"
 
-#: src/conversation.c:2056
+#: src/conversation.c:2115
 msgid "Italics"
 msgstr "斜体"
 
-#: src/conversation.c:2059 src/prefs.c:1319
+#: src/conversation.c:2118 src/prefs.c:1317
 msgid "Underline Text"
 msgstr "下加线文字"
 
-#: src/conversation.c:2060
+#: src/conversation.c:2119
 msgid "Underline"
 msgstr "下加线"
 
-#: src/conversation.c:2064 src/prefs.c:1325
+#: src/conversation.c:2123 src/prefs.c:1323
 msgid "Strike through Text"
 msgstr "划掉的文字"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2123
 msgid "Strike"
 msgstr "划掉"
 
-#: src/conversation.c:2070
+#: src/conversation.c:2129
 msgid "Decrease font size"
 msgstr "缩小字体"
 
-#: src/conversation.c:2070
+#: src/conversation.c:2129
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:2073
+#: src/conversation.c:2132
 msgid "Normal font size"
 msgstr "正常字体大小"
 
-#: src/conversation.c:2073
+#: src/conversation.c:2132
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:2076
+#: src/conversation.c:2135
 msgid "Increase font size"
 msgstr "增大字体"
 
-#: src/conversation.c:2076
+#: src/conversation.c:2135
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:2083 src/dialogs.c:2832 src/dialogs.c:2856
+#: src/conversation.c:2142 src/dialogs.c:2841 src/dialogs.c:2865
 msgid "Select Font"
 msgstr "选择字型"
 
-#: src/conversation.c:2084
+#: src/conversation.c:2143
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:2087 src/prefs.c:1355
+#: src/conversation.c:2146 src/prefs.c:1353
 msgid "Text Color"
 msgstr "文字颜色"
 
-#: src/conversation.c:2088 src/conversation.c:2092
+#: src/conversation.c:2147 src/conversation.c:2151
 msgid "Color"
 msgstr "颜色"
 
-#: src/conversation.c:2092 src/prefs.c:1373
+#: src/conversation.c:2151 src/prefs.c:1371
 msgid "Background Color"
 msgstr "背景颜色"
 
-#: src/conversation.c:2099 src/dialogs.c:2455
+#: src/conversation.c:2158 src/dialogs.c:2464
 msgid "Insert Link"
 msgstr "插入超连接"
 
-#: src/conversation.c:2100
+#: src/conversation.c:2159
 msgid "Link"
 msgstr "超连接"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2162
 msgid "Insert smiley face"
 msgstr "插入笑脸图形"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2162
 msgid "Smiley"
 msgstr "笑脸符"
 
-#: src/conversation.c:2106
+#: src/conversation.c:2165
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM 图案"
 
-#: src/conversation.c:2106
+#: src/conversation.c:2165
 #, fuzzy
 msgid "Image"
 msgstr "IM 图案"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2172
 msgid "Enable logging"
 msgstr "开始记录"
 
-#: src/conversation.c:2114 src/prefs.c:254
+#: src/conversation.c:2173 src/prefs.c:254
 msgid "Logging"
 msgstr "记录"
 
-#: src/conversation.c:2123
+#: src/conversation.c:2182
 msgid "Save Conversation"
 msgstr "保存对话内容"
 
-#: src/conversation.c:2124 src/dialogs.c:1635 src/dialogs.c:1819
-#: src/dialogs.c:3169 src/dialogs.c:3857 src/dialogs.c:4734
+#: src/conversation.c:2183 src/dialogs.c:1640 src/dialogs.c:1824
+#: src/dialogs.c:3178 src/dialogs.c:3867 src/dialogs.c:4744
 msgid "Save"
 msgstr "存盘"
 
-#: src/conversation.c:2128
+#: src/conversation.c:2187
 msgid "Enable sounds"
 msgstr "打开声音"
 
-#: src/conversation.c:2129
+#: src/conversation.c:2188
 msgid "Sound"
 msgstr "声音"
 
-#: src/conversation.c:2607
+#: src/conversation.c:2668
 msgid "Gaim - Conversations"
 msgstr "Gaim - 所有对话"
 
-#: src/conversation.c:2694
+#: src/conversation.c:2755
 msgid "Send message as: "
 msgstr "发送信息"
 
-#: src/conversation.c:3309
+#: src/conversation.c:3373
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 存盘为……"
 
-#: src/conversation.c:3336
+#: src/conversation.c:3400
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3341
+#: src/conversation.c:3405
 #, fuzzy
 msgid "Enable Animation"
 msgstr "打开声音"
 
-#: src/conversation.c:3347
+#: src/conversation.c:3411
 #, fuzzy
 msgid "Hide Icon"
 msgstr "隐藏哥们儿们的图标"
 
-#: src/conversation.c:3353
+#: src/conversation.c:3417
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - 存盘为……"
 
-#: src/dialogs.c:411
+#: src/dialogs.c:413
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 警告用户?"
 
-#: src/dialogs.c:431
+#: src/dialogs.c:433
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告 %s?"
 
-#: src/dialogs.c:436
+#: src/dialogs.c:438
 msgid "Warn anonymously?"
 msgstr "发匿名警告?"
 
-#: src/dialogs.c:440
+#: src/dialogs.c:442
 msgid "Anonymous warnings are less harsh."
 msgstr "匿名警告不那么严厉。"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:470
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "把 “%s”从朋友表上删去\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:495
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - 重命名组"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:508
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "重命名哥们儿"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:518
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:530 src/prpl.c:154 src/prpl.c:228
 msgid "Accept"
 msgstr "接受"
 
 #. Build OK Button
-#: src/dialogs.c:636 src/dialogs.c:719 src/dialogs.c:777 src/dialogs.c:1430
-#: src/dialogs.c:1759 src/dialogs.c:1906 src/dialogs.c:2214 src/dialogs.c:2394
-#: src/dialogs.c:2460 src/dialogs.c:3966 src/dialogs.c:4072 src/multi.c:749
+#: src/dialogs.c:637 src/dialogs.c:720 src/dialogs.c:778 src/dialogs.c:1435
+#: src/dialogs.c:1764 src/dialogs.c:1915 src/dialogs.c:2223 src/dialogs.c:2403
+#: src/dialogs.c:2469 src/dialogs.c:3976 src/dialogs.c:4082 src/multi.c:774
 msgid "OK"
 msgstr "确认"
 
-#: src/dialogs.c:686
+#: src/dialogs.c:687
 msgid "Gaim - IM user"
 msgstr "Gaim - 即时信息用户"
 
-#: src/dialogs.c:703
+#: src/dialogs.c:704
 msgid "IM who:"
 msgstr "给这家伙即时信息:"
 
-#: src/dialogs.c:755
+#: src/dialogs.c:756
 msgid "User:"
 msgstr "用户:"
 
 #. Finish up
-#: src/dialogs.c:782
+#: src/dialogs.c:783
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 取得用户资料"
 
-#: src/dialogs.c:897
+#: src/dialogs.c:898
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:922
+#: src/dialogs.c:923
 msgid "Gaim - Add Group"
 msgstr "Gaim - 添加组"
 
-#: src/dialogs.c:1006
+#: src/dialogs.c:1007
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 增加朋友"
 
-#: src/dialogs.c:1018
+#: src/dialogs.c:1019
 msgid "Add Buddy"
 msgstr "增加朋友"
 
-#: src/dialogs.c:1028
+#: src/dialogs.c:1029
 #, fuzzy
 msgid "Contact"
 msgstr "字体外观"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1054
+#: src/dialogs.c:1055
 #, fuzzy
 msgid "Add To"
 msgstr "增加"
 
-#: src/dialogs.c:1091
+#: src/dialogs.c:1092
 msgid "Please enter a buddy to pounce."
 msgstr "请输入您要监视的;’哥们儿"
 
-#: src/dialogs.c:1091
+#: src/dialogs.c:1092
 msgid "Buddy Pounce Error"
 msgstr "监视朋友时出错"
 
-#: src/dialogs.c:1223
+#: src/dialogs.c:1228
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增监视朋友"
 
 #. <pounce type="who">
-#: src/dialogs.c:1234
+#: src/dialogs.c:1239
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1245
+#: src/dialogs.c:1250
 #, fuzzy
 msgid "Account"
 msgstr "所有帐号"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1271
+#: src/dialogs.c:1276
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1281
+#: src/dialogs.c:1286
 msgid "Pounce on sign on"
 msgstr "监视何时登录"
 
-#: src/dialogs.c:1290
+#: src/dialogs.c:1295
 msgid "Pounce on return from away"
 msgstr "监视何时回来"
 
-#: src/dialogs.c:1299
+#: src/dialogs.c:1304
 msgid "Pounce on return from idle"
 msgstr "监视何时神志恢复清醒"
 
-#: src/dialogs.c:1308
+#: src/dialogs.c:1313
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "朋友登录声"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1323
 #, fuzzy
 msgid "Pounce Action"
 msgstr "连接"
 
-#: src/dialogs.c:1329
+#: src/dialogs.c:1334
 #, fuzzy
 msgid "Open IM Window"
 msgstr "即时消息窗口"
 
-#: src/dialogs.c:1338
+#: src/dialogs.c:1343
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1347
+#: src/dialogs.c:1352
 #, fuzzy
 msgid "Send Message"
 msgstr "发送信息"
 
-#: src/dialogs.c:1368
+#: src/dialogs.c:1373
 msgid "Execute command on pounce"
 msgstr "发现动静就执行命令"
 
-#: src/dialogs.c:1390
+#: src/dialogs.c:1395
 msgid "Play sound on pounce"
 msgstr "发现动静就播放声音"
 
 #. </pounce type="action">
-#: src/dialogs.c:1412
+#: src/dialogs.c:1417
 msgid "Save this pounce after activation"
 msgstr "下次发现仍然执行"
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1503
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 设定姓名地址录"
 
-#: src/dialogs.c:1507
+#: src/dialogs.c:1512
 msgid "Directory Info"
 msgstr "姓名地址录"
 
-#: src/dialogs.c:1529
+#: src/dialogs.c:1534
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许从网页搜寻找到你的资料"
 
 #. Line 1
-#: src/dialogs.c:1532 src/dialogs.c:2233
+#: src/dialogs.c:1537 src/dialogs.c:2242
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:1543 src/dialogs.c:2245
+#: src/dialogs.c:1548 src/dialogs.c:2254
 msgid "Middle Name"
 msgstr "字"
 
 #. Line 3
-#: src/dialogs.c:1555 src/dialogs.c:2257
+#: src/dialogs.c:1560 src/dialogs.c:2266
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:1566 src/dialogs.c:2269
+#: src/dialogs.c:1571 src/dialogs.c:2278
 msgid "Maiden Name"
 msgstr "娘家姓"
 
 #. Line 6
-#: src/dialogs.c:1588 src/dialogs.c:2292
+#: src/dialogs.c:1593 src/dialogs.c:2301
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:1653
+#: src/dialogs.c:1658
 msgid "New Passwords Do Not Match"
 msgstr "新密码不一致"
 
-#: src/dialogs.c:1653 src/dialogs.c:1658
+#: src/dialogs.c:1658 src/dialogs.c:1663
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 更改密码错误"
 
-#: src/dialogs.c:1658
+#: src/dialogs.c:1663
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都添了"
 
-#: src/dialogs.c:1713
+#: src/dialogs.c:1718
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:1727
+#: src/dialogs.c:1732
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:1741
+#: src/dialogs.c:1746
 msgid "New Password (again)"
 msgstr "新密码(确定)"
 
-#: src/dialogs.c:1782
+#: src/dialogs.c:1787
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:1890
+#: src/dialogs.c:1899
 msgid "Below are the results of your search: "
 msgstr "以下是你搜索的结果:"
 
-#: src/dialogs.c:2023 src/dialogs.c:2030
+#: src/dialogs.c:2032 src/dialogs.c:2039
 msgid "Permit"
 msgstr "允许"
 
-#: src/dialogs.c:2025 src/dialogs.c:2032
+#: src/dialogs.c:2034 src/dialogs.c:2041
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/dialogs.c:2069
+#: src/dialogs.c:2078
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 增加允许人"
 
-#: src/dialogs.c:2071
+#: src/dialogs.c:2080
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2131
+#: src/dialogs.c:2140
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 记录对话内容"
 
-#: src/dialogs.c:2209 src/dialogs.c:2372
+#: src/dialogs.c:2218 src/dialogs.c:2381
 msgid "Search for Buddy"
 msgstr "搜寻朋友"
 
-#: src/dialogs.c:2337
+#: src/dialogs.c:2346
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 根据用户资料查寻朋友"
 
-#: src/dialogs.c:2366
+#: src/dialogs.c:2375
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 根据电邮查寻朋友"
 
-#: src/dialogs.c:2506
+#: src/dialogs.c:2515
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:2657 src/dialogs.c:2678 src/dialogs.c:2732
+#: src/dialogs.c:2666 src/dialogs.c:2687 src/dialogs.c:2741
 msgid "Select Text Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2711
+#: src/dialogs.c:2720
 msgid "Select Background Color"
 msgstr "设定背景颜色"
 
-#: src/dialogs.c:2933
+#: src/dialogs.c:2942
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:2957
+#: src/dialogs.c:2966
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 导入朋友列表"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3024
+#: src/dialogs.c:3033
 msgid "You cannot create an away message with a blank title"
 msgstr "暂时离开消息不能没有标题"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3031
+#: src/dialogs.c:3040
 msgid "You cannot create an empty away message"
 msgstr "暂时离开消息不能为空"
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3108
 msgid "Gaim - New away message"
 msgstr "Gaim - 更新暂时离开信息"
 
-#: src/dialogs.c:3109
+#: src/dialogs.c:3118
 msgid "New away message"
 msgstr "新的暂时离开信息"
 
-#: src/dialogs.c:3122
+#: src/dialogs.c:3131
 msgid "Away title: "
 msgstr "暂时离开标题:"
 
-#: src/dialogs.c:3161
+#: src/dialogs.c:3170
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3165
+#: src/dialogs.c:3174
 msgid "Save & Use"
 msgstr "保存并使用"
 
 #. show everything
-#: src/dialogs.c:3363
+#: src/dialogs.c:3372
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3415
+#: src/dialogs.c:3425
 msgid "Alias Buddy"
 msgstr "给朋友取一个外号儿"
 
-#: src/dialogs.c:3448
+#: src/dialogs.c:3458
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 给朋友取一个外号儿"
 
-#: src/dialogs.c:3520
+#: src/dialogs.c:3530
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 保存记录为……"
 
-#: src/dialogs.c:3552
+#: src/dialogs.c:3562
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "不能删除文件 %s。"
 
-#: src/dialogs.c:3580
+#: src/dialogs.c:3590
 msgid "Really clear log?"
 msgstr "真得要清楚记录?"
 
-#: src/dialogs.c:3595
+#: src/dialogs.c:3605
 msgid "Okay"
 msgstr "确定"
 
-#: src/dialogs.c:3766
+#: src/dialogs.c:3776
 #, fuzzy
 msgid "Date"
 msgstr "省"
 
-#: src/dialogs.c:3829
+#: src/dialogs.c:3839
 #, fuzzy
 msgid "Conversation"
 msgstr "对话"
 
-#: src/dialogs.c:3852
+#: src/dialogs.c:3862
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3930
+#: src/dialogs.c:3940
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 重命名组"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3950
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:3947 src/dialogs.c:4053
+#: src/dialogs.c:3957 src/dialogs.c:4063
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/dialogs.c:4036
+#: src/dialogs.c:4046
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 重命名哥们儿"
 
-#: src/dialogs.c:4046
+#: src/dialogs.c:4056
 msgid "Rename Buddy"
 msgstr "重命名哥们儿"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4130
+#: src/dialogs.c:4140
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 选择 Perl 脚本"
 
@@ -2215,118 +2266,143 @@
 msgstr "选项错误"
 
 #: src/html.c:183
-#, c-format
-msgid "Receieved: '%s'\n"
+#, fuzzy, c-format
+msgid "Received: '%s'\n"
 msgstr "收到了:“%s”\n"
 
 #: src/html.c:221
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接错误\n"
 
-#: src/multi.c:427
+#: src/multi.c:452
 #, fuzzy
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - 增加朋友"
 
-#: src/multi.c:470
+#: src/multi.c:495
 #, fuzzy
 msgid "Buddy Icon File:"
 msgstr "朋友图标"
 
-#: src/multi.c:481
+#: src/multi.c:506
 #, fuzzy
 msgid "Browse"
 msgstr "浏览器"
 
-#: src/multi.c:486 src/prefs.c:1545
+#: src/multi.c:511 src/prefs.c:1545
 msgid "Reset"
 msgstr "重置"
 
-#: src/multi.c:513
-msgid "Screenname:"
-msgstr "登录名:"
-
-#: src/multi.c:533
-msgid "Protocol:"
-msgstr "协议:"
-
 #: src/multi.c:538
+msgid "Screenname:"
+msgstr "登录名:"
+
+#: src/multi.c:558
+msgid "Protocol:"
+msgstr "协议:"
+
+#: src/multi.c:563
 msgid "Remember Password"
 msgstr "记住密码"
 
-#: src/multi.c:539
+#: src/multi.c:564
 msgid "Auto-Login"
 msgstr "自动登录"
 
-#: src/multi.c:579
+#: src/multi.c:604
 msgid "New Mail Notifications"
 msgstr ""
 
-#: src/multi.c:669
+#: src/multi.c:694
 #, fuzzy
 msgid "Register with server"
 msgstr "注册新的用户"
 
-#: src/multi.c:727
+#: src/multi.c:752
 msgid "Gaim - Modify Account"
 msgstr "Gaim - 修改帐号"
 
-#: src/multi.c:846
+#: src/multi.c:871
 msgid "Enter Password"
 msgstr "输入密码"
 
 #: src/multi.c:935
+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 ""
+"无法登录该帐号,因为没有加载该协议的插件,或者该协议不具备登录功能。You "
+"cannot log this account in; you do not have the protocol it uses loaded, or "
+"the protocol does not have a login function."
+
+#: src/multi.c:937
+msgid "Login Error"
+msgstr "登录错误"
+
+#: src/multi.c:966
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "你真的想删除 %s?"
 
-#: src/multi.c:972
+#: src/multi.c:1003
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帐号编辑器"
 
-#: src/multi.c:991
+#: src/multi.c:1022
 msgid "Select All"
 msgstr "全选"
 
-#: src/multi.c:996
+#: src/multi.c:1027
 msgid "Select Autos"
 msgstr "选择自动回复消息"
 
-#: src/multi.c:1000
+#: src/multi.c:1031
 msgid "Select None"
 msgstr "全部不选"
 
-#: src/multi.c:1014
+#: src/multi.c:1045
 msgid "Modify"
 msgstr "修改"
 
-#: src/multi.c:1018
+#: src/multi.c:1049
 msgid "Sign On/Off"
 msgstr "登录/离开"
 
-#: src/multi.c:1022
+#: src/multi.c:1053
 msgid "Delete"
 msgstr "删除"
 
-#: src/multi.c:1256
+#: src/multi.c:1368
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1275
+#: src/multi.c:1387
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s 无法登录: %s"
 
-#: src/multi.c:1286
+#: src/multi.c:1398
 #, fuzzy
 msgid "Notice"
 msgstr "声音"
 
+#: src/multi.c:1408
+#, fuzzy, c-format
+msgid "%s has been signed off"
+msgstr ""
+"%s\n"
+"%s 无法登录: %s"
+
+#: src/multi.c:1409
+#, fuzzy
+msgid "Connection Error"
+msgstr "连接已关闭"
+
 #: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perl 脚本"
@@ -2389,9 +2465,9 @@
 msgid "General Options"
 msgstr "一般选项"
 
-#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:667
-#: src/prefs.c:920 src/prefs.c:1070 src/prefs.c:1295 src/prefs.c:1615
-#: src/prefs.c:1899 src/prefs.c:2332
+#: src/prefs.c:200 src/prefs.c:383 src/prefs.c:551 src/prefs.c:665
+#: src/prefs.c:918 src/prefs.c:1068 src/prefs.c:1293 src/prefs.c:1615
+#: src/prefs.c:1889 src/prefs.c:2322
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "如果没有意外,所有的设定马上生效"
 
@@ -2556,11 +2632,11 @@
 msgid "Tab Placement:"
 msgstr "对话活页位置"
 
-#: src/prefs.c:572 src/prefs.c:1003 src/prefs.c:1153
+#: src/prefs.c:572 src/prefs.c:1001 src/prefs.c:1151
 msgid "Top"
 msgstr "顶端"
 
-#: src/prefs.c:573 src/prefs.c:1005 src/prefs.c:1155
+#: src/prefs.c:573 src/prefs.c:1003 src/prefs.c:1153
 msgid "Bottom"
 msgstr "底端"
 
@@ -2572,268 +2648,268 @@
 msgid "Automatically show buddy list on sign on"
 msgstr "登录后自动显示朋友列表"
 
-#: src/prefs.c:590
-msgid "Save Window Size/Position"
-msgstr "保存窗口的大小和位置"
-
-#: src/prefs.c:593
-msgid "Show pictures on buttons"
-msgstr "在按钮上显示图形"
-
-#: src/prefs.c:599
+#: src/prefs.c:589
 msgid "Display Buddy List near applet"
 msgstr "在 applet 附近显示朋友列表"
 
-#: src/prefs.c:602
+#: src/prefs.c:592
+msgid "Save Window Size/Position"
+msgstr "保存窗口的大小和位置"
+
+#: src/prefs.c:595
+msgid "Show pictures on buttons"
+msgstr "在按钮上显示图形"
+
+#: src/prefs.c:600
 msgid "Group Displays"
 msgstr "朋友组显示"
 
-#: src/prefs.c:614
+#: src/prefs.c:612
 msgid "Hide groups with no online buddies"
 msgstr "隐藏没有哥们儿登录的组"
 
-#: src/prefs.c:620
+#: src/prefs.c:618
 msgid "Show numbers in groups"
 msgstr "在组里显示号码"
 
-#: src/prefs.c:622
+#: src/prefs.c:620
 msgid "Buddy Displays"
 msgstr "朋友列表显示"
 
-#: src/prefs.c:634
+#: src/prefs.c:632
 msgid "Show buddy type icons"
 msgstr "显示朋友类别图形"
 
-#: src/prefs.c:635
+#: src/prefs.c:633
 msgid "Show warning levels"
 msgstr "显示警告级别"
 
-#: src/prefs.c:641
+#: src/prefs.c:639
 msgid "Show idle times"
 msgstr "显示空转时间"
 
-#: src/prefs.c:642
+#: src/prefs.c:640
 msgid "Grey idle buddies"
 msgstr ""
 
-#: src/prefs.c:659
+#: src/prefs.c:657
 msgid "Conversation Options"
 msgstr "对话选项"
 
-#: src/prefs.c:671
+#: src/prefs.c:669
 msgid "Keyboard Options"
 msgstr "键盘选项"
 
-#: src/prefs.c:683
+#: src/prefs.c:681
 msgid "Enter sends message"
 msgstr "单击 Enter 键发送信息"
 
-#: src/prefs.c:684
+#: src/prefs.c:682
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter 健发送信息"
 
-#: src/prefs.c:685
+#: src/prefs.c:683
 msgid "Escape closes window"
 msgstr "ESC 健关闭窗口"
 
-#: src/prefs.c:691
+#: src/prefs.c:689
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} 插入 HTML 标记"
 
-#: src/prefs.c:692
+#: src/prefs.c:690
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-数字 插入笑脸图标"
 
-#: src/prefs.c:693
+#: src/prefs.c:691
 msgid "F2 toggles timestamp display"
 msgstr "F2 切换时间戳显示"
 
-#: src/prefs.c:695
+#: src/prefs.c:693
 msgid "Display and General Options"
 msgstr "显示和一般选项"
 
-#: src/prefs.c:707
+#: src/prefs.c:705
 msgid "Show graphical smileys"
 msgstr "显示图形笑脸"
 
-#: src/prefs.c:708
+#: src/prefs.c:706
 msgid "Show timestamp on messages"
 msgstr "在信息里显示时间"
 
-#: src/prefs.c:709
+#: src/prefs.c:707
 msgid "Show URLs as links"
 msgstr "以超连接方式显示 URL"
 
-#: src/prefs.c:710
+#: src/prefs.c:708
 msgid "Highlight misspelled words"
 msgstr "高亮显示拼错的单词"
 
-#: src/prefs.c:711 src/prefs.c:1921
+#: src/prefs.c:709 src/prefs.c:1911
 msgid "Sending messages removes away status"
 msgstr "发出信息时自动取消暂时离开状态"
 
-#: src/prefs.c:712 src/prefs.c:1934
+#: src/prefs.c:710 src/prefs.c:1924
 msgid "Queue new messages when away"
 msgstr "暂时离开时收到的消息放到队列里"
 
+#: src/prefs.c:716
+msgid "Ignore colors"
+msgstr "忽略收到消息的颜色标记"
+
+#: src/prefs.c:717
+msgid "Ignore font faces"
+msgstr "忽略收到消息的字体标记"
+
 #: src/prefs.c:718
-msgid "Ignore colors"
-msgstr "忽略收到消息的颜色标记"
-
-#: src/prefs.c:719
-msgid "Ignore font faces"
-msgstr "忽略收到消息的字体标记"
-
-#: src/prefs.c:720
 msgid "Ignore font sizes"
 msgstr "忽略收到消息的字体大小设置"
 
-#: src/prefs.c:721
+#: src/prefs.c:719
 msgid "Ignore TiK Automated Messages"
 msgstr "忽略自动生成的消息"
 
-#: src/prefs.c:722 src/prefs.c:1919
+#: src/prefs.c:720 src/prefs.c:1909
 msgid "Ignore new conversations when away"
 msgstr "暂时离开时,忽略新的对话"
 
-#: src/prefs.c:911
+#: src/prefs.c:909
 msgid "IM Options"
 msgstr "即时消息选项"
 
-#: src/prefs.c:924 src/prefs.c:2917
+#: src/prefs.c:922 src/prefs.c:2907
 msgid "IM Window"
 msgstr "即时消息窗口"
 
-#: src/prefs.c:940 src/prefs.c:1090
+#: src/prefs.c:938 src/prefs.c:1088
 msgid "Show buttons as: "
 msgstr "按钮显示设置:"
 
-#: src/prefs.c:944 src/prefs.c:1095
+#: src/prefs.c:942 src/prefs.c:1093
 msgid "Pictures And Text"
 msgstr "图形和文字"
 
-#: src/prefs.c:945 src/prefs.c:1097
+#: src/prefs.c:943 src/prefs.c:1095
 msgid "Pictures"
 msgstr "图形"
 
-#: src/prefs.c:946 src/prefs.c:1098
+#: src/prefs.c:944 src/prefs.c:1096
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:957
+#: src/prefs.c:955
 msgid "Show all conversations in one tabbed window"
 msgstr "在一个活页窗口中显示所有对话"
 
-#: src/prefs.c:959
+#: src/prefs.c:957
 msgid "Show chats in the same tabbed window"
 msgstr "在同一个一个活页窗口中显示对话"
 
-#: src/prefs.c:966 src/prefs.c:1118
+#: src/prefs.c:964 src/prefs.c:1116
 msgid "Raise windows on events"
 msgstr "有事件发生时提升窗口"
 
-#: src/prefs.c:967
+#: src/prefs.c:965
 msgid "Show logins in window"
 msgstr "在交谈窗口显示登录/登出信息"
 
-#: src/prefs.c:968
+#: src/prefs.c:966
 msgid "Show aliases in tabs/titles"
 msgstr "在窗口或活页的标题中显示外号儿"
 
-#: src/prefs.c:969
+#: src/prefs.c:967
 msgid "Hide window on send"
 msgstr "发出消息后隐藏窗口"
 
-#: src/prefs.c:971 src/prefs.c:1121
+#: src/prefs.c:969 src/prefs.c:1119
 msgid "Window Sizes"
 msgstr "窗口大小设定"
 
-#: src/prefs.c:979 src/prefs.c:1129
+#: src/prefs.c:977 src/prefs.c:1127
 msgid "New window width:"
 msgstr "新的窗口宽度设定:"
 
-#: src/prefs.c:980 src/prefs.c:1130
+#: src/prefs.c:978 src/prefs.c:1128
 msgid "New window height:"
 msgstr "新的窗口高度设定:"
 
-#: src/prefs.c:981 src/prefs.c:1131
+#: src/prefs.c:979 src/prefs.c:1129
 msgid "Entry widget height:"
 msgstr "输入窗口高度:"
 
-#: src/prefs.c:983 src/prefs.c:1133
+#: src/prefs.c:981 src/prefs.c:1131
 msgid "Tab Placement"
 msgstr "对话活页位置"
 
-#: src/prefs.c:1012 src/prefs.c:1162
+#: src/prefs.c:1010 src/prefs.c:1160
 msgid "Left"
 msgstr "左边"
 
-#: src/prefs.c:1014 src/prefs.c:1164
+#: src/prefs.c:1012 src/prefs.c:1162
 msgid "Right"
 msgstr "右边"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1016
 msgid "Buddy Icons"
 msgstr "朋友图标"
 
-#: src/prefs.c:1030
+#: src/prefs.c:1028
 msgid "Hide Buddy Icons"
 msgstr "隐藏哥们儿们的图标"
 
-#: src/prefs.c:1036
+#: src/prefs.c:1034
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "打开声音"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1060
 msgid "Chat Options"
 msgstr "聊天选项"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1072
 msgid "Group Chat Window"
 msgstr "组聊天窗口"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1107
 msgid "Show all chats in one tabbed window"
 msgstr "在一个活页窗口中显示所有聊天"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1109
 msgid "Show conversations in the same tabbed window"
 msgstr "在一个活页窗口中显示所有对话"
 
-#: src/prefs.c:1119
+#: src/prefs.c:1117
 msgid "Show people joining/leaving in window"
 msgstr "在窗口中显示人们加入/离开的信息"
 
-#: src/prefs.c:1167
+#: src/prefs.c:1165
 msgid "Tab Completion"
 msgstr "TAB 键自动补全"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1177
 msgid "Tab-Complete Nicks"
 msgstr "TAB 键自动补全昵称"
 
-#: src/prefs.c:1185
+#: src/prefs.c:1183
 msgid "Old-Style Tab Completion"
 msgstr "老式的 TAB 键自动补全"
 
-#: src/prefs.c:1287 src/prefs.c:2927
+#: src/prefs.c:1285 src/prefs.c:2917
 msgid "Font Options"
 msgstr "字体选项"
 
-#: src/prefs.c:1313
+#: src/prefs.c:1311
 msgid "Italic Text"
 msgstr "斜体文字"
 
-#: src/prefs.c:1357 src/prefs.c:1375 src/prefs.c:1397
+#: src/prefs.c:1355 src/prefs.c:1373 src/prefs.c:1395
 msgid "Select"
 msgstr "选择"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1393
 msgid "Font Face for Text"
 msgstr "文字的字型"
 
-#: src/prefs.c:1410
+#: src/prefs.c:1408
 msgid "Font Size for Text"
 msgstr "文字的字体大小"
 
@@ -2858,156 +2934,122 @@
 msgid "No sounds when you log in"
 msgstr "悄悄地进去,打枪地不要"
 
-#: src/prefs.c:1641 src/prefs.c:1920
+#: src/prefs.c:1641 src/prefs.c:1910
 msgid "Sounds while away"
 msgstr "离开时的声音"
 
 #: src/prefs.c:1651
-msgid "Sound Player:"
-msgstr "声音播放器:"
-
-#: src/prefs.c:1729
+#, fuzzy
+msgid "Sound method"
+msgstr "声音"
+
+#: src/prefs.c:1725
 #, fuzzy, c-format
 msgid ""
-"Command to play sound files\n"
+"Sound command\n"
 "(%s for filename)"
 msgstr ""
 "播放声音的命令\n"
 "(声音文件完整路径使用 %s; 如果为空则使用内部命令)"
 
-#: src/prefs.c:1741
-msgid "Events"
-msgstr "事件声效"
-
-#: src/prefs.c:1749
-msgid "Sound when buddy logs in"
-msgstr "朋友登录声"
-
-#: src/prefs.c:1750
-msgid "Sound when buddy logs out"
-msgstr "朋友登出声"
-
-#: src/prefs.c:1756
-msgid "Sound when received message begins conversation"
-msgstr "建立新的对话时播放"
-
-#: src/prefs.c:1758
-msgid "Sound when message is received"
-msgstr "收到信息时播放"
-
-#: src/prefs.c:1759
-msgid "Sound when message is sent"
-msgstr "发出信息时播放"
-
-#: src/prefs.c:1765
-msgid "Sound in chat rooms when people enter"
-msgstr "有朋友进入聊天室时播放"
-
-#: src/prefs.c:1766
-msgid "Sound in chat rooms when people leave"
-msgstr "有朋友离开聊天室时播放"
-
-#: src/prefs.c:1767
-msgid "Sound in chat rooms when you talk"
-msgstr "你在聊天室里说话的声音"
-
-#: src/prefs.c:1768
-msgid "Sound in chat rooms when others talk"
-msgstr "别人在聊天室里说话的声音"
-
-#: src/prefs.c:1891 src/prefs.c:2949
+#: src/prefs.c:1737
+#, fuzzy
+msgid "Sound played when:"
+msgstr "声音播放器:"
+
+#: src/prefs.c:1881 src/prefs.c:2939
 msgid "Away Messages"
 msgstr "暂时离开信息"
 
-#: src/prefs.c:1928
+#: src/prefs.c:1918
 msgid "Don't send auto-response"
 msgstr "不要发送自动回复"
 
-#: src/prefs.c:1929
+#: src/prefs.c:1919
 msgid "Only send auto-response when idle"
 msgstr "只有在发呆的时候才发送自动回复"
 
-#: src/prefs.c:1944
+#: src/prefs.c:1934
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "发送自动回复的间隔 (秒):"
 
-#: src/prefs.c:1959
+#: src/prefs.c:1949
 msgid "Auto Away after"
 msgstr "自动在"
 
-#: src/prefs.c:1973
+#: src/prefs.c:1963
 msgid "minutes using"
 msgstr "分钟时使用"
 
-#: src/prefs.c:1986
+#: src/prefs.c:1976
 msgid "Messages"
 msgstr "消息设置"
 
-#: src/prefs.c:2043
+#: src/prefs.c:2033
 msgid "Edit"
 msgstr "编辑"
 
-#: src/prefs.c:2047
+#: src/prefs.c:2037
 msgid "Make Away"
 msgstr "立即设定为暂时离开"
 
-#: src/prefs.c:2324
+#: src/prefs.c:2314
 msgid "Privacy Options"
 msgstr "个人隐私选项"
 
-#: src/prefs.c:2340
+#: src/prefs.c:2330
 msgid "Set privacy for:"
 msgstr "设置隐私选项为:"
 
-#: src/prefs.c:2359
+#: src/prefs.c:2349
 msgid "Allow all users to contact me"
 msgstr "允许所有的用户和我联系"
 
-#: src/prefs.c:2360
+#: src/prefs.c:2350
 msgid "Allow only the users below"
 msgstr "只允许如下用户和我联系"
 
-#: src/prefs.c:2362
+#: src/prefs.c:2352
 msgid "Allow List"
 msgstr "允许的用户列表"
 
-#: src/prefs.c:2393
+#: src/prefs.c:2383
 msgid "Deny all users"
 msgstr "拒绝所有用户和我联系"
 
-#: src/prefs.c:2394
+#: src/prefs.c:2384
 msgid "Block the users below"
 msgstr "堵住这些家伙的嘴"
 
-#: src/prefs.c:2396
+#: src/prefs.c:2386
 msgid "Block List"
 msgstr "被堵住嘴的家伙"
 
-#: src/prefs.c:2491
+#: src/prefs.c:2481
 msgid "Gaim - Preferences"
 msgstr "Gaim - 设定"
 
-#: src/prefs.c:2574
+#: src/prefs.c:2564
 msgid "Gaim debug output window"
 msgstr "Gaim 除虫输出窗口"
 
-#: src/prefs.c:2883
+#: src/prefs.c:2873
 msgid "General"
 msgstr "一般设定"
 
-#: src/prefs.c:2888
+#: src/prefs.c:2878
 msgid "Proxy"
 msgstr "代理服务器"
 
-#: src/prefs.c:2912
+#: src/prefs.c:2902
 msgid "Conversations"
 msgstr "对话"
 
-#: src/prefs.c:2938
+#: src/prefs.c:2928
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:2960
+#: src/prefs.c:2950
 msgid "Privacy"
 msgstr "隐私"
 
@@ -3084,46 +3126,63 @@
 msgid "Please enter your password"
 msgstr "请输入您的登录口令"
 
-#: src/server.c:62
-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 ""
-"无法登录该帐号,因为没有加载该协议的插件,或者该协议不具备登录功能。You "
-"cannot log this account in; you do not have the protocol it uses loaded, or "
-"the protocol does not have a login function."
-
-#: src/server.c:64
-msgid "Login Error"
-msgstr "登录错误"
-
-#: src/server.c:559
+#: src/server.c:585
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 条消息)"
 
-#: src/server.c:565
+#: src/server.c:591
 msgid "(1 message)"
 msgstr "(1 条消息):"
 
-#: src/server.c:757
+#: src/server.c:783
 #, fuzzy
 msgid "Warned"
 msgstr "警告"
 
-#: src/server.c:850
+#: src/server.c:876
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:851
+#: src/server.c:877
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1027
+#: src/server.c:1054
 #, fuzzy
 msgid "More Info"
 msgstr "用户详细资料"
 
+#~ msgid "Events"
+#~ msgstr "事件声效"
+
+#~ msgid "Sound when buddy logs in"
+#~ msgstr "朋友登录声"
+
+#~ msgid "Sound when buddy logs out"
+#~ msgstr "朋友登出声"
+
+#~ msgid "Sound when received message begins conversation"
+#~ msgstr "建立新的对话时播放"
+
+#~ msgid "Sound when message is received"
+#~ msgstr "收到信息时播放"
+
+#~ msgid "Sound when message is sent"
+#~ msgstr "发出信息时播放"
+
+#~ msgid "Sound in chat rooms when people enter"
+#~ msgstr "有朋友进入聊天室时播放"
+
+#~ msgid "Sound in chat rooms when people leave"
+#~ msgstr "有朋友离开聊天室时播放"
+
+#~ msgid "Sound in chat rooms when you talk"
+#~ msgstr "你在聊天室里说话的声音"
+
+#~ msgid "Sound in chat rooms when others talk"
+#~ msgstr "别人在聊天室里说话的声音"
+
 #~ msgid "Gaim - Buddy"
 #~ msgstr "Gaim - 朋友"
 
@@ -3259,9 +3318,6 @@
 #~ msgid "Text Only"
 #~ msgstr "文字颜色"
 
-#~ msgid "Sound Events"
-#~ msgstr "声音"
-
 #~ msgid "Sound when message is first received"
 #~ msgstr "收到信息声"