diff po/zh_CN.po @ 6118:ed983e8a1851

[gaim-migrate @ 6582] Updated POTFILES.in and I guess a few billion po files due to a couple .c files being removed. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 14 Jul 2003 06:11:31 +0000
parents d8d103eaa457
children 25b26e3ecf60
line wrap: on
line diff
--- a/po/zh_CN.po	Mon Jul 14 06:08:18 2003 +0000
+++ b/po/zh_CN.po	Mon Jul 14 06:11:31 2003 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-07-05 12:18+0800\n"
+"POT-Creation-Date: 2003-07-13 22:05-0700\n"
 "PO-Revision-Date: 2003-07-04 14:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -15,67 +15,65 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:105 src/gtkaccount.c:468 src/gtkaccount.c:1623
-#: src/win32/systray.c:365
+#: plugins/docklet/docklet.c:110 src/gtkaccount.c:444 src/gtkaccount.c:1599
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:108
+#: plugins/docklet/docklet.c:113
 msgid "New Message.."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:109
+#: plugins/docklet/docklet.c:114
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:140
+#: plugins/docklet/docklet.c:145
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:144 src/protocols/gg/gg.c:54
-#: src/protocols/irc/irc.c:1019 src/protocols/jabber/jabber.c:1172
-#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3487
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4537
-#: src/protocols/oscar/oscar.c:5436 src/protocols/oscar/oscar.c:5831
-#: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1493
+#: plugins/docklet/docklet.c:149 src/protocols/gg/gg.c:54
+#: src/protocols/irc/irc.c:1020 src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4548
+#: src/protocols/oscar/oscar.c:5447 src/protocols/oscar/oscar.c:5841
+#: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1491
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:150 src/away.c:535
+#: plugins/docklet/docklet.c:155 src/away.c:531
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:158
+#: plugins/docklet/docklet.c:163
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:163 src/gtkft.c:557
+#: plugins/docklet/docklet.c:168 src/gtkft.c:557
 msgid "File Transfers"
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:164 src/gtkaccount.c:1774 src/main.c:418
+#: plugins/docklet/docklet.c:169 src/gtkaccount.c:1750 src/main.c:415
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:165 src/gtkprefs.c:2338 src/main.c:428
-#: src/win32/systray.c:361
+#: plugins/docklet/docklet.c:170 src/gtkprefs.c:2337 src/main.c:425
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:174 src/win32/systray.c:165
+#: plugins/docklet/docklet.c:179
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:178
+#: plugins/docklet/docklet.c:183
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:477
+#: plugins/docklet/docklet.c:412
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:481
+#: plugins/docklet/docklet.c:416
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -86,24 +84,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:505
+#: plugins/docklet/docklet.c:440
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:508
+#: plugins/docklet/docklet.c:443
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:445
+#, fuzzy
 msgid ""
-"Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
-"display the current status of Gaim, allow fast access to commonly used "
-"functions, and to toggle display of the buddy list or login window. Also "
-"allows messages to be queued until the icon is clicked, similar to ICQ."
+"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
+"example) to display the current status of Gaim, allow fast access to "
+"commonly used functions, and to toggle display of the buddy list or login "
+"window. Also allows messages to be queued until the icon is clicked, similar "
+"to ICQ."
 msgstr ""
 "与通知区程序(例如 GNOME 或 KDE)交互可以显示 Gaim 的当前状态,快速访问常用的功"
 "能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类似,还可以将消息存入队"
@@ -116,14 +116,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:80
+#: plugins/autorecon.c:103
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:83 plugins/autorecon.c:85
+#: plugins/autorecon.c:106 plugins/autorecon.c:108
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
@@ -151,14 +151,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/events.c:225
+#: plugins/events.c:236
 msgid "Event Test"
 msgstr "事件测试"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/events.c:228 plugins/events.c:230
+#: plugins/events.c:239 plugins/events.c:241
 msgid "Test to see that all events are working properly."
 msgstr "测试看看所有的事件是否都工作正确。"
 
@@ -272,7 +272,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:934
+#: plugins/idle.c:70 src/protocols/irc/irc.c:935
 msgid "Idle Time"
 msgstr "瞌睡时间"
 
@@ -436,35 +436,35 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:403
+#: plugins/spellchk.c:394
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:427
+#: plugins/spellchk.c:418
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:430
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:465
+#: plugins/spellchk.c:456
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:472
+#: plugins/spellchk.c:463
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:486
+#: plugins/spellchk.c:477
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:526
+#: plugins/spellchk.c:517
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:528 plugins/spellchk.c:529
+#: plugins/spellchk.c:519 plugins/spellchk.c:520
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -487,30 +487,30 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:147
+#: plugins/timestamp.c:148
 msgid "Timestamp"
 msgstr "时间戳"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:150 plugins/timestamp.c:152
+#: plugins/timestamp.c:151 plugins/timestamp.c:153
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
-#: plugins/gaim-remote/remote.c:85
+#: plugins/gaim-remote/remote.c:86
 msgid "Not connected to AIM"
 msgstr "未连接到 AIM"
 
-#: plugins/gaim-remote/remote.c:94 plugins/gaim-remote/remote.c:133
+#: plugins/gaim-remote/remote.c:95 plugins/gaim-remote/remote.c:134
 msgid "No screenname given."
 msgstr "没有给出用户名。"
 
-#: plugins/gaim-remote/remote.c:170
+#: plugins/gaim-remote/remote.c:171
 msgid "No roomname given."
 msgstr "没有给出聊天室名。"
 
-#: plugins/gaim-remote/remote.c:189
+#: plugins/gaim-remote/remote.c:190
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
@@ -521,19 +521,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:733
+#: plugins/gaim-remote/remote.c:735
 msgid "Remote Control"
 msgstr "远程控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:736
+#: plugins/gaim-remote/remote.c:738
 msgid "Provides remote control for gaim applications."
 msgstr "提供 gaim 程序的远程控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:738
+#: plugins/gaim-remote/remote.c:740
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -630,7 +630,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:847
+#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -695,13 +695,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1391
+#: plugins/perl/perl.c:1392
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1393 plugins/perl/perl.c:1394
+#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -725,11 +725,11 @@
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1180
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
 #: src/protocols/msn/msn.c:311 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:1251
-#: src/protocols/yahoo/yahoo.c:1330
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1257
+#: src/protocols/yahoo/yahoo.c:1336
 msgid "Available"
 msgstr "可用"
 
@@ -741,11 +741,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3436
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2825
-#: src/protocols/oscar/oscar.c:4525 src/protocols/oscar/oscar.c:4552
-#: src/protocols/oscar/oscar.c:5836 src/protocols/yahoo/yahoo.c:1066
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1340
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "隐身"
 
@@ -862,11 +862,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/protocols/gg/gg.c:664 src/gtkrequest.c:166 src/request.h:802
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:168 src/request.h:804
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:664 src/gtkrequest.c:167 src/request.h:802
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:169 src/request.h:804
 msgid "No"
 msgstr "否"
 
@@ -897,7 +897,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
-#: src/dialogs.c:2016 src/dialogs.c:2665
+#: src/dialogs.c:2035 src/dialogs.c:2684
 msgid "City"
 msgstr "城市"
 
@@ -993,9 +993,9 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4315
-#: src/protocols/oscar/oscar.c:6096 src/protocols/toc/toc.c:1442
-#: src/dialogs.c:2127 src/dialogs.c:2136
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4322
+#: src/protocols/oscar/oscar.c:6110 src/protocols/toc/toc.c:1474
+#: src/dialogs.c:2146 src/dialogs.c:2155
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -1040,28 +1040,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2669
-#: src/dialogs.c:2433 src/gtkconv.c:1096 src/gtkconv.c:2938 src/gtkconv.c:4095
-#: src/gtkrequest.c:173 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2673
+#: src/dialogs.c:2452 src/gtkconv.c:1113 src/gtkconv.c:2964 src/gtkconv.c:4124
+#: src/gtkrequest.c:175 src/prpl.c:312
 msgid "Add"
 msgstr "添加"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1102
-#: src/protocols/irc/irc.c:1431 src/protocols/msn/msn.c:171
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1104
+#: src/protocols/irc/irc.c:1433 src/protocols/msn/msn.c:171
 #: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
 #: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
-#: src/protocols/oscar/oscar.c:2401 src/protocols/oscar/oscar.c:2438
-#: src/protocols/oscar/oscar.c:2473 src/protocols/oscar/oscar.c:2518
-#: src/protocols/oscar/oscar.c:5709 src/protocols/oscar/oscar.c:5924
-#: src/protocols/oscar/oscar.c:5972 src/protocols/oscar/oscar.c:6032
-#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1183
-#: src/buddy_chat.c:375 src/dialogs.c:453 src/dialogs.c:464 src/dialogs.c:476
-#: src/dialogs.c:2073 src/dialogs.c:2188 src/dialogs.c:2254 src/dialogs.c:2422
-#: src/dialogs.c:2607 src/dialogs.c:2756 src/dialogs.c:3427 src/dialogs.c:3920
-#: src/dialogs.c:4401 src/dialogs.c:4954 src/gtkaccount.c:1512
-#: src/gtkconn.c:143 src/gtkrequest.c:169 src/multi.c:177 src/prpl.c:313
-#: src/request.h:811 src/request.h:821
+#: src/protocols/oscar/oscar.c:2404 src/protocols/oscar/oscar.c:2441
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2521
+#: src/protocols/oscar/oscar.c:5719 src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:5983 src/protocols/oscar/oscar.c:6043
+#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1188
+#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
+#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
+#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
+#: src/dialogs.c:4883 src/gtkaccount.c:1488 src/gtkconn.c:146
+#: src/gtkrequest.c:171 src/prpl.c:313 src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "取消"
 
@@ -1070,16 +1069,16 @@
 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:1712
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2597 src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1713
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
 #: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5087
-#: src/dialogs.c:2421
+#: src/protocols/oscar/oscar.c:2603 src/protocols/oscar/oscar.c:5098
+#: src/dialogs.c:2440
 msgid "Deny"
 msgstr "拒绝"
 
@@ -1087,9 +1086,9 @@
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2331
-#: src/protocols/jabber/jabber.c:2365 src/protocols/jabber/jabber.c:4234
-#: src/protocols/jabber/jabber.c:4280 src/protocols/msn/dispatch.c:160
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
+#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
 #: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1376
 #: src/protocols/napster/napster.c:496
 msgid "Unable to connect"
@@ -1099,7 +1098,7 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3932
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
 msgid "Nick:"
 msgstr "昵称:"
 
@@ -1107,204 +1106,204 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/irc.c:185
+#: src/protocols/irc/irc.c:186
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/irc.c:486 src/protocols/irc/irc.c:2605
+#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2607
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/irc/irc.c:539 src/protocols/irc/irc.c:2614
+#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2616
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/irc/irc.c:674
+#: src/protocols/irc/irc.c:675
 msgid "No topic is set"
 msgstr "没有设置话题"
 
-#: src/protocols/irc/irc.c:695 src/protocols/irc/irc.c:1752
+#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1754
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 已经将话题改为:%s</B>"
 
-#: src/protocols/irc/irc.c:740
+#: src/protocols/irc/irc.c:741
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 模式/%s [%c%c %s] 由 %s"
 
-#: src/protocols/irc/irc.c:917 src/protocols/irc/irc.c:930
+#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
 msgid "User"
 msgstr "用户名"
 
 #. Splits
-#: src/protocols/irc/irc.c:921 src/protocols/irc/irc.c:3028
-#: src/protocols/jabber/jabber.c:4411 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:922 src/protocols/irc/irc.c:3030
+#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:925 src/protocols/irc/irc.c:1080
-#: src/protocols/irc/irc.c:1644
+#: src/protocols/irc/irc.c:926 src/protocols/irc/irc.c:1081
+#: src/protocols/irc/irc.c:1646
 msgid "IRC Operator"
 msgstr "IRC 管理者"
 
-#: src/protocols/irc/irc.c:938
+#: src/protocols/irc/irc.c:939
 msgid "Channels"
 msgstr "频道"
 
-#: src/protocols/irc/irc.c:944
+#: src/protocols/irc/irc.c:945
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s 是标识的用户"
 
-#: src/protocols/irc/irc.c:959
+#: src/protocols/irc/irc.c:960
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr "%ld 秒 [登入:%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1080
+#: src/protocols/irc/irc.c:1081
 msgid "Rehashing server"
 msgstr "正在重连服务器"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1083
+#: src/protocols/irc/irc.c:1084
 msgid "No such nick/channel"
 msgstr "没有这样的昵称/频道"
 
-#: src/protocols/irc/irc.c:1083 src/protocols/irc/irc.c:1086
-#: src/protocols/irc/irc.c:1091 src/protocols/irc/irc.c:1095
-#: src/protocols/irc/irc.c:1460 src/protocols/irc/irc.c:1602
+#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:1604
 msgid "IRC Error"
 msgstr "IRC 出错"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1086
+#: src/protocols/irc/irc.c:1087
 msgid "No such server"
 msgstr "没有该服务器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1091
+#: src/protocols/irc/irc.c:1092
 msgid "No nickname given"
 msgstr "没有给出昵称"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1095
 msgid "You're not an IRC operator!"
 msgstr "您不是 IRC 管理员!"
 
-#: src/protocols/irc/irc.c:1098
+#: src/protocols/irc/irc.c:1099
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "该昵称已经被其他人使用了。请输入新昵称"
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1101 src/protocols/msn/msn.c:170
+#: src/protocols/irc/irc.c:1103 src/protocols/msn/msn.c:170
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2437
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:5923
-#: src/protocols/oscar/oscar.c:5971 src/protocols/oscar/oscar.c:6031
-#: src/protocols/yahoo/yahoo.c:1182 src/dialogs.c:2184 src/dialogs.c:2322
-#: src/dialogs.c:2606 src/dialogs.c:2752 src/dialogs.c:3913 src/dialogs.c:4395
-#: src/gtkrequest.c:168 src/request.h:811
+#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2440
+#: src/protocols/oscar/oscar.c:2520 src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5982 src/protocols/oscar/oscar.c:6042
+#: src/protocols/yahoo/yahoo.c:1187 src/dialogs.c:2203 src/dialogs.c:2341
+#: src/dialogs.c:2625 src/dialogs.c:2771 src/dialogs.c:3934
+#: src/gtkrequest.c:170 src/request.h:813
 msgid "OK"
 msgstr "确定"
 
-#: src/protocols/irc/irc.c:1387 src/protocols/irc/irc.c:1393
-#: src/protocols/irc/irc.c:1399 src/protocols/irc/irc.c:1413
+#: src/protocols/irc/irc.c:1389 src/protocols/irc/irc.c:1395
+#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 信息"
 
-#: src/protocols/irc/irc.c:1423
+#: src/protocols/irc/irc.c:1425
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 想要建立二人世界"
 
-#: src/protocols/irc/irc.c:1426
+#: src/protocols/irc/irc.c:1428
 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:1430 src/protocols/oscar/oscar.c:2400
-#: src/protocols/oscar/oscar.c:5708
+#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:5718
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/irc/irc.c:1457
+#: src/protocols/irc/irc.c:1459
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "收到了 %s 发出的无效文件发送请求。"
 
-#: src/protocols/irc/irc.c:1538 src/protocols/msn/error.c:133
+#: src/protocols/irc/irc.c:1540 src/protocols/msn/error.c:133
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/irc/irc.c:1600
+#: src/protocols/irc/irc.c:1602
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您已经被踢出了 %s: %s"
 
-#: src/protocols/irc/irc.c:1605
+#: src/protocols/irc/irc.c:1607
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1661 src/protocols/irc/irc.c:2915
+#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客户信息"
 
-#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2921
+#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
 msgid "CTCP UserInfo"
 msgstr "CTCP 用户信息"
 
-#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2927
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1701 src/protocols/irc/irc.c:2933
+#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1946 src/protocols/oscar/oscar.c:674
-#: src/protocols/toc/toc.c:233
+#: src/protocols/irc/irc.c:1948 src/protocols/oscar/oscar.c:678
+#: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:1960 src/protocols/trepia/trepia.c:1148
+#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:2201
+#: src/protocols/irc/irc.c:2203
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的话题是 %s"
 
-#: src/protocols/irc/irc.c:2297
+#: src/protocols/irc/irc.c:2299
 #, c-format
 msgid "You have left %s"
 msgstr "您已经离开了 %s"
 
-#: src/protocols/irc/irc.c:2298
+#: src/protocols/irc/irc.c:2300
 msgid "IRC Part"
 msgstr "IRC 部分"
 
-#: src/protocols/irc/irc.c:2353
+#: src/protocols/irc/irc.c:2355
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>正在请求二人世界</I>"
 
-#: src/protocols/irc/irc.c:2370
+#: src/protocols/irc/irc.c:2372
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2375
+#: src/protocols/irc/irc.c:2377
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1312,11 +1311,11 @@
 "<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
 "><BR>PING <昵称></B><BR>"
 
-#: src/protocols/irc/irc.c:2383
+#: src/protocols/irc/irc.c:2385
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
 
-#: src/protocols/irc/irc.c:2388
+#: src/protocols/irc/irc.c:2390
 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 "
@@ -1328,19 +1327,19 @@
 "入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
 "HELP DCC 可查看二人世界的命令"
 
-#: src/protocols/irc/irc.c:2411
+#: src/protocols/irc/irc.c:2413
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知命令</B>"
 
-#: src/protocols/irc/irc.c:2471
+#: src/protocols/irc/irc.c:2473
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:2476 src/gtkaccount.c:450 src/main.c:402
+#: src/protocols/irc/irc.c:2478 src/gtkaccount.c:426 src/main.c:399
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:2902
+#: src/protocols/irc/irc.c:2904
 msgid "DCC Chat"
 msgstr "二人世界"
 
@@ -1354,314 +1353,339 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3008 src/protocols/irc/irc.c:3010
+#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. Account Options
-#: src/protocols/irc/irc.c:3032 src/protocols/jabber/jabber.c:4418
-#: src/protocols/msn/msn.c:1221 src/protocols/napster/napster.c:644
-#: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1144
+#: src/protocols/irc/irc.c:3034 src/protocols/jabber/jabber.c:4425
+#: src/protocols/msn/msn.c:1223 src/protocols/napster/napster.c:644
+#: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1142
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:3036
+#: src/protocols/irc/irc.c:3038
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
+#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
+#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
+#: src/protocols/msn/msn.c:471 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:689 src/protocols/msn/msn.c:722
+#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:744
+#: src/protocols/msn/msn.c:753 src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:776 src/protocols/msn/msn.c:798
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:886
+#: src/protocols/msn/msn.c:981 src/protocols/msn/msn.c:1005
+#: src/protocols/msn/msn.c:1025 src/protocols/msn/msn.c:1036
+#: src/protocols/msn/msn.c:1047 src/protocols/msn/msn.c:1071
+#: src/protocols/msn/msn.c:1083 src/protocols/msn/notification.c:127
+#: src/protocols/msn/notification.c:156 src/protocols/msn/notification.c:949
+#: src/protocols/msn/notification.c:969 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:782 src/protocols/trepia/trepia.c:1065
+#: src/protocols/trepia/trepia.c:1109 src/protocols/trepia/trepia.c:1208
+#: src/protocols/trepia/trepia.c:1264
+msgid "Write error"
+msgstr "写错误"
+
+#: src/protocols/jabber/jabber.c:981
 msgid "Unable to change password."
 msgstr "无法更改密码。"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:982
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "您输入的旧密码不正确。您的密码未被更改。"
 
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:988
 msgid "Unable to change password"
 msgstr "无法更改密码"
 
-#: src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:989
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
 
-#: src/protocols/jabber/jabber.c:1165 src/blist.c:745 src/gtkaccount.c:148
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:794 src/gtkaccount.c:148
 #: src/gtkpounce.c:307
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1174 src/protocols/jabber/jabber.c:3432
-#: src/protocols/jabber/jabber.c:3483
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3487
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3434
-#: src/protocols/jabber/jabber.c:3491
+#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3495
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3495 src/protocols/oscar/oscar.c:2815
-#: src/protocols/oscar/oscar.c:4540 src/protocols/oscar/oscar.c:5832
+#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5842
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:1417
+#: src/protocols/jabber/jabber.c:1421
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 错误 %s"
 
-#: src/protocols/jabber/jabber.c:1524
+#: src/protocols/jabber/jabber.c:1528
 #, c-format
 msgid "Error %s: %s"
 msgstr "错误 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1527
+#: src/protocols/jabber/jabber.c:1531
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/jabber.c:1705
+#: src/protocols/jabber/jabber.c:1709
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/jabber.c:1733
+#: src/protocols/jabber/jabber.c:1737
 #, 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:1736
+#: src/protocols/jabber/jabber.c:1740
 msgid "No such user."
 msgstr "没有这样的用户。"
 
 #. Should never happen.
-#: src/protocols/jabber/jabber.c:1827 src/protocols/msn/notification.c:87
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
 #: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
-#: src/blist.c:454 src/dialogs.c:847
+#: src/blist.c:502 src/dialogs.c:855
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1900
+#: src/protocols/jabber/jabber.c:1904
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:1934
+#: src/protocols/jabber/jabber.c:1938
 msgid "Unknown login error"
 msgstr "未知的登录错误"
 
-#: src/protocols/jabber/jabber.c:2284
+#: src/protocols/jabber/jabber.c:2288
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2329 src/protocols/jabber/jabber.c:4232
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
 msgid "Connection lost"
 msgstr "连接已丢失"
 
-#: src/protocols/jabber/jabber.c:2336
+#: src/protocols/jabber/jabber.c:2340
 msgid "Connected"
 msgstr "已连接"
 
-#: src/protocols/jabber/jabber.c:2339
+#: src/protocols/jabber/jabber.c:2343
 msgid "Requesting Authentication Method"
 msgstr "正在请求认证方法"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2359 src/protocols/msn/dispatch.c:164
+#: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
 #: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:981
+#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:2685
+#: src/protocols/jabber/jabber.c:2689
 #, 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:2687
+#: src/protocols/jabber/jabber.c:2691
 msgid "Unable to add buddy."
 msgstr "无法添加好友。"
 
-#: src/protocols/jabber/jabber.c:2688
+#: src/protocols/jabber/jabber.c:2692
 msgid "Jabber Error"
 msgstr "Jabber 错误"
 
-#: src/protocols/jabber/jabber.c:2947
+#: src/protocols/jabber/jabber.c:2951
 msgid "Room:"
 msgstr "房间:"
 
-#: src/protocols/jabber/jabber.c:2952
+#: src/protocols/jabber/jabber.c:2956
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/protocols/jabber/jabber.c:2958
+#: src/protocols/jabber/jabber.c:2962
 msgid "Handle:"
 msgstr "门把手:"
 
-#: src/protocols/jabber/jabber.c:2988
+#: src/protocols/jabber/jabber.c:2992
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/jabber.c:3224 src/protocols/jabber/jabber.c:3275
-#: src/protocols/jabber/jabber.c:3700
+#: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3704
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3225
+#: src/protocols/jabber/jabber.c:3229
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:3276 src/protocols/jabber/jabber.c:3335
-#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3368
-#: src/protocols/oscar/oscar.c:5444
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
+#: src/protocols/oscar/oscar.c:5455
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3381
+#: src/protocols/jabber/jabber.c:3385
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/protocols/jabber/jabber.c:3393 src/gtkconv.c:1083
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1100
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/protocols/jabber/jabber.c:3400
+#: src/protocols/jabber/jabber.c:3404
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/jabber.c:3403
+#: src/protocols/jabber/jabber.c:3407
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/jabber.c:3410
+#: src/protocols/jabber/jabber.c:3414
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/jabber.c:3418
+#: src/protocols/jabber/jabber.c:3422
 msgid "Re-request authorization"
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3431 src/protocols/jabber/jabber.c:3481
-#: src/protocols/oscar/oscar.c:2827 src/protocols/oscar/oscar.c:4535
-#: src/protocols/oscar/oscar.c:5830 src/protocols/yahoo/yahoo.c:1070
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4546
+#: src/protocols/oscar/oscar.c:5840 src/protocols/yahoo/yahoo.c:1075
 #: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
-#: src/gtkaccount.c:1612
+#: src/gtkaccount.c:1588
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:3621
+#: src/protocols/jabber/jabber.c:3625
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3622
+#: src/protocols/jabber/jabber.c:3626
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3623
+#: src/protocols/jabber/jabber.c:3627
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3624
+#: src/protocols/jabber/jabber.c:3628
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3625 src/dialogs.c:2877
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2896
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3626
+#: src/protocols/jabber/jabber.c:3630
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3627
+#: src/protocols/jabber/jabber.c:3631
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/jabber.c:3632
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3633
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3630
+#: src/protocols/jabber/jabber.c:3634
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/jabber.c:3631 src/protocols/trepia/trepia.c:372
-#: src/dialogs.c:2038 src/dialogs.c:2683
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:2057 src/dialogs.c:2702
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/jabber.c:3636
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2741
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2760
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3638
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/jabber.c:3639
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3640
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3641
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3642
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2887 src/gtkprefs.c:601
-#: src/gtkprefs.c:1822
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2906 src/gtkprefs.c:601
+#: src/gtkprefs.c:1821
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3664
+#: src/protocols/jabber/jabber.c:3668
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
 
-#: src/protocols/jabber/jabber.c:3665
+#: src/protocols/jabber/jabber.c:3669
 msgid "User Identity"
 msgstr "用户标识"
 
-#: src/protocols/jabber/jabber.c:4094
+#: src/protocols/jabber/jabber.c:4098
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4169
+#: src/protocols/jabber/jabber.c:4173
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4190
+#: src/protocols/jabber/jabber.c:4194
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/protocols/jabber/jabber.c:4301 src/protocols/oscar/oscar.c:6082
-#: src/protocols/toc/toc.c:1430 src/dialogs.c:2213
+#: src/protocols/jabber/jabber.c:4308 src/protocols/oscar/oscar.c:6096
+#: src/protocols/toc/toc.c:1462 src/dialogs.c:2232
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -1675,42 +1699,18 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4390 src/protocols/jabber/jabber.c:4392
+#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4414
+#: src/protocols/jabber/jabber.c:4421
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/jabber.c:4422
+#: src/protocols/jabber/jabber.c:4429
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
-#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
-#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
-#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
-#: src/protocols/msn/msn.c:471 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:689 src/protocols/msn/msn.c:722
-#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:744
-#: src/protocols/msn/msn.c:753 src/protocols/msn/msn.c:767
-#: src/protocols/msn/msn.c:776 src/protocols/msn/msn.c:798
-#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:886
-#: src/protocols/msn/msn.c:979 src/protocols/msn/msn.c:1003
-#: src/protocols/msn/msn.c:1023 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1045 src/protocols/msn/msn.c:1069
-#: src/protocols/msn/msn.c:1081 src/protocols/msn/notification.c:127
-#: src/protocols/msn/notification.c:156 src/protocols/msn/notification.c:949
-#: src/protocols/msn/notification.c:969 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:782 src/protocols/trepia/trepia.c:1065
-#: src/protocols/trepia/trepia.c:1109 src/protocols/trepia/trepia.c:1208
-#: src/protocols/trepia/trepia.c:1264
-msgid "Write error"
-msgstr "写错误"
-
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
 msgstr "协议不支持"
@@ -1824,7 +1824,7 @@
 msgid "Required fields missing"
 msgstr "缺少必须域"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:176
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -1969,12 +1969,12 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4210
-#: src/gtkrequest.c:171 src/server.c:1483
+#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4231
+#: src/gtkrequest.c:173 src/server.c:1458
 msgid "Close"
 msgstr "关闭"
 
-#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1121
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
@@ -1985,26 +1985,26 @@
 msgstr "远离电脑"
 
 #: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:560
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1048
-#: src/protocols/yahoo/yahoo.c:1255 src/protocols/yahoo/yahoo.c:1331
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
+#: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:562
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1050
-#: src/protocols/yahoo/yahoo.c:1257 src/protocols/yahoo/yahoo.c:1332
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
+#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:564
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1058
-#: src/protocols/yahoo/yahoo.c:1265 src/protocols/yahoo/yahoo.c:1336
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
+#: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:566
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1062
-#: src/protocols/yahoo/yahoo.c:1269 src/protocols/yahoo/yahoo.c:1338
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
+#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
@@ -2073,11 +2073,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1199
+#: src/protocols/msn/msn.c:1199 src/protocols/msn/msn.c:1201
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1216 src/protocols/trepia/trepia.c:1372
+#: src/protocols/msn/msn.c:1218 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "登录服务器"
 
@@ -2142,21 +2142,21 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1068
-#: src/gtkpounce.c:464 src/gtkprefs.c:1515
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1513
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/protocols/msn/switchboard.c:126
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:133
+#: src/protocols/msn/switchboard.c:128
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/switchboard.c:243
+#: src/protocols/msn/switchboard.c:250
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
@@ -2201,8 +2201,8 @@
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5157
-#: src/protocols/toc/toc.c:1175
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
+#: src/protocols/toc/toc.c:1201
 msgid "Join what group:"
 msgstr "加入组:"
 
@@ -2220,176 +2220,176 @@
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/oscar/oscar.c:172
+#: src/protocols/oscar/oscar.c:174
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:173
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:174
+#: src/protocols/oscar/oscar.c:176
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:179
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:180
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:181
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:182
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:183
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:184
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:183
-msgid "Reply too big"
-msgstr "回复太大"
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Responses lost"
-msgstr "响应丢失"
-
 #: src/protocols/oscar/oscar.c:185
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Reply too big"
+msgstr "回复太大"
 
 #: src/protocols/oscar/oscar.c:186
+msgid "Responses lost"
+msgstr "响应丢失"
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Request denied"
+msgstr "请求被禁止"
+
+#: src/protocols/oscar/oscar.c:188
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:189
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:190
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:189
-msgid "Too evil (sender)"
-msgstr "太邪恶(发送者)"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Too evil (receiver)"
-msgstr "太邪恶(接收者)"
-
 #: src/protocols/oscar/oscar.c:191
-msgid "User temporarily unavailable"
-msgstr "用户临时不可用"
+msgid "Too evil (sender)"
+msgstr "太邪恶(发送者)"
 
 #: src/protocols/oscar/oscar.c:192
-msgid "No match"
-msgstr "无匹配"
+msgid "Too evil (receiver)"
+msgstr "太邪恶(接收者)"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "List overflow"
-msgstr "列表溢出"
+msgid "User temporarily unavailable"
+msgstr "用户临时不可用"
 
 #: src/protocols/oscar/oscar.c:194
+msgid "No match"
+msgstr "无匹配"
+
+#: src/protocols/oscar/oscar.c:195
+msgid "List overflow"
+msgstr "列表溢出"
+
+#: src/protocols/oscar/oscar.c:196
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:197
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:198
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:582
-#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:660
+#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:836
+#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:554
+#: src/protocols/oscar/oscar.c:558
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:628 src/protocols/oscar/oscar.c:685
+#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:670
+#: src/protocols/oscar/oscar.c:674
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1166
+#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:790
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
+#: src/protocols/oscar/oscar.c:875
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:854
+#: src/protocols/oscar/oscar.c:858
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:867
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1055 src/protocols/toc/toc.c:529
+#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1059
+#: src/protocols/oscar/oscar.c:1062
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1063
+#: src/protocols/oscar/oscar.c:1066
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1070
 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."
@@ -2398,21 +2398,21 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1074
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1075 src/protocols/toc/toc.c:614
+#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1106
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1205 src/protocols/oscar/oscar.c:1235
-#: src/protocols/oscar/oscar.c:1323
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2420,29 +2420,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1895 src/protocols/oscar/oscar.c:5546
+#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5556
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2224 src/protocols/oscar/oscar.c:2246
+#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2392
+#: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2398
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -2451,42 +2451,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2427
+#: src/protocols/oscar/oscar.c:2430
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2435
+#: src/protocols/oscar/oscar.c:2438
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2436
+#: src/protocols/oscar/oscar.c:2439
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2464
+#: src/protocols/oscar/oscar.c:2467
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
 
-#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2471
+#: src/protocols/oscar/oscar.c:2472 src/protocols/oscar/oscar.c:2474
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:2509
-#: src/protocols/oscar/oscar.c:2516 src/protocols/oscar/oscar.c:2587
-#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:2982
-#: src/protocols/oscar/oscar.c:3034 src/protocols/oscar/oscar.c:5078
-#: src/protocols/oscar/oscar.c:5124
+#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5135
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2515
+#: src/protocols/oscar/oscar.c:2518
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2587
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2495,11 +2495,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2595 src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2509,17 +2509,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2612
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2615
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:2627
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2532,7 +2532,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2545,7 +2545,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2639
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2558,32 +2558,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2660
+#: src/protocols/oscar/oscar.c:2664
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个联系人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2666
+#: src/protocols/oscar/oscar.c:2670
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您是否想要将此联系人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2670
+#: src/protocols/oscar/oscar.c:2674
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2752
+#: src/protocols/oscar/oscar.c:2756
 #, 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:2761
+#: src/protocols/oscar/oscar.c:2765
 #, 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:2770
+#: src/protocols/oscar/oscar.c:2774
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2591,167 +2591,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:2779
+#: src/protocols/oscar/oscar.c:2783
 #, 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:2788
+#: src/protocols/oscar/oscar.c:2792
 #, 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:2797
+#: src/protocols/oscar/oscar.c:2801
 #, 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:2813 src/protocols/oscar/oscar.c:4549
-#: src/protocols/oscar/oscar.c:5835
+#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:5845
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4543
-#: src/protocols/oscar/oscar.c:5833
+#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:5843
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2819 src/protocols/oscar/oscar.c:4546
-#: src/protocols/oscar/oscar.c:5834
+#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
+#: src/protocols/oscar/oscar.c:5844
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2823
+#: src/protocols/oscar/oscar.c:2827
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2883
+#: src/protocols/oscar/oscar.c:2887
 #, 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:2885
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2944
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2945
+#: src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2980
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3032
+#: src/protocols/oscar/oscar.c:3036
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/protocols/oscar/oscar.c:3066 src/gtkaccount.c:305
+#: src/protocols/oscar/oscar.c:3070 src/gtkaccount.c:281
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3073
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3072 src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:3075 src/gtkblist.c:1581
+#: src/protocols/oscar/oscar.c:3079 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3078 src/protocols/oscar/oscar.c:5880
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3081 src/protocols/oscar/oscar.c:5872
+#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3085
+#: src/protocols/oscar/oscar.c:3089
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3092
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3091
+#: src/protocols/oscar/oscar.c:3095
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3094
+#: src/protocols/oscar/oscar.c:3098
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:3097
+#: src/protocols/oscar/oscar.c:3101
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3100
+#: src/protocols/oscar/oscar.c:3104
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3103
+#: src/protocols/oscar/oscar.c:3107
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3106
+#: src/protocols/oscar/oscar.c:3110
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3109
+#: src/protocols/oscar/oscar.c:3113
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3112
+#: src/protocols/oscar/oscar.c:3116
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3115
+#: src/protocols/oscar/oscar.c:3119
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3155
+#: src/protocols/oscar/oscar.c:3159
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3166
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3173
+#: src/protocols/oscar/oscar.c:3177
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3178
+#: src/protocols/oscar/oscar.c:3182
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2764,206 +2764,207 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:3214
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3221
+#: src/protocols/oscar/oscar.c:3225
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3227
+#: src/protocols/oscar/oscar.c:3231
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3251
+#: src/protocols/oscar/oscar.c:3255
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3639
+#: src/protocols/oscar/oscar.c:3642
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:3643
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit.  Please "
-"wait 10 seconds and try again."
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 "最后一条消息未送出,原因是您已经得到了速度极限。请等 10 秒,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:3700
+#: src/protocols/oscar/oscar.c:3704
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3702
+#: src/protocols/oscar/oscar.c:3706
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3934
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:3939
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3942
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3941 src/protocols/oscar/oscar.c:3947
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3952
+#: src/protocols/oscar/oscar.c:3956
 msgid "Mobile Phone:"
 msgstr "移动电话:"
 
-#: src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:3959
 msgid "Gender:"
 msgstr "性别:"
 
-#: src/protocols/oscar/oscar.c:3955 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3955 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3964
+#: src/protocols/oscar/oscar.c:3968
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3973
 msgid "Age:"
 msgstr "年龄:"
 
-#: src/protocols/oscar/oscar.c:3972
+#: src/protocols/oscar/oscar.c:3976
 msgid "Personal Web Page:"
 msgstr "个人主页:"
 
-#: src/protocols/oscar/oscar.c:3975
+#: src/protocols/oscar/oscar.c:3979
 msgid "Additional Information:"
 msgstr "额外信息:"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3983
 msgid "Home Address:"
 msgstr "家庭住址:"
 
-#: src/protocols/oscar/oscar.c:3981 src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3984 src/protocols/oscar/oscar.c:4000
+#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
 msgid "City:"
 msgstr "城市:"
 
-#: src/protocols/oscar/oscar.c:3987 src/protocols/oscar/oscar.c:4003
+#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
 msgid "State:"
 msgstr "州/省:"
 
-#: src/protocols/oscar/oscar.c:3990 src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
 msgid "Zip Code:"
 msgstr "邮政编码:"
 
-#: src/protocols/oscar/oscar.c:3995
+#: src/protocols/oscar/oscar.c:3999
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:4011
+#: src/protocols/oscar/oscar.c:4015
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:4013
+#: src/protocols/oscar/oscar.c:4017
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:4016
+#: src/protocols/oscar/oscar.c:4020
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4023
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:4026
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4094
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 拥有下列用户名:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4112
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4129
+#: src/protocols/oscar/oscar.c:4133
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4135
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4159
+#: src/protocols/oscar/oscar.c:4163
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4162
+#: src/protocols/oscar/oscar.c:4166
 #, 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:4165
+#: src/protocols/oscar/oscar.c:4169
 #, 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:4168
+#: src/protocols/oscar/oscar.c:4172
 #, 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:4171
+#: src/protocols/oscar/oscar.c:4175
 #, 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:4174
+#: src/protocols/oscar/oscar.c:4178
 #, 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:4177
+#: src/protocols/oscar/oscar.c:4181
 #, 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:4180
+#: src/protocols/oscar/oscar.c:4184
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4190
+#: src/protocols/oscar/oscar.c:4194
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2972,20 +2973,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4191 src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4196
+#: src/protocols/oscar/oscar.c:4200
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4420
+#: src/protocols/oscar/oscar.c:4425
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4421
+#: src/protocols/oscar/oscar.c:4426
 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 "
@@ -2994,22 +2995,22 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4450
+#: src/protocols/oscar/oscar.c:4456
 #, 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:4452
+#: src/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4477
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4469
+#: src/protocols/oscar/oscar.c:4478
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3018,7 +3019,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4518
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -3027,15 +3028,15 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4510
+#: src/protocols/oscar/oscar.c:4520
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4729
+#: src/protocols/oscar/oscar.c:4740
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4730
+#: src/protocols/oscar/oscar.c:4741
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -3044,12 +3045,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4821 src/protocols/oscar/oscar.c:4822
-#: src/protocols/oscar/oscar.c:4827
+#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
+#: src/protocols/oscar/oscar.c:4838
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:4991
+#: src/protocols/oscar/oscar.c:5002
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3057,15 +3058,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:4991 src/protocols/oscar/oscar.c:5004
+#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:4992 src/protocols/oscar/oscar.c:5005
+#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5004
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3075,18 +3076,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5050
 #, 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:5045
+#: src/protocols/oscar/oscar.c:5056
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3096,17 +3097,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5131
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5132
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5124
+#: src/protocols/oscar/oscar.c:5135
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3116,91 +3117,91 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5125
+#: src/protocols/oscar/oscar.c:5136
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5162 src/protocols/toc/toc.c:1180
+#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5382
+#: src/protocols/oscar/oscar.c:5393
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5391
+#: src/protocols/oscar/oscar.c:5402
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5398
+#: src/protocols/oscar/oscar.c:5409
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>可用:</b>"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5423
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5416 src/gtkblist.c:895
+#: src/protocols/oscar/oscar.c:5427 src/gtkblist.c:895
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:5457
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5688
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:5711
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5704
+#: src/protocols/oscar/oscar.c:5714
 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:5849
+#: src/protocols/oscar/oscar.c:5859
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5893
+#: src/protocols/oscar/oscar.c:5903
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:5924
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:5925
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:5931
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:5970
+#: src/protocols/oscar/oscar.c:5980
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5983
+#: src/protocols/oscar/oscar.c:5994
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6019
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6013
+#: src/protocols/oscar/oscar.c:6024
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3209,43 +3210,43 @@
 "%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
 "单击“重新请求认证”。"
 
-#: src/protocols/oscar/oscar.c:6029
+#: src/protocols/oscar/oscar.c:6040
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6030
+#: src/protocols/oscar/oscar.c:6041
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "孤独的人是可耻的,跟我聊聊吧!"
 
-#: src/protocols/oscar/oscar.c:6089
+#: src/protocols/oscar/oscar.c:6103
 msgid "Set Available Message"
 msgstr "设置可用消息"
 
-#: src/protocols/oscar/oscar.c:6103
+#: src/protocols/oscar/oscar.c:6117
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6114
+#: src/protocols/oscar/oscar.c:6128
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:6120
+#: src/protocols/oscar/oscar.c:6134
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/oscar/oscar.c:6140
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6132
+#: src/protocols/oscar/oscar.c:6146
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/oscar/oscar.c:6155
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:6163
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -3259,122 +3260,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6270 src/protocols/oscar/oscar.c:6272
+#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6303
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6294
+#: src/protocols/oscar/oscar.c:6308
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/toc/toc.c:173
+#: src/protocols/toc/toc.c:174
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:477
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:509
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:495
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:498
+#: src/protocols/toc/toc.c:524
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:501
+#: src/protocols/toc/toc.c:527
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:504
+#: src/protocols/toc/toc.c:530
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:507
+#: src/protocols/toc/toc.c:533
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:536
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:539
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:542
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:545
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:549
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败:%s。"
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:558
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:561
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:564
 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."
@@ -3382,37 +3383,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误:%s。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:569
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息:%s"
 
-#: src/protocols/toc/toc.c:563
+#: src/protocols/toc/toc.c:589
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:601
+#: src/protocols/toc/toc.c:627
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:666
+#: src/protocols/toc/toc.c:692
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:854
+#: src/protocols/toc/toc.c:880
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:858
+#: src/protocols/toc/toc.c:884
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:859
+#: src/protocols/toc/toc.c:885
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -3422,47 +3423,47 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1312
+#: src/protocols/toc/toc.c:1344
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1436
+#: src/protocols/toc/toc.c:1468
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1559
+#: src/protocols/toc/toc.c:1591
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1595
+#: src/protocols/toc/toc.c:1627
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1640 src/protocols/toc/toc.c:1680
-#: src/protocols/toc/toc.c:1892
+#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
+#: src/protocols/toc/toc.c:1924
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1804
+#: src/protocols/toc/toc.c:1836
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1837
+#: src/protocols/toc/toc.c:1869
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:1937 src/gtkft.c:1060
+#: src/protocols/toc/toc.c:1969 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:1971
+#: src/protocols/toc/toc.c:2003
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1978
+#: src/protocols/toc/toc.c:2010
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -3477,15 +3478,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2053 src/protocols/toc/toc.c:2055
+#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2072
+#: src/protocols/toc/toc.c:2104
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2108
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -3495,12 +3496,12 @@
 msgstr "基本信息"
 
 #. First Name
-#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1971 src/dialogs.c:2625
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1990 src/dialogs.c:2644
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1994 src/dialogs.c:2645
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:2013 src/dialogs.c:2664
 msgid "Last Name"
 msgstr "姓"
 
@@ -3559,7 +3560,7 @@
 msgstr "来自"
 
 #. State
-#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2027 src/dialogs.c:2674
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2046 src/dialogs.c:2693
 msgid "State"
 msgstr "州/省"
 
@@ -3568,9 +3569,9 @@
 msgid "Set your Trepia profile data."
 msgstr "设置您的 Trepia 资料。"
 
-#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2069 src/dialogs.c:2250
-#: src/dialogs.c:3415 src/dialogs.c:4219 src/dialogs.c:4949
-#: src/gtkrequest.c:175
+#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2088 src/dialogs.c:2269
+#: src/dialogs.c:3435 src/dialogs.c:4240 src/dialogs.c:4878
+#: src/gtkrequest.c:177
 msgid "Save"
 msgstr "保存"
 
@@ -3608,51 +3609,43 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:587
+#: src/protocols/yahoo/yahoo.c:592
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1259
-#: src/protocols/yahoo/yahoo.c:1333
+#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1054 src/protocols/yahoo/yahoo.c:1261
-#: src/protocols/yahoo/yahoo.c:1334
+#: src/protocols/yahoo/yahoo.c:1059 src/protocols/yahoo/yahoo.c:1267
+#: src/protocols/yahoo/yahoo.c:1340
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1263
-#: src/protocols/yahoo/yahoo.c:1335
+#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1269
+#: src/protocols/yahoo/yahoo.c:1341
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1267
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1343
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:1064 src/protocols/yahoo/yahoo.c:1271
-#: src/protocols/yahoo/yahoo.c:1339
+#: src/protocols/yahoo/yahoo.c:1069 src/protocols/yahoo/yahoo.c:1277
+#: src/protocols/yahoo/yahoo.c:1345
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:1180
+#: src/protocols/yahoo/yahoo.c:1185
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:1191
+#: src/protocols/yahoo/yahoo.c:1196
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:1416
-msgid "Pager Host:"
-msgstr "寻呼主机:"
-
-#: src/protocols/yahoo/yahoo.c:1422
-msgid "Pager Port:"
-msgstr "寻呼端口:"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3663,15 +3656,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1508 src/protocols/yahoo/yahoo.c:1510
+#: src/protocols/yahoo/yahoo.c:1465 src/protocols/yahoo/yahoo.c:1467
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:1527
+#: src/protocols/yahoo/yahoo.c:1484
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:1532
+#: src/protocols/yahoo/yahoo.c:1489
 msgid "Pager port"
 msgstr "寻呼端口"
 
@@ -3804,31 +3797,31 @@
 "Spencer (原始作者) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (骇客和专属驱动程序[lazy bum])<BR><BR>"
 
-#: src/away.c:223
+#: src/away.c:222
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
 
-#: src/away.c:283
+#: src/away.c:282
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:388
+#: src/away.c:384
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:408
+#: src/away.c:404
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
-#: src/away.c:603
+#: src/away.c:599
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:379 src/gtkprefs.c:2274
+#: src/blist.c:427 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:703
+#: src/blist.c:751
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3837,33 +3830,33 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:708
+#: src/blist.c:756
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:898
+#: src/blist.c:947
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:1654
+#: src/blist.c:1703
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:1656
+#: src/blist.c:1705
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1664
+#: src/blist.c:1713
 #, 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:1667
+#: src/blist.c:1716
 msgid "Converting Buddy List"
 msgstr "正在转换好友列表"
 
@@ -3884,7 +3877,7 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "调用您选择的浏览器 %s 出错"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1325
+#: src/buddy_chat.c:316 src/dialogs.c:1333
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3907,64 +3900,64 @@
 msgid "Join"
 msgstr "加入"
 
-#: src/conversation.c:399
+#: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:407
+#: src/conversation.c:413
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1914
+#: src/conversation.c:1926
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1917
+#: src/conversation.c:1929
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:1967
+#: src/conversation.c:1979
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2009
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2011
+#: src/conversation.c:2023
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2224
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2214
+#: src/conversation.c:2226
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2216
+#: src/conversation.c:2228
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2218
+#: src/conversation.c:2230
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:345
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:348
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3976,89 +3969,89 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:372
+#: src/dialogs.c:373
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:380
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:449
+#: src/dialogs.c:455
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:451 src/dialogs.c:452
+#: src/dialogs.c:457 src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:460
+#: src/dialogs.c:467
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:462 src/dialogs.c:463
+#: src/dialogs.c:469 src/dialogs.c:470
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:471
+#: src/dialogs.c:479
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:474 src/dialogs.c:475
+#: src/dialogs.c:482 src/dialogs.c:483
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:624
+#: src/dialogs.c:632
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:642
+#: src/dialogs.c:650
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:658 src/dialogs.c:735 src/dialogs.c:3747
+#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
+#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:712
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:723
+#: src/dialogs.c:731
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:906
 msgid "Please enter the name of the group to be added.\n"
 msgstr "请输入要添加的组名称。\n"
 
-#: src/dialogs.c:907 src/dialogs.c:4298
+#: src/dialogs.c:915 src/dialogs.c:4319
 msgid "_Group:"
 msgstr "组(_G):"
 
-#: src/dialogs.c:943
+#: src/dialogs.c:951
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:970
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -4067,319 +4060,311 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/dialogs.c:981
+#: src/dialogs.c:989
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/dialogs.c:994
+#: src/dialogs.c:1002
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:1004
+#: src/dialogs.c:1012
 msgid "Group"
 msgstr "组"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1013
+#: src/dialogs.c:1021
 msgid "Add To"
 msgstr "添加到"
 
-#: src/dialogs.c:1332
+#: src/dialogs.c:1340
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1363
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/dialogs.c:1364
+#: src/dialogs.c:1372
 msgid "Account:"
 msgstr "账户:"
 
-#: src/dialogs.c:1383 src/gtkaccount.c:455
+#: src/dialogs.c:1391 src/gtkaccount.c:431
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1402
 msgid "Group:"
 msgstr "组:"
 
-#: src/dialogs.c:1731
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/dialogs.c:1742
+#: src/dialogs.c:1764
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:1773
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/dialogs.c:1768
+#: src/dialogs.c:1790
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/dialogs.c:1772
+#: src/dialogs.c:1794
 msgid "Allow only users on my buddy list"
 msgstr "只允许我的好友联系我"
 
-#: src/dialogs.c:1776
+#: src/dialogs.c:1798
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/dialogs.c:1814
+#: src/dialogs.c:1836
 msgid "Deny all users"
 msgstr "拒绝所有用户"
 
-#: src/dialogs.c:1818
+#: src/dialogs.c:1840
 msgid "Block the users below"
 msgstr "屏蔽以下用户"
 
-#: src/dialogs.c:1937
+#: src/dialogs.c:1956
 msgid "Set Directory Info"
 msgstr "设置目录信息"
 
-#: src/dialogs.c:1945
+#: src/dialogs.c:1964
 msgid "Directory Info"
 msgstr "目录信息"
 
-#: src/dialogs.c:1955
+#: src/dialogs.c:1974
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "设置 %s 的目录信息:"
 
-#: src/dialogs.c:1968
+#: src/dialogs.c:1987
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许搜索引擎查找您的信息"
 
 #. Line 2
-#: src/dialogs.c:1982 src/dialogs.c:2635
+#: src/dialogs.c:2001 src/dialogs.c:2654
 msgid "Middle Name"
 msgstr "中名"
 
 #. Line 4
-#: src/dialogs.c:2005 src/dialogs.c:2655
+#: src/dialogs.c:2024 src/dialogs.c:2674
 msgid "Maiden Name"
 msgstr "娘家名"
 
-#: src/dialogs.c:2092
+#: src/dialogs.c:2111
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/dialogs.c:2098
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/dialogs.c:2143
+#: src/dialogs.c:2162
 #, c-format
 msgid "Changing password for %s:"
 msgstr "更改 %s 的密码:"
 
-#: src/dialogs.c:2151
+#: src/dialogs.c:2170
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2181
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:2173
+#: src/dialogs.c:2192
 msgid "New Password (again)"
 msgstr "再次输入新密码"
 
-#: src/dialogs.c:2222
+#: src/dialogs.c:2241
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的信息:"
 
-#: src/dialogs.c:2308
+#: src/dialogs.c:2327
 msgid "Below are the results of your search: "
 msgstr "下面是您搜索的结果:"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2438
 msgid "Permit"
 msgstr "许可"
 
-#: src/dialogs.c:2451
+#: src/dialogs.c:2470
 msgid "Add Permit"
 msgstr "添加许可"
 
-#: src/dialogs.c:2453
+#: src/dialogs.c:2472
 msgid "Add Deny"
 msgstr "添加拒绝"
 
-#: src/dialogs.c:2520
+#: src/dialogs.c:2539
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2601 src/dialogs.c:2734
+#: src/dialogs.c:2620 src/dialogs.c:2753
 msgid "Search for Buddy"
 msgstr "搜索好友"
 
-#: src/dialogs.c:2701
+#: src/dialogs.c:2720
 msgid "Find Buddy By Info"
 msgstr "按信息查找好友"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2747
 msgid "Find Buddy By Email"
 msgstr "按电子邮件查找好友"
 
-#: src/dialogs.c:2832
+#: src/dialogs.c:2851
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2834
+#: src/dialogs.c:2853
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2853
+#: src/dialogs.c:2872
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
 
-#: src/dialogs.c:3022 src/dialogs.c:3039
+#: src/dialogs.c:3041 src/dialogs.c:3058
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:3074 src/dialogs.c:3091
+#: src/dialogs.c:3093 src/dialogs.c:3110
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:3188 src/dialogs.c:3214
+#: src/dialogs.c:3207 src/dialogs.c:3233
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:3279
+#: src/dialogs.c:3299
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:3281
+#: src/dialogs.c:3301
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:3291
+#: src/dialogs.c:3311
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:3356 src/dialogs.c:3364
+#: src/dialogs.c:3376 src/dialogs.c:3384
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:3374
+#: src/dialogs.c:3394
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:3419
+#: src/dialogs.c:3439
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:3423
+#: src/dialogs.c:3443
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3572
+#: src/dialogs.c:3592
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3618
+#: src/dialogs.c:3638
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3647
+#: src/dialogs.c:3667
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "请输入此聊天的别名。\n"
 
-#: src/dialogs.c:3659 src/dialogs.c:3761
+#: src/dialogs.c:3679 src/dialogs.c:3782
 msgid "_Alias:"
 msgstr "别名(_A):"
 
-#: src/dialogs.c:3696
+#: src/dialogs.c:3716
 msgid "Alias Buddy"
 msgstr "好友别名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3726
+#: src/dialogs.c:3746
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
 
-#: src/dialogs.c:3815 src/dialogs.c:3822
+#: src/dialogs.c:3836 src/dialogs.c:3843
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3846
+#: src/dialogs.c:3867
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3876
+#: src/dialogs.c:3897
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3895
+#: src/dialogs.c:3916
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3904
+#: src/dialogs.c:3925
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3970
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:4091
+#: src/dialogs.c:4112
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:4093
+#: src/dialogs.c:4114
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:4114
+#: src/dialogs.c:4135
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "无法打开日志文件 %s"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:4156
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4192
+#: src/dialogs.c:4213
 msgid "Log"
 msgstr "日志"
 
-#: src/dialogs.c:4214
+#: src/dialogs.c:4235
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4272
+#: src/dialogs.c:4293
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:4289
+#: src/dialogs.c:4310
 msgid "Please enter a new name for the selected group.\n"
 msgstr "请输入选中组的新名字。\n"
 
-#: src/dialogs.c:4365 src/dialogs.c:4374
-msgid "Rename Buddy"
-msgstr "重命名好友"
-
-#: src/dialogs.c:4381
-msgid "New name:"
-msgstr "新名字:"
-
 #: src/ft.c:121
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -4482,20 +4467,20 @@
 "关闭 Gaim 的运行副本\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:41
+#: src/gaimrc.c:42
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:360 src/gaimrc.c:1503
+#: src/gaimrc.c:363 src/gaimrc.c:1506
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1601
+#: src/gaimrc.c:1604
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkaccount.c:280
+#: src/gtkaccount.c:256
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4507,142 +4492,142 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:355
+#: src/gtkaccount.c:331
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:348
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:377
+#: src/gtkaccount.c:353
 msgid "Screenname:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:459
+#: src/gtkaccount.c:435
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:513
+#: src/gtkaccount.c:489
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:526
+#: src/gtkaccount.c:502
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:535
+#: src/gtkaccount.c:511
 msgid "Buddy icon file:"
 msgstr "好友图标文件:"
 
-#: src/gtkaccount.c:544
+#: src/gtkaccount.c:520
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: src/gtkaccount.c:550
+#: src/gtkaccount.c:526
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:611
+#: src/gtkaccount.c:587
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:732
+#: src/gtkaccount.c:708
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:715
 msgid "No Proxy"
 msgstr "无代理"
 
 #. SOCKS 4
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:722
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:729
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. HTTP
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:736
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/gtkaccount.c:792
+#: src/gtkaccount.c:768
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:772
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:812
+#: src/gtkaccount.c:788
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:828 src/gtkprefs.c:1099
+#: src/gtkaccount.c:804 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:837
+#: src/gtkaccount.c:813
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:841
+#: src/gtkaccount.c:817
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:849
+#: src/gtkaccount.c:825
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:854
+#: src/gtkaccount.c:830
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1165
+#: src/gtkaccount.c:1141
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1167
+#: src/gtkaccount.c:1143
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1191
+#: src/gtkaccount.c:1167
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1168
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1220
+#: src/gtkaccount.c:1196
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1507
+#: src/gtkaccount.c:1483
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1511 src/gtkrequest.c:172
+#: src/gtkaccount.c:1487 src/gtkrequest.c:174
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1589
+#: src/gtkaccount.c:1565
 msgid "Screenname"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1630
+#: src/gtkaccount.c:1606
 msgid "Protocol"
 msgstr "协议"
 
@@ -4890,7 +4875,7 @@
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:1391 src/gtkprefs.c:844 src/gtkprefs.c:1518
+#: src/gtkblist.c:1391 src/gtkprefs.c:842 src/gtkprefs.c:1516
 msgid "None"
 msgstr "无"
 
@@ -4906,7 +4891,7 @@
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:1430 src/gtkprefs.c:2271
+#: src/gtkblist.c:1430 src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -4933,7 +4918,7 @@
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1563 src/gtkconv.c:1055
+#: src/gtkblist.c:1563 src/gtkconv.c:1072
 msgid "IM"
 msgstr "开聊"
 
@@ -4953,372 +4938,359 @@
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2584
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:57 src/gtkconn.c:237 src/gtkconn.c:254 src/gtkconn.c:363
-#: src/multi.c:91
+#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:132 src/multi.c:167
+#: src/gtkconn.c:135
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:190 src/multi.c:225
+#: src/gtkconn.c:193
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:203 src/multi.c:237
+#: src/gtkconn.c:206
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:354 src/multi.c:292
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s:%s"
-
-#: src/gtkconn.c:376 src/multi.c:314
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s 无法登入"
-
-#: src/gtkconn.c:378 src/multi.c:316
-msgid "Signon Error"
-msgstr "登入出错"
-
-#: src/gtkconn.c:391 src/multi.c:329
-msgid "Notice"
-msgstr "注意"
-
-#: src/gtkconn.c:405 src/multi.c:343
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 已经登出"
-
-#: src/gtkconn.c:407 src/multi.c:345
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: src/gtkconv.c:262
+#: src/gtkconv.c:183
+#, fuzzy
+msgid "That file already exists"
+msgstr "该文件不存在。"
+
+#: src/gtkconv.c:184 src/gtkft.c:1034
+msgid "Would you like to overwrite it?"
+msgstr "您是否想要覆盖?"
+
+#: src/gtkconv.c:279
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:564
+#: src/gtkconv.c:581
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:592
+#: src/gtkconv.c:609
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:613
+#: src/gtkconv.c:630
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:650
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1063
+#: src/gtkconv.c:1080
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1065 src/gtkprefs.c:774
+#: src/gtkconv.c:1082 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1074 src/gtkconv.c:2961
+#: src/gtkconv.c:1091 src/gtkconv.c:2987
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1094 src/gtkconv.c:2944 src/gtkconv.c:4080
-#: src/gtkrequest.c:174
+#: src/gtkconv.c:1111 src/gtkconv.c:2970 src/gtkconv.c:4109
+#: src/gtkrequest.c:176
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2173
+#: src/gtkconv.c:2200
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2181
+#: src/gtkconv.c:2208
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2284
+#: src/gtkconv.c:2310
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:2740
+#: src/gtkconv.c:2766
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2783
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2759
+#: src/gtkconv.c:2785
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2761
+#: src/gtkconv.c:2787
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2765
+#: src/gtkconv.c:2791
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2767
+#: src/gtkconv.c:2793
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:2769
+#: src/gtkconv.c:2795
 msgid "/Conversation/_Get Info..."
 msgstr "/对话(C)/获取信息(_G)..."
 
-#: src/gtkconv.c:2771
+#: src/gtkconv.c:2797
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2802
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2804
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2783
+#: src/gtkconv.c:2809
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:2785
+#: src/gtkconv.c:2811
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2787
+#: src/gtkconv.c:2813
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2789
+#: src/gtkconv.c:2815
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2794
+#: src/gtkconv.c:2820
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2798
+#: src/gtkconv.c:2824
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2799
+#: src/gtkconv.c:2825
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2840
+#: src/gtkconv.c:2866
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2845
+#: src/gtkconv.c:2871
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:2849
+#: src/gtkconv.c:2875
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:2853
+#: src/gtkconv.c:2879
 msgid "/Conversation/Get Info..."
 msgstr "/对话(C)/获取信息(G)..."
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2883
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:2863
+#: src/gtkconv.c:2889
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2867
+#: src/gtkconv.c:2893
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2873
+#: src/gtkconv.c:2899
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:2903
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:2881
+#: src/gtkconv.c:2907
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:2885
+#: src/gtkconv.c:2911
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:2891
+#: src/gtkconv.c:2917
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2920
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2918 src/gtkconv.c:2920 src/gtkconv.c:3018 src/gtkconv.c:3020
-#: src/gtkconv.c:5653
+#: src/gtkconv.c:2944 src/gtkconv.c:2946 src/gtkconv.c:3044 src/gtkconv.c:3046
+#: src/gtkconv.c:5683
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2941 src/gtkconv.c:4098
+#: src/gtkconv.c:2967 src/gtkconv.c:4127
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2947 src/gtkconv.c:4083
+#: src/gtkconv.c:2973 src/gtkconv.c:4112
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2954
+#: src/gtkconv.c:2980
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:2984
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2965 src/gtkconv.c:3398
+#: src/gtkconv.c:2991 src/gtkconv.c:3426
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:2968
+#: src/gtkconv.c:2994
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:2998
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:3030 src/gtkconv.c:5656
+#: src/gtkconv.c:3056 src/gtkconv.c:5686
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3059
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3072
+#: src/gtkconv.c:3098
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3083
+#: src/gtkconv.c:3109
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3120
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3136
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3122
+#: src/gtkconv.c:3148
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3160
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3177
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3189
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3201
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3216
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3201
+#: src/gtkconv.c:3227
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3212
+#: src/gtkconv.c:3238
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3269
+#: src/gtkconv.c:3295
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3346
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3375
+#: src/gtkconv.c:3403
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3387
+#: src/gtkconv.c:3415
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3918
+#: src/gtkconv.c:3911 src/server.c:1298
+#, c-format
+msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+msgstr ""
+
+#: src/gtkconv.c:3915 src/server.c:1301
+#, fuzzy, c-format
+msgid "---- New Conversation @ %s ----\n"
+msgstr "与 %s 的对话"
+
+#: src/gtkconv.c:3947
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4575 src/gtkconv.c:4697
+#: src/gtkconv.c:4605 src/gtkconv.c:4727
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:4971
+#: src/gtkconv.c:5001
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:4980
+#: src/gtkconv.c:5010
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:4987
+#: src/gtkconv.c:5017
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:4993
+#: src/gtkconv.c:5023
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
@@ -5410,10 +5382,6 @@
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
-#: src/gtkft.c:1034
-msgid "Would you like to overwrite it?"
-msgstr "您是否想要覆盖?"
-
 #: src/gtkft.c:1058
 msgid "Gaim - Open..."
 msgstr "Gaim - 打开..."
@@ -5423,50 +5391,50 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:498
+#: src/gtkimhtml.c:530
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:505
+#: src/gtkimhtml.c:537
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1599
+#: src/gtkimhtml.c:1642
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1607
+#: src/gtkimhtml.c:1650
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1616
+#: src/gtkimhtml.c:1659
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:1638
+#: src/gtkimhtml.c:1681
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtknotify.c:193
+#: src/gtknotify.c:199
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:201
+#: src/gtknotify.c:207
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:206
+#: src/gtknotify.c:212
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:210
+#: src/gtknotify.c:216
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5477,7 +5445,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:225
+#: src/gtknotify.c:231
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5572,7 +5540,7 @@
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:517 src/gtkprefs.c:2098
+#: src/gtkpounce.c:517 src/gtkprefs.c:2097
 msgid "Test"
 msgstr "测试"
 
@@ -5691,7 +5659,7 @@
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:996 src/gtkprefs.c:1049
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "显示"
 
@@ -5743,414 +5711,415 @@
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:801
-msgid "Control-_W closes window"
-msgstr "Ctrl+W 键关闭窗口(_W)"
-
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "插入"
 
+#: src/gtkprefs.c:803
+#, fuzzy
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
+
 #: src/gtkprefs.c:805
-msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
-
-#: src/gtkprefs.c:807
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "排序:"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
+#: src/gtkprefs.c:837 src/gtkprefs.c:964 src/gtkprefs.c:1020
+msgid "Show _buttons as:"
+msgstr "将按钮显示为(_B):"
+
 #: src/gtkprefs.c:839 src/gtkprefs.c:966 src/gtkprefs.c:1022
-msgid "Show _buttons as:"
-msgstr "将按钮显示为(_B):"
-
-#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:842 src/gtkprefs.c:969 src/gtkprefs.c:1025
+#: src/gtkprefs.c:840 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:843 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:846
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:851
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "分组显示"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "在分组旁显示数字(_N)"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:857 src/gtkprefs.c:991
+#: src/gtkprefs.c:855 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:2272
+#: src/gtkprefs.c:894 src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "对话"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:907
 msgid "Send _URLs as Links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:910
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:915 src/gtkprefs.c:926
+#: src/gtkprefs.c:913 src/gtkprefs.c:924
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:917 src/gtkprefs.c:927
+#: src/gtkprefs.c:915 src/gtkprefs.c:925
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:928
+#: src/gtkprefs.c:917 src/gtkprefs.c:926
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:921 src/gtkprefs.c:929
+#: src/gtkprefs.c:919 src/gtkprefs.c:927
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:922
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:933
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:936
 msgid "Show _close button on tabs."
 msgstr "在标签上显示关闭按钮(_C)。"
 
-#: src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:978 src/gtkprefs.c:1034
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:981 src/gtkprefs.c:1037
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:984 src/gtkprefs.c:1040
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise windows on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1043
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
+#: src/gtkprefs.c:1050
+msgid "_Show people leaving in window"
+msgstr "在窗口中显示离开的人(_S)"
+
 #: src/gtkprefs.c:1052
-msgid "_Show people leaving in window"
-msgstr "在窗口中显示离开的人(_S)"
-
-#: src/gtkprefs.c:1054
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1098
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1101
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1107
+#: src/gtkprefs.c:1105
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1125
 msgid "_Host"
 msgstr "主机(_H)"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1160
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/gtkprefs.c:1179
+#: src/gtkprefs.c:1177
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1233
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "手动输入的浏览器“%s”无效。超级链接无法工作。"
 
+#: src/gtkprefs.c:1253
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1254
+msgid "Netscape"
+msgstr "Netscape"
+
 #: src/gtkprefs.c:1255
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1256
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1256
-msgid "Opera"
-msgstr "Opera"
-
 #: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1258
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1259
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1266
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1307
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1311
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1323
-msgid "_Manual: "
-msgstr "手动(_M):"
-
-#: src/gtkprefs.c:1344
+#: src/gtkprefs.c:1321
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+#: src/gtkprefs.c:1342
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1343
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1358
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1359
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1363
+#: src/gtkprefs.c:1361
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1363
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/gtkprefs.c:1368
+#: src/gtkprefs.c:1366
 msgid "System Logs"
 msgstr "系统日志"
 
+#: src/gtkprefs.c:1367
+msgid "Log when buddies _sign on/sign off"
+msgstr "记录好友的登入/登出(_S)"
+
 #: src/gtkprefs.c:1369
-msgid "Log when buddies _sign on/sign off"
-msgstr "记录好友的登入/登出(_S)"
+msgid "Log when buddies become _idle/un-idle"
+msgstr "记录好友的瞌睡(_I)"
 
 #: src/gtkprefs.c:1371
-msgid "Log when buddies become _idle/un-idle"
-msgstr "记录好友的瞌睡(_I)"
+msgid "Log when buddies go away/come _back"
+msgstr "记录好友的离开/回来(_B)"
 
 #: src/gtkprefs.c:1373
-msgid "Log when buddies go away/come _back"
-msgstr "记录好友的离开/回来(_B)"
+msgid "Log your _own signons/idleness/awayness"
+msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
 #: src/gtkprefs.c:1375
-msgid "Log your _own signons/idleness/awayness"
-msgstr "记录您自己的登入/瞌睡/离开(_O)"
-
-#: src/gtkprefs.c:1377
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/gtkprefs.c:1420
+#: src/gtkprefs.c:1418
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1419
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1421
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1425
 msgid "Sound Method"
 msgstr "声音方式"
 
+#: src/gtkprefs.c:1426
+#, fuzzy
+msgid "_Method:"
+msgstr "方式(_M)"
+
 #: src/gtkprefs.c:1428
-msgid "_Method"
-msgstr "方式(_M)"
+msgid "Console beep"
+msgstr "控制台响铃"
 
 #: src/gtkprefs.c:1430
-msgid "Console beep"
-msgstr "控制台响铃"
-
-#: src/gtkprefs.c:1432
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1437
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1449
-#, c-format
+#: src/gtkprefs.c:1447
+#, fuzzy, c-format
 msgid ""
-"Sound c_ommand\n"
+"Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 "声音命令(_O)\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1492
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1494
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1497
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1500
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1503
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1505
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1507
 msgid "Send auto-response in active conversations"
 msgstr "在当前对话中发送自动回复"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1514
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1517
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1520
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1522
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1532
+#: src/gtkprefs.c:1530
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1533
+#: src/gtkprefs.c:1531
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1535
+#: src/gtkprefs.c:1533
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1542
+#: src/gtkprefs.c:1540
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1604
+#: src/gtkprefs.c:1602
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -6165,7 +6134,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1607
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -6180,100 +6149,100 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1785
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1792
 msgid "Name"
 msgstr "名称"
 
-#: src/gtkprefs.c:1840
+#: src/gtkprefs.c:1839
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:1965
+#: src/gtkprefs.c:1964
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2072
+#: src/gtkprefs.c:2071
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2079
+#: src/gtkprefs.c:2078
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2101
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2106
+#: src/gtkprefs.c:2105
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2278
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2283
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2284
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2287
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkrequest.c:170
+#: src/gtkrequest.c:172
 msgid "Apply"
 msgstr "应用"
 
@@ -6381,7 +6350,7 @@
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/html.c:304
+#: src/html.c:305
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
@@ -6503,23 +6472,23 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
 
-#: src/main.c:234
+#: src/main.c:235
 msgid "Please enter your login."
 msgstr "请输入您的登录名。"
 
-#: src/main.c:326
+#: src/main.c:323
 msgid "<New User>"
 msgstr "<新用户>"
 
-#: src/main.c:368
+#: src/main.c:365
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:384
+#: src/main.c:381
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/main.c:434 src/win32/systray.c:197
+#: src/main.c:431
 msgid "Sign On"
 msgstr "登入"
 
@@ -6549,34 +6518,34 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:821
+#: src/request.h:823
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:57
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:898
+#: src/server.c:874
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 条消息)"
 
-#: src/server.c:910
+#: src/server.c:886
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1108 src/server.c:1118
+#: src/server.c:1084 src/server.c:1094
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1136 src/server.c:1144
+#: src/server.c:1112 src/server.c:1120
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1185
+#: src/server.c:1161
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6585,11 +6554,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1188
+#: src/server.c:1164
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1278
+#: src/server.c:1254
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6598,20 +6567,20 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1282
+#: src/server.c:1258
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1288
+#: src/server.c:1264
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/server.c:1461
+#: src/server.c:1436
 msgid "Gaim - Popup"
 msgstr "Gaim - 弹出窗口"
 
-#: src/server.c:1488
+#: src/server.c:1463
 msgid "More Info"
 msgstr "更多信息"
 
@@ -6646,37 +6615,6 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: src/win32/systray.c:42
-msgid "Gaim Instant Messenger"
-msgstr "Gaim 即时通讯程序"
-
-#: src/win32/systray.c:43
-msgid "Gaim Instant Messenger - Signed off"
-msgstr "Gaim 即时通讯程序 - 已登出"
-
-#: src/win32/systray.c:44
-msgid "Gaim Instant Messenger - Away"
-msgstr "Gaim 即时通讯程序 - 离开"
-
-#: src/win32/systray.c:140
-msgid "New"
-msgstr "新建"
-
-#: src/win32/systray.c:173
-msgid "Set Away Message"
-msgstr "设置离开消息"
-
-#: src/win32/systray.c:182
-msgid "I'm Back"
-msgstr "我回来了"
-
-#: src/win32/systray.c:371
-msgid "Exit"
-msgstr "退出"
-
 #: src/plugin.c:222
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
@@ -6691,10 +6629,76 @@
 msgid "Custom"
 msgstr "自定义"
 
-#: src/gtkdebug.c:141
+#: src/gtkdebug.c:142
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:184
+#: src/gtkdebug.c:182
+#, fuzzy
+msgid "Pause"
+msgstr "暂停(_P)"
+
+#: src/gtkdebug.c:188
 msgid "Timestamps"
 msgstr "时间戳"
+
+#~ msgid "Pager Host:"
+#~ msgstr "寻呼主机:"
+
+#~ msgid "Pager Port:"
+#~ msgstr "寻呼端口:"
+
+#~ msgid "Rename Buddy"
+#~ msgstr "重命名好友"
+
+#~ msgid "New name:"
+#~ msgstr "新名字:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "%s: %s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s:%s"
+
+#~ msgid "%s was unable to sign on"
+#~ msgstr "%s 无法登入"
+
+#~ msgid "Signon Error"
+#~ msgstr "登入出错"
+
+#~ msgid "Notice"
+#~ msgstr "注意"
+
+#~ msgid "%s has been signed off"
+#~ msgstr "%s 已经登出"
+
+#~ msgid "Connection Error"
+#~ msgstr "连接错误"
+
+#~ msgid "Control-_W closes window"
+#~ msgstr "Ctrl+W 键关闭窗口(_W)"
+
+#~ msgid "_Manual: "
+#~ msgstr "手动(_M):"
+
+#~ msgid "Gaim Instant Messenger"
+#~ msgstr "Gaim 即时通讯程序"
+
+#~ msgid "Gaim Instant Messenger - Signed off"
+#~ msgstr "Gaim 即时通讯程序 - 已登出"
+
+#~ msgid "Gaim Instant Messenger - Away"
+#~ msgstr "Gaim 即时通讯程序 - 离开"
+
+#~ msgid "New"
+#~ msgstr "新建"
+
+#~ msgid "Set Away Message"
+#~ msgstr "设置离开消息"
+
+#~ msgid "I'm Back"
+#~ msgstr "我回来了"
+
+#~ msgid "Exit"
+#~ msgstr "退出"