changeset 7869:a8e306f40093

[gaim-migrate @ 8523] and again committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 14 Dec 2003 17:28:30 +0000
parents adcd6208ff43
children 30ee5c52b8dc
files po/zh_CN.po
diffstat 1 files changed, 1100 insertions(+), 1164 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Sun Dec 14 17:26:07 2003 +0000
+++ b/po/zh_CN.po	Sun Dec 14 17:28:30 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-11-30 00:02-0800\n"
-"PO-Revision-Date: 2003-11-30 16:51+0800\n"
+"POT-Creation-Date: 2003-12-14 00:00-0500\n"
+"PO-Revision-Date: 2003-12-14 19:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -144,12 +144,12 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2374 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:5537
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:5552
+#: src/protocols/oscar/oscar.c:6153
 msgid "Away"
 msgstr "离开"
 
@@ -161,16 +161,16 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
 msgid "Preferences"
 msgstr "首选项"
 
@@ -286,19 +286,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 演示插件"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "一个范例插件 - 参看描述。"
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -363,44 +363,15 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Gnome 股票机属性"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "更新频率(分钟)"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "在下面的框中输入以“+”分隔的股票代码。"
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "选中此框将只显示代码和股价:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "选中此框将从左到右滚动:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(无"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "变化"
-
-#: plugins/history.c:75
+#: plugins/history.c:74
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:77
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:78
+#: plugins/history.c:77
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -752,14 +723,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:194
+#: plugins/ssl/ssl-gnutls.c:208
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:197 plugins/ssl/ssl-gnutls.c:199
+#: plugins/ssl/ssl-gnutls.c:211 plugins/ssl/ssl-gnutls.c:213
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
 
@@ -839,11 +810,11 @@
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -962,8 +933,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2208
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -982,8 +953,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
+#: src/gtkprefs.c:2267
 msgid "Conversations"
 msgstr "对话"
 
@@ -1050,168 +1021,167 @@
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:146
-msgid "former libfaim maintainer"
-msgstr "先前 libfaim 维护者"
-
 #: src/about.c:147
+msgid "former libfaim maintainer"
+msgstr "先前 libfaim 维护者"
+
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:155
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:163
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:164 src/about.c:197
+#: src/about.c:165 src/about.c:198
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:165 src/about.c:198
+#: src/about.c:166 src/about.c:199
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "Esperanto"
 msgstr "世界语"
 
-#: src/about.c:168 src/about.c:199
+#: src/about.c:169 src/about.c:200
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:169 src/about.c:200
+#: src/about.c:170 src/about.c:201
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:170 src/about.c:201
+#: src/about.c:171 src/about.c:202
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:172 src/about.c:203
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:172
-msgid "Hindi"
-msgstr "印地语"
-
 #: src/about.c:173
+msgid "Hindi"
+msgstr "印地语"
+
+#: src/about.c:174
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:174 src/about.c:204
+#: src/about.c:175 src/about.c:205
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:175 src/about.c:206
+#: src/about.c:176 src/about.c:207
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:179 src/about.c:208
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:181
+#: src/about.c:182
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:183 src/about.c:209
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:185 src/about.c:211
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:186
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/about.c:187
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/about.c:188
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:195
-msgid "Amharic"
-msgstr "阿姆哈拉语"
-
 #: src/about.c:196
+msgid "Amharic"
+msgstr "阿姆哈拉语"
+
+#: src/about.c:197
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:203
+#: src/about.c:204
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:205
+#: src/about.c:206
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:209
+#: src/about.c:210
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:211
+#: src/about.c:212
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:224 src/dialogs.c:2180 src/gtkrequest.c:198
-#: src/protocols/msn/msn.c:247
+#: src/about.c:225 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "关闭"
 
@@ -1240,56 +1210,53 @@
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:331
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1574
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1491
+#: src/dialogs.c:1508 src/dialogs.c:1527 src/gtkblist.c:1730
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6188 src/protocols/oscar/oscar.c:6284
-#: src/protocols/oscar/oscar.c:6333 src/protocols/oscar/oscar.c:6415
-#: src/protocols/yahoo/yahoo.c:2261 src/request.h:852
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6203 src/protocols/oscar/oscar.c:6299
+#: src/protocols/oscar/oscar.c:6348 src/protocols/oscar/oscar.c:6430
+#: src/protocols/yahoo/yahoo.c:2337 src/request.h:852
 msgid "OK"
 msgstr "确定"
 
-#. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:371
-#: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
-#: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1575
-#: src/gtkblist.c:3511 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:352
+#: src/dialogs.c:364 src/dialogs.c:377 src/dialogs.c:398 src/dialogs.c:1333
+#: src/dialogs.c:1492 src/dialogs.c:1509 src/dialogs.c:1528
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
+#: src/gtkblist.c:3666 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
 #: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6016 src/protocols/oscar/oscar.c:6189
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6334
-#: src/protocols/oscar/oscar.c:6399 src/protocols/oscar/oscar.c:6416
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2262
+#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:6031 src/protocols/oscar/oscar.c:6204
+#: src/protocols/oscar/oscar.c:6300 src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6414 src/protocols/oscar/oscar.c:6431
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2338
 #: src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:361
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:368 src/dialogs.c:886 src/dialogs.c:1542 src/dialogs.c:2189
-#: src/gtkrequest.c:202 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:1321 src/gtkrequest.c:202
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
@@ -1313,16 +1280,16 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:551 src/gtkprefs.c:2267
+#: src/blist.c:566 src/gtkprefs.c:2269
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2991
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1134
+#: src/blist.c:1148
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1334,50 +1301,52 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1143
+#: src/blist.c:1157
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1193 src/gtkaccount.c:159 src/gtkutils.c:844
-#: src/protocols/jabber/auth.c:117 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:849
+#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1516
+#: src/blist.c:1530
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2159
+#: src/blist.c:2180
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:2161
+#: src/blist.c:2182
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3403
+#: src/buddy_chat.c:212 src/gtkblist.c:3558
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/buddy_chat.c:326
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:332
-msgid "Buddy Chat"
-msgstr "好友聊天"
-
-#: src/buddy_chat.c:342
-msgid "Join Chat As:"
-msgstr "加入聊天为:"
-
-#. Join button.
-#: src/buddy_chat.c:365
-msgid "Join"
-msgstr "加入"
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "请输入您想要加入的聊天的对应信息。\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:588 src/dialogs.c:663
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "账户(_A):"
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1405,66 +1374,66 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1915
+#: src/conversation.c:1916
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1918
+#: src/conversation.c:1919
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2045
+#: src/conversation.c:2046
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2048
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2120
+#: src/conversation.c:2121
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2122
+#: src/conversation.c:2123
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2404
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2406
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2408
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2410
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:307
+#: src/dialogs.c:200
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:310
+#: src/dialogs.c:203
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:219
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1476,47 +1445,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:228
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:235
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:348
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:360
 #, 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:469 src/dialogs.c:470
+#: src/dialogs.c:362 src/dialogs.c:363
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:372
 #, 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:482 src/dialogs.c:483
+#: src/dialogs.c:375 src/dialogs.c:376
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:393
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1525,227 +1494,141 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:503 src/dialogs.c:504
+#: src/dialogs.c:396 src/dialogs.c:397
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:652
-msgid "New Message"
-msgstr "新消息"
-
-#: src/dialogs.c:670
+#: src/dialogs.c:542
+msgid "New Instant Message"
+msgstr "新即时消息"
+
+#: src/dialogs.c:560
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:686 src/dialogs.c:763
+#: src/dialogs.c:572 src/dialogs.c:647
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:701 src/dialogs.c:779 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "账户(_A):"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:617
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:751
+#: src/dialogs.c:635
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1034
-#: src/protocols/oscar/oscar.c:6484 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "设置用户信息"
-
-#: src/dialogs.c:854
-#, c-format
-msgid "Changing info for %s:"
-msgstr "更改 %s 的信息:"
-
-#: src/dialogs.c:969
+#: src/dialogs.c:756
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:971
-msgid "Insert"
-msgstr "插入"
-
-#: src/dialogs.c:993
+#: src/dialogs.c:758
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: src/dialogs.c:781
 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:1011 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:632
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1021 src/gtkprefs.c:601 src/gtkprefs.c:1803
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "描述"
-
-#: src/dialogs.c:1157 src/dialogs.c:1174
+#: src/dialogs.c:794
+msgid "_URL:"
+msgstr "_URL:"
+
+#: src/dialogs.c:807
+msgid "_Description:"
+msgstr "描述(_D):"
+
+#: src/dialogs.c:936 src/dialogs.c:953
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:1209 src/dialogs.c:1226
+#: src/dialogs.c:988 src/dialogs.c:1005
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:1311 src/dialogs.c:1337
+#: src/dialogs.c:1090 src/dialogs.c:1116
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:1403
+#: src/dialogs.c:1182
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:1405
+#: src/dialogs.c:1184
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1194
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:1480 src/dialogs.c:1488
+#: src/dialogs.c:1259 src/dialogs.c:1267
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1277
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1325
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:1550
+#: src/dialogs.c:1329
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:1699
+#: src/dialogs.c:1470
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:1717
+#: src/dialogs.c:1488
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:1717
-msgid "Alias chat"
-msgstr "给聊天起名"
-
-#: src/dialogs.c:1718
-msgid "Please enter an aliased name for this chat."
+#: src/dialogs.c:1489
+msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:1734
+#: src/dialogs.c:1505
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:1734
-msgid "Alias contact"
-msgstr "给联系人起名"
-
-#: src/dialogs.c:1735
-msgid "Please enter an aliased name for this contact."
+#: src/dialogs.c:1506
+msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:1766
-msgid "_Screenname"
-msgstr "用户名(_S)"
-
-#: src/dialogs.c:1771 src/gtkblist.c:842 src/gtkblist.c:930 src/gtkblist.c:949
-msgid "_Alias"
-msgstr "别名(_A)"
-
-#: src/dialogs.c:1775
+#: src/dialogs.c:1523
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "输入 %s 的别名。"
+
+#: src/dialogs.c:1525
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/dialogs.c:1776
-msgid "Alias buddy"
-msgstr "好友别名"
-
-#: src/dialogs.c:1777
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。"
-
-#: src/dialogs.c:1813 src/dialogs.c:1820
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "无法写入 %s。"
-
-#: src/dialogs.c:1844
-msgid "Save Log File"
-msgstr "保存日志文件"
-
-#: src/dialogs.c:1872
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "无法删除文件 %s。"
-
-#: src/dialogs.c:1891
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "您即将删除 %s 的日志文件。您真的要这么做吗?"
-
-#: src/dialogs.c:1892 src/dialogs.c:2062
-msgid "System Log"
-msgstr "系统日志"
-
-#: src/dialogs.c:1893 src/dialogs.c:1895
-msgid "Remove Log"
-msgstr "删除日志"
-
-#: src/dialogs.c:1923 src/dialogs.c:2083
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "无法打开日志文件 %s。"
-
-#: src/dialogs.c:2060
-#, c-format
-msgid "Conversations with %s"
-msgstr "与 %s 的对话"
-
-#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:637
-msgid "Date"
-msgstr "日期"
-
-#: src/dialogs.c:2161
-msgid "Log"
-msgstr "日志"
-
-#: src/dialogs.c:2184
-msgid "Clear"
-msgstr "清除"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:693
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:695
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1758,7 +1641,7 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1779,11 +1662,11 @@
 "    选项:\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 未运行(会话 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1795,14 +1678,14 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1813,17 +1696,17 @@
 "想要发送的消息。“+”用来替代空格。请注意上面使用的内容 - 如果您想\n"
 "要从 shell 运行此命令,“&”就必须转码,否则命令将会在该处停止。\n"
 "同时,下列命令将打开和用户名开聊的对话窗口,而不发送消息:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "加入聊天:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...加入“PenguinLounge”聊天室。\n"
 "\n"
 "添加好友:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1840,15 +1723,15 @@
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2170
+#: src/gaimrc.c:1259 src/gtkblist.c:2326
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2171
+#: src/gaimrc.c:1261 src/gtkblist.c:2327
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2172
+#: src/gaimrc.c:1263 src/gtkblist.c:2328
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1868,7 +1751,7 @@
 "<b>文件大小:</b> %s\n"
 "<b>图像大小:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -1885,12 +1768,11 @@
 msgid "Screenname:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3143 src/gtkblist.c:3462
+#: src/gtkaccount.c:469 src/gtkblist.c:3298 src/gtkblist.c:3617
 msgid "Alias:"
 msgstr "别名:"
 
@@ -1951,7 +1833,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:782 src/gtkprefs.c:1103
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -1967,11 +1849,11 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:851 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:860 src/gtkprefs.c:1127
 msgid "_Host:"
 msgstr "主机(_H):"
 
@@ -1983,7 +1865,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:877 src/gtkprefs.c:1179
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -2018,27 +1900,27 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4589
-#: src/protocols/oscar/oscar.c:6137 src/protocols/yahoo/yahoo.c:2056
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4592
+#: src/protocols/oscar/oscar.c:6152 src/protocols/yahoo/yahoo.c:2132
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2048,184 +1930,190 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2083
+#: src/gtkaccount.c:2084
 msgid "Gaim - Information"
 msgstr "Gaim - 信息"
 
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2089 src/gtkblist.c:3510 src/gtkconv.c:1257
-#: src/gtkconv.c:3110 src/gtkconv.c:4280 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+#: src/gtkaccount.c:2090 src/gtkblist.c:3665 src/gtkconv.c:1256
+#: src/gtkconv.c:3074 src/gtkconv.c:4279 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:813
 msgid "_Get Info"
 msgstr "获取信息(_G)"
 
-#: src/gtkblist.c:818
+#: src/gtkblist.c:816
 msgid "_IM"
 msgstr "开聊(_I)"
 
+#: src/gtkblist.c:818
+msgid "Add Buddy _Pounce"
+msgstr "添加好友千里眼(_P)"
+
 #: src/gtkblist.c:820
-msgid "Add Buddy _Pounce"
-msgstr "添加好友千里眼(_P)"
-
-#: src/gtkblist.c:822
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:844 src/gtkblist.c:932 src/gtkblist.c:954
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "别名(_A)..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
+#: src/gtkconn.c:460
 msgid "_Remove"
 msgstr "删除(_R)"
 
+#: src/gtkblist.c:905
+msgid "Add a _Buddy"
+msgstr "添加好友(_B)"
+
 #: src/gtkblist.c:907
-msgid "Add a _Buddy"
-msgstr "添加好友(_B)"
-
-#: src/gtkblist.c:909
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:911
+#: src/gtkblist.c:909
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:911
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:925
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: src/gtkblist.c:927
+#: src/gtkblist.c:926
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:951 src/gtkblist.c:986
+#: src/gtkblist.c:950 src/gtkblist.c:985
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:991
+#: src/gtkblist.c:990
 msgid "_Expand"
 msgstr "展开(_E)"
 
+#: src/gtkblist.c:1389 src/gtkconv.c:3795
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "您目前登入的协议中没有一个可以添加好友的。"
+
 #. Buddies menu
-#: src/gtkblist.c:1524
+#: src/gtkblist.c:1680
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1525
+#: src/gtkblist.c:1681
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/新即时消息(_I)..."
 
-#: src/gtkblist.c:1526
+#: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:1527
+#: src/gtkblist.c:1683
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/获取用户信息(_U)..."
 
-#: src/gtkblist.c:1529
+#: src/gtkblist.c:1685
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:1530
+#: src/gtkblist.c:1686
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:1531
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:1687
+msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:1532
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:1688
+msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:1533
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:1689
+msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:1535
+#: src/gtkblist.c:1691
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:1536
+#: src/gtkblist.c:1692
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:1695
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:1540
+#: src/gtkblist.c:1696
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:1541
+#: src/gtkblist.c:1697
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:1542
+#: src/gtkblist.c:1698
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:1544
+#: src/gtkblist.c:1700
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:1545
-msgid "/Tools/_File Transfers..."
-msgstr "/工具(T)/文件传送(_F)..."
-
-#: src/gtkblist.c:1546
+#: src/gtkblist.c:1701
+msgid "/Tools/_File Transfers"
+msgstr "/工具(T)/文件传送(_F)"
+
+#: src/gtkblist.c:1702
 msgid "/Tools/Preferences"
 msgstr "/工具(T)/首选项"
 
-#: src/gtkblist.c:1547
+#: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:1549
+#: src/gtkblist.c:1705
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:1552
+#: src/gtkblist.c:1708
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:1553
+#: src/gtkblist.c:1709
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:1554
+#: src/gtkblist.c:1710
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:1555
+#: src/gtkblist.c:1711
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:1571
+#: src/gtkblist.c:1727
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:1571
+#: src/gtkblist.c:1727
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:1572
+#: src/gtkblist.c:1728
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:1600
+#: src/gtkblist.c:1756
 #, c-format
 msgid ""
 "\n"
@@ -2234,16 +2122,16 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:1661 src/protocols/oscar/oscar.c:5517
+#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5532
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:1673
+#: src/gtkblist.c:1829
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1844
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2251,7 +2139,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1845
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2259,7 +2147,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2267,7 +2155,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2275,7 +2163,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2283,7 +2171,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:1693
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2291,7 +2179,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2299,7 +2187,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1852
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2307,7 +2195,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2315,85 +2203,85 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:1965
+#: src/gtkblist.c:2121
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1967
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1972
+#: src/gtkblist.c:2128
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1975
+#: src/gtkblist.c:2131
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:2168 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:2235
+#: src/gtkblist.c:2391
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:2238
+#: src/gtkblist.c:2394
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:2397
 msgid "/Tools/Protocol Actions"
 msgstr "/工具(T)/协议操作(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2484
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:2348 src/gtkconv.c:1216
+#: src/gtkblist.c:2504 src/gtkconv.c:1215
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2510
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:2357 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "信息"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2519
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:2366 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2527
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2535
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3085 src/protocols/yahoo/yahoo.c:2188
+#: src/gtkblist.c:3240 src/protocols/yahoo/yahoo.c:2264
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3108
+#: src/gtkblist.c:3263
 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. "
@@ -2402,42 +2290,38 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/gtkblist.c:3130 src/main.c:289
+#: src/gtkblist.c:3285 src/main.c:289
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkblist.c:3156 src/gtkblist.c:3473
+#: src/gtkblist.c:3311 src/gtkblist.c:3628
 msgid "Group:"
 msgstr "组:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3165 src/gtkblist.c:3443
+#: src/gtkblist.c:3320 src/gtkblist.c:3598
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:3410
+#: src/gtkblist.c:3565
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:3433
+#: src/gtkblist.c:3588
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3662
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:3507
-msgid "Add a new group"
-msgstr "添加新组"
-
-#: src/gtkblist.c:3508
+#: src/gtkblist.c:3663
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4009
+#: src/gtkblist.c:4180
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2457,7 +2341,11 @@
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:409
+#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:527
+msgid "_Reconnect"
+msgstr "重新连接(_R)"
+
+#: src/gtkconn.c:490
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2470,377 +2358,373 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:411
+#: src/gtkconn.c:492
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:420
-msgid "Reconnect"
-msgstr "重新连接"
-
-#: src/gtkconn.c:459
+#: src/gtkconn.c:532
+msgid "Reconnect _All"
+msgstr "全部重新连接(_A)"
+
+#: src/gtkconn.c:550
 msgid "Account"
 msgstr "账户"
 
-#: src/gtkconn.c:467
+#: src/gtkconn.c:558
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:185
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:241
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkconv.c:311
-msgid "Gaim - Insert Image"
-msgstr "Gaim - 插入图像"
-
-#: src/gtkconv.c:615
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "插入图像"
+
+#: src/gtkconv.c:609
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:643
+#: src/gtkconv.c:637
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:664
+#: src/gtkconv.c:658
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:684
+#: src/gtkconv.c:678
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:780
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>输入搜索条件\n"
-"</span>"
-
-#: src/gtkconv.c:787
-msgid "Search term: "
-msgstr "搜索条件:"
-
-#: src/gtkconv.c:1224
+#: src/gtkconv.c:764
+msgid "Find"
+msgstr "查找"
+
+#: src/gtkconv.c:782
+msgid "_Search for:"
+msgstr "搜索文字(_S):"
+
+#: src/gtkconv.c:1223
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1226 src/gtkprefs.c:774
+#: src/gtkconv.c:1225 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1235 src/gtkconv.c:3133
+#: src/gtkconv.c:1234 src/gtkconv.c:3097
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1244
+#: src/gtkconv.c:1243
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4265
+#: src/gtkconv.c:1254 src/gtkconv.c:3080 src/gtkconv.c:4264
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2372
+#: src/gtkconv.c:2331
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2380
+#: src/gtkconv.c:2339
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2442
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:2905
+#: src/gtkconv.c:2864
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:2922
+#: src/gtkconv.c:2881
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:2883
+msgid "/Conversation/_New Conversation..."
+msgstr "/对话(C)/新建对话(_N)..."
+
+#: src/gtkconv.c:2888
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:2890
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:2927
-msgid "/Conversation/Search..."
-msgstr "/对话(C)/搜索..."
-
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:2891
+msgid "/Conversation/Find..."
+msgstr "/对话(C)/查找..."
+
+#: src/gtkconv.c:2895
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:2897
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:2935
+#: src/gtkconv.c:2899
 msgid "/Conversation/_Get Info..."
 msgstr "/对话(C)/获取信息(_G)..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2942
-msgid "/Conversation/Insert _URL..."
-msgstr "/对话(C)/插入 URL(_U)..."
-
-#: src/gtkconv.c:2944
+#: src/gtkconv.c:2906
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/对话(C)/插入链接(_K)..."
+
+#: src/gtkconv.c:2908
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2949
+#: src/gtkconv.c:2913
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:2951
+#: src/gtkconv.c:2915
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2953
+#: src/gtkconv.c:2917
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:2919
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:2924
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:2928
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:2929
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2966
+#: src/gtkconv.c:2930
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:2931
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3009
+#: src/gtkconv.c:2973
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3014
+#: src/gtkconv.c:2978
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3018
+#: src/gtkconv.c:2982
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3022
+#: src/gtkconv.c:2986
 msgid "/Conversation/Get Info..."
 msgstr "/对话(C)/获取信息(G)..."
 
-#: src/gtkconv.c:3026
+#: src/gtkconv.c:2990
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3032
+#: src/gtkconv.c:2996
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3000
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3006
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3010
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3014
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3054
+#: src/gtkconv.c:3018
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3024
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3063
+#: src/gtkconv.c:3027
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3030
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
-#: src/gtkconv.c:5975
+#: src/gtkconv.c:3054 src/gtkconv.c:3056 src/gtkconv.c:3154 src/gtkconv.c:3156
+#: src/gtkconv.c:5974
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:3113 src/gtkconv.c:4283
+#: src/gtkconv.c:3077 src/gtkconv.c:4282
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3119 src/gtkconv.c:4268
+#: src/gtkconv.c:3083 src/gtkconv.c:4267
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3090
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3094
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:3137 src/gtkconv.c:3575
+#: src/gtkconv.c:3101 src/gtkconv.c:3540
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3104 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3108
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:3202 src/gtkconv.c:5978
+#: src/gtkconv.c:3166 src/gtkconv.c:5977
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3205
+#: src/gtkconv.c:3169
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3208
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3255
+#: src/gtkconv.c:3219
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3230
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3246
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3294
-msgid "Normal font size"
-msgstr "标准字体"
-
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3271
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3288
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3300
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3347
+#: src/gtkconv.c:3312
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3327
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3338
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3384
+#: src/gtkconv.c:3349
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3444
+#: src/gtkconv.c:3409
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3495
+#: src/gtkconv.c:3460
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3517
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3529
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4081
+#: src/gtkconv.c:4080
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4667 src/gtkconv.c:4699 src/gtkconv.c:4820 src/gtkconv.c:4887
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5222
+#: src/gtkconv.c:5221
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:5227
+#: src/gtkconv.c:5226
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:5233
+#: src/gtkconv.c:5232
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:5712 src/gtkconv.c:5715
+#: src/gtkconv.c:5711 src/gtkconv.c:5714
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2856,139 +2740,147 @@
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
+#: src/gtkft.c:629
+msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:630
+msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:86
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+msgid "Canceled"
+msgstr "已取消"
+
+#: src/gtkft.c:884
+msgid "Failed"
+msgstr "已失败"
+
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
-#: src/gtkft.c:1058
+#: src/gtkft.c:1100
 msgid "Gaim - Open..."
 msgstr "Gaim - 打开..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
+#: src/gtkft.c:1102 src/protocols/toc/toc.c:2042
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/gtkft.c:1107
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:691
 msgid "_Copy E-Mail Address"
 msgstr "电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:703
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:713
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1849
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtklog.c:244
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "交谈对象"
 
@@ -2998,17 +2890,17 @@
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:219
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:227
+#: src/gtknotify.c:224
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:228
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3019,7 +2911,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:247
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3030,21 +2922,21 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
+#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:433
+#: src/gtknotify.c:429
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtknotify.c:450
+#: src/gtknotify.c:446
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "浏览器“%s”无效。"
 
-#: src/gtknotify.c:457
+#: src/gtknotify.c:453
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "调用“命令”出错:%s"
@@ -3080,7 +2972,7 @@
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:335
 msgid "Sign on"
 msgstr "登入"
 
@@ -3092,8 +2984,8 @@
 msgid "Return from away"
 msgstr "回来"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2052
+#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2128
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -3138,7 +3030,7 @@
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:468 src/gtkprefs.c:2083
 msgid "Test"
 msgstr "测试"
 
@@ -3208,6 +3100,11 @@
 msgid "Icon"
 msgstr "图标"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "描述"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "样式"
@@ -3252,7 +3149,7 @@
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "显示"
 
@@ -3328,23 +3225,23 @@
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
@@ -3360,7 +3257,7 @@
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:853 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
@@ -3376,189 +3273,183 @@
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:861
+msgid "_Automatically expand contacts"
+msgstr "自动展开联系人(_A)"
+
+#: src/gtkprefs.c:886
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:893
 msgid "Send _URLs as Links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:896
 msgid "Show Formatting Toolbar"
 msgstr "显示格式工具栏"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:899
-msgid "_Tab Placement:"
-msgstr "标签位置(_T):"
-
 #: src/gtkprefs.c:901
+msgid "_Tab Placement:"
+msgstr "标签位置(_T):"
+
+#: src/gtkprefs.c:903
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:904
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:905
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:906
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:912
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:915
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:925
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:936
 msgid "Show status _icons on tabs"
 msgstr "在标签上显示状态图标(_I)"
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1125
-msgid "_Host"
-msgstr "主机(_H)"
-
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1656
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "端口"
-
-#: src/gtkprefs.c:1160
-msgid "_User"
-msgstr "用户名(_U)"
-
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "密码(_S)"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1144
+msgid "Port:"
+msgstr "端口:"
+
+#: src/gtkprefs.c:1162
+msgid "_User:"
+msgstr "用户(_U):"
+
+#: src/gtkprefs.c:1216
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1217
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1218
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1219
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1220
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1229
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3567,63 +3458,63 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1305
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1306
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1322
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1325
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1329
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1331
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1386
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1387
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1389
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1393
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1394
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1396
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1398
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1405
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1415
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3632,67 +3523,67 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1470
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1472
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1475
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1478
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1481
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1483
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1485
 msgid "Send auto-response in _active conversations"
 msgstr "在当前对话中发送自动回复(_A)"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1495
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1498
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1501
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1503
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1511
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1512
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1521
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1583
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3707,7 +3598,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3722,97 +3613,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1769
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:582
-#: src/protocols/msn/msn.c:1344 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "名称"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1823
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1950
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2057
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2064
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2087
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2225
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2259
-msgid "Interface"
-msgstr "界面"
-
-#: src/gtkprefs.c:2260
-msgid "Smiley Themes"
-msgstr "笑脸主题"
-
 #: src/gtkprefs.c:2261
-msgid "Fonts"
-msgstr "字体"
+msgid "Interface"
+msgstr "界面"
 
 #: src/gtkprefs.c:2262
-msgid "Message Text"
-msgstr "消息文本"
+msgid "Smiley Themes"
+msgstr "笑脸主题"
 
 #: src/gtkprefs.c:2263
+msgid "Fonts"
+msgstr "字体"
+
+#: src/gtkprefs.c:2264
+msgid "Message Text"
+msgstr "消息文本"
+
+#: src/gtkprefs.c:2265
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2270
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2273
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2273
-msgid "Logging"
-msgstr "日志"
-
-#: src/gtkprefs.c:2274
-msgid "Sounds"
-msgstr "声音"
-
 #: src/gtkprefs.c:2275
+msgid "Logging"
+msgstr "日志"
+
+#: src/gtkprefs.c:2276
+msgid "Sounds"
+msgstr "声音"
+
+#: src/gtkprefs.c:2277
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2278
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2279
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Plugins"
 msgstr "插件"
 
@@ -3970,15 +3861,15 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
 
-#: src/gtkutils.c:291
+#: src/gtkutils.c:296
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:326
+#: src/gtkutils.c:331
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 保存图标"
 
-#: src/log.c:82
+#: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
@@ -3996,25 +3887,25 @@
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自动回复>:</b></font> %s<br/>\n"
 
-#: src/log.c:532 src/log.c:666
+#: src/log.c:533 src/log.c:668
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:542 src/log.c:676
+#: src/log.c:543 src/log.c:678
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:546
+#: src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:620
+#: src/log.c:621
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:680
+#: src/log.c:682
 msgid "Plain text"
 msgstr "纯文本"
 
@@ -4031,7 +3922,7 @@
 msgstr "登入"
 
 #. full help text
-#: src/main.c:551
+#: src/main.c:549
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4063,7 +3954,7 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:566
+#: src/main.c:564
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
@@ -4091,8 +3982,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2333
-#: src/protocols/yahoo/yahoo.c:2434
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2417
+#: src/protocols/yahoo/yahoo.c:2526
 msgid "Available"
 msgstr "可用"
 
@@ -4105,10 +3996,10 @@
 msgstr "只对好友离开"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6143 src/protocols/yahoo/yahoo.c:2050
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/yahoo/yahoo.c:2444
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:4609
+#: src/protocols/oscar/oscar.c:6158 src/protocols/yahoo/yahoo.c:2126
+#: src/protocols/yahoo/yahoo.c:2437 src/protocols/yahoo/yahoo.c:2536
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4163,8 +4054,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:72
-#: src/protocols/yahoo/yahoo_filexfer.c:142
+#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "无法连接。"
 
@@ -4226,7 +4117,7 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3957
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3960
 msgid "UIN"
 msgstr "UIN"
 
@@ -4236,12 +4127,12 @@
 
 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3968 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3959
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3962
 msgid "Nick"
 msgstr "昵称"
 
@@ -4256,18 +4147,18 @@
 
 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1282
-#: src/protocols/msn/msn.c:1524 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3200
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2610
-#: src/protocols/yahoo/yahoo.c:2632 src/protocols/yahoo/yahoo.c:2655
-#: src/protocols/yahoo/yahoo.c:2842 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2709
+#: src/protocols/yahoo/yahoo.c:2731 src/protocols/yahoo/yahoo.c:2754
+#: src/protocols/yahoo/yahoo.c:2912 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4364,7 +4255,7 @@
 msgstr "目录搜索"
 
 #: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
-#: src/protocols/oscar/oscar.c:6498 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -4416,15 +4307,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5137
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5140
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5138
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:5141
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4476,45 +4367,49 @@
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "频道:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "频道(_C):"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "密码(_P):"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:357 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
 msgid "Read error"
 msgstr "读取错误"
 
@@ -4527,25 +4422,31 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:534
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:535
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
+#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
 #: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
+#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "端口"
+
+#: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "用户名"
@@ -4571,7 +4472,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2812
 msgid "Realname"
 msgstr "真名"
 
@@ -4724,58 +4625,59 @@
 msgid "Server requires SSL for login"
 msgstr "服务器需要 SSL 才能登录"
 
-#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:301
-#: src/protocols/jabber/auth.c:401 src/protocols/jabber/auth.c:413
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
+#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
+#: src/protocols/jabber/auth.c:424
 msgid "Invalid response from server"
 msgstr "服务器的响应无效"
 
-#: src/protocols/jabber/auth.c:93 src/protocols/jabber/auth.c:163
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:152 src/protocols/jabber/jabber.c:458
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/auth.c:322
+#: src/protocols/jabber/auth.c:333
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/auth.c:416
+#: src/protocols/jabber/auth.c:427
 msgid "Bad Protocol"
 msgstr "无效的协议"
 
-#: src/protocols/jabber/auth.c:419
+#: src/protocols/jabber/auth.c:430
 msgid "Encryption Required"
 msgstr "需要加密"
 
-#: src/protocols/jabber/auth.c:422
+#: src/protocols/jabber/auth.c:433
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/auth.c:425
+#: src/protocols/jabber/auth.c:436
 msgid "Invalid Mechanism"
 msgstr "用户名算法"
 
-#: src/protocols/jabber/auth.c:427
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid Realm"
 msgstr "用户名域"
 
-#: src/protocols/jabber/auth.c:430
+#: src/protocols/jabber/auth.c:441
 msgid "Mechanism Too Weak"
 msgstr "算法太弱"
 
-#: src/protocols/jabber/auth.c:433 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:5560
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/auth.c:436
+#: src/protocols/jabber/auth.c:447
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/auth.c:438
+#: src/protocols/jabber/auth.c:449
 msgid "Authentication Failure"
 msgstr "认证失败"
 
@@ -4792,10 +4694,14 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2808
 msgid "Nickname"
 msgstr "昵称"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "URL"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "街道地址"
@@ -4829,7 +4735,7 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2701
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2804
 msgid "Email"
 msgstr "电子邮件"
 
@@ -4850,7 +4756,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:3994
 msgid "Birthday"
 msgstr "生日"
 
@@ -4883,7 +4789,7 @@
 msgstr "中名"
 
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
 msgid "Address"
 msgstr "地址"
 
@@ -4903,37 +4809,37 @@
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:905
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:908
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:916
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:924
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:930
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "房间:"
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:937
+msgid "_Room:"
+msgstr "房间(_R):"
 
 #: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "服务器:"
+msgid "_Server:"
+msgstr "服务器(_S):"
 
 #: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "昵称:"
+msgid "_Handle:"
+msgstr "昵称(_H):"
 
 #: src/protocols/jabber/chat.c:158
 #, c-format
@@ -5062,20 +4968,20 @@
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:536 src/protocols/msn/msn.c:707
-#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:762
-#: src/protocols/msn/msn.c:770 src/protocols/msn/msn.c:803
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:834 src/protocols/msn/msn.c:849
-#: src/protocols/msn/msn.c:859 src/protocols/msn/msn.c:881
-#: src/protocols/msn/msn.c:931 src/protocols/msn/msn.c:969
-#: src/protocols/msn/msn.c:1067 src/protocols/msn/msn.c:1099
-#: src/protocols/msn/msn.c:1120 src/protocols/msn/msn.c:1131
-#: src/protocols/msn/msn.c:1142 src/protocols/msn/msn.c:1166
-#: src/protocols/msn/msn.c:1178 src/protocols/msn/msn.c:1259
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
 #: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
 #: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
@@ -5137,14 +5043,14 @@
 msgstr "电子邮件"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3962
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3965
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4014
-#: src/protocols/oscar/oscar.c:4030 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "州/省"
@@ -5153,6 +5059,10 @@
 msgid "Phone"
 msgstr "电话"
 
+#: src/protocols/jabber/jabber.c:637
+msgid "Date"
+msgstr "日期"
+
 #: src/protocols/jabber/jabber.c:645
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
@@ -5162,9 +5072,9 @@
 msgstr "注册新的 Jabber 账户"
 
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1942
+#: src/protocols/yahoo/yahoo.c:2014
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5181,7 +5091,7 @@
 msgstr "重新初始化流"
 
 #: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:297
+#: src/protocols/jabber/presence.c:296
 msgid "Error"
 msgstr "出错"
 
@@ -5196,8 +5106,8 @@
 msgstr "远远离开"
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:6139
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:6154
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -5230,6 +5140,10 @@
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "设置用户信息"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5288,11 +5202,11 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/presence.c:292
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
@@ -5346,23 +5260,23 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2141 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1734
-#: src/protocols/yahoo/yahoo.c:1765 src/protocols/yahoo/yahoo.c:1830
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/yahoo/yahoo.c:1837 src/protocols/yahoo/yahoo.c:1902
 msgid "Unable to connect"
 msgstr "无法连接"
 
 #: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
-#: src/protocols/msn/notification.c:2163
+#: src/protocols/msn/notification.c:2171
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2170
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2184
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -5621,41 +5535,41 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2164
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2240
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:626
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/yahoo/yahoo.c:2335 src/protocols/yahoo/yahoo.c:2435
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2419 src/protocols/yahoo/yahoo.c:2527
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2034
-#: src/protocols/yahoo/yahoo.c:2337 src/protocols/yahoo/yahoo.c:2436
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2421 src/protocols/yahoo/yahoo.c:2528
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2042
-#: src/protocols/yahoo/yahoo.c:2345 src/protocols/yahoo/yahoo.c:2440
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/yahoo/yahoo.c:2429 src/protocols/yahoo/yahoo.c:2532
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2046
-#: src/protocols/yahoo/yahoo.c:2349 src/protocols/yahoo/yahoo.c:2442
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2433 src/protocols/yahoo/yahoo.c:2534
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:636
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "隐身"
@@ -5696,7 +5610,7 @@
 msgid "SSL support is needed for MSN. Please install it."
 msgstr "MSN 需要 SSL 支持。请先安装。"
 
-#: src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5705,11 +5619,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:783
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5718,73 +5632,73 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1283 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2710
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1351 src/protocols/oscar/oscar.c:3996
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:3999
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2725
+#: src/protocols/yahoo/yahoo.c:2820
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1358 src/protocols/oscar/oscar.c:3982
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3985
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2737
+#: src/protocols/yahoo/yahoo.c:2828
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2731
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2824
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1373 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2816
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1381 src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2832
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
-#: src/protocols/msn/msn.c:1411 src/protocols/msn/msn.c:1418
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1447
-#: src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1463 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1491
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2867
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1499 src/protocols/yahoo/yahoo.c:2831
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2903
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1510 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2918
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2920
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
@@ -5798,15 +5712,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1632 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -5882,7 +5796,7 @@
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:2104
+#: src/protocols/msn/notification.c:2112
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5963,10 +5877,10 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5208
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5211
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "加入组:"
+msgid "_Group:"
+msgstr "组(_G):"
 
 #. *< api_version
 #. *< type
@@ -6124,8 +6038,8 @@
 msgstr "连接已建立,已发送 cookie"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:201
-#: src/protocols/yahoo/yahoo_filexfer.c:210
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
@@ -6133,8 +6047,8 @@
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:202
-#: src/protocols/yahoo/yahoo_filexfer.c:211
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -6193,21 +6107,21 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5646
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5661
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2414
 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 "
@@ -6216,46 +6130,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6015
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6030
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2446
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2483
 #, 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:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5129
-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5178
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6264,11 +6178,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5138
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6278,17 +6192,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2632
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2646
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6301,7 +6215,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6314,7 +6228,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6327,32 +6241,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2690
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2693
+#: src/protocols/oscar/oscar.c:2694
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2776
 #, 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:2784
+#: src/protocols/oscar/oscar.c:2785
 #, 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:2793
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6360,175 +6274,175 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2803
 #, 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:2811
+#: src/protocols/oscar/oscar.c:2812
 #, 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:2820
+#: src/protocols/oscar/oscar.c:2821
 #, 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:2836 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:6157
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:6155
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4603
+#: src/protocols/oscar/oscar.c:6156
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2847
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2890
 #, 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:2948
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2985
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3044
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3083
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3086
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6241
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6256
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6233
-#: src/protocols/yahoo/yahoo.c:2213
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6248
+#: src/protocols/yahoo/yahoo.c:2289
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3099
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3099
-msgid "Add-Ins"
-msgstr "外挂"
-
 #: src/protocols/oscar/oscar.c:3102
-msgid "Send Buddy List"
-msgstr "发送好友列表"
+msgid "Add-Ins"
+msgstr "外挂"
 
 #: src/protocols/oscar/oscar.c:3105
+msgid "Send Buddy List"
+msgstr "发送好友列表"
+
+#: src/protocols/oscar/oscar.c:3108
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3111
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3114
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
-msgid "Nihilist"
-msgstr "Nihilist"
-
 #: src/protocols/oscar/oscar.c:3117
-msgid "ICQ Server Relay"
-msgstr "ICQ 服务器转发"
+msgid "Nihilist"
+msgstr "Nihilist"
 
 #: src/protocols/oscar/oscar.c:3120
+msgid "ICQ Server Relay"
+msgstr "ICQ 服务器转发"
+
+#: src/protocols/oscar/oscar.c:3123
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3126
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3129
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
-msgid "Hiptop"
-msgstr "Hiptop"
-
 #: src/protocols/oscar/oscar.c:3132
-msgid "Security Enabled"
-msgstr "安全已启用"
+msgid "Hiptop"
+msgstr "Hiptop"
 
 #: src/protocols/oscar/oscar.c:3135
+msgid "Security Enabled"
+msgstr "安全已启用"
+
+#: src/protocols/oscar/oscar.c:3138
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:3164
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "用户名: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告级别: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上线时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3172
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成员时间: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "瞌睡: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3219
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3614
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6536,162 +6450,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3675
+#: src/protocols/oscar/oscar.c:3678
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3677
+#: src/protocols/oscar/oscar.c:3680
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3708
+#: src/protocols/oscar/oscar.c:3711
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:3977
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3982
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4002
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4005
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:4009
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4020 src/protocols/oscar/oscar.c:4036
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:4025
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4041
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4043
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4046
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4049
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4052
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4058
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4108
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4133
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4147
+#: src/protocols/oscar/oscar.c:4150
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4171
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4173
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4201
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4204
 #, 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:4204
+#: src/protocols/oscar/oscar.c:4207
 #, 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:4207
+#: src/protocols/oscar/oscar.c:4210
 #, 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:4210
+#: src/protocols/oscar/oscar.c:4213
 #, 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:4213
+#: src/protocols/oscar/oscar.c:4216
 #, 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:4216
+#: src/protocols/oscar/oscar.c:4219
 #, 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:4219
+#: src/protocols/oscar/oscar.c:4222
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4229
+#: src/protocols/oscar/oscar.c:4232
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6700,20 +6614,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4230 src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4233 src/protocols/oscar/oscar.c:4240
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4235
+#: src/protocols/oscar/oscar.c:4238
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4467
+#: src/protocols/oscar/oscar.c:4470
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4471
 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 "
@@ -6722,7 +6636,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4498
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6732,15 +6646,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4503
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4517
+#: src/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4521
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6749,7 +6663,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4561
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6761,15 +6675,15 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4566
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4777
+#: src/protocols/oscar/oscar.c:4780
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4778
+#: src/protocols/oscar/oscar.c:4781
 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 "
@@ -6778,12 +6692,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4871
-#: src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4873 src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4879
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5042
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6791,15 +6705,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5042 src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5045 src/protocols/oscar/oscar.c:5058
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5043 src/protocols/oscar/oscar.c:5056
+#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5059
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6809,18 +6723,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5093
 #, 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:5096
+#: src/protocols/oscar/oscar.c:5099
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5132
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6830,17 +6744,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5174
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5175
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6850,107 +6764,111 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5179
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5213 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "交换:"
-
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5216 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "交换(_E):"
+
+#: src/protocols/oscar/oscar.c:5454
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5463
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:5475
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 地址:</b> "
 
-#: src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:5483
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5492
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>好友注释:</b>"
+
+#: src/protocols/oscar/oscar.c:5501
 msgid "<b>Available:</b> "
 msgstr "<b>可用:</b>"
 
-#: src/protocols/oscar/oscar.c:5504
+#: src/protocols/oscar/oscar.c:5519
 msgid "<b>Away Message:</b> "
 msgstr "<b>离开消息:</b>"
 
-#: src/protocols/oscar/oscar.c:5513
+#: src/protocols/oscar/oscar.c:5528
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5547 src/protocols/yahoo/yahoo.c:2054
+#: src/protocols/oscar/oscar.c:5562 src/protocols/yahoo/yahoo.c:2130
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6010
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6023
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6026
 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:6186
+#: src/protocols/oscar/oscar.c:6201
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:6217
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6225
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6240
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6254
+#: src/protocols/oscar/oscar.c:6269
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6275
+#: src/protocols/oscar/oscar.c:6290
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6276
+#: src/protocols/oscar/oscar.c:6291
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6282
+#: src/protocols/oscar/oscar.c:6297
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6346
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6390
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6393
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6379
+#: src/protocols/oscar/oscar.c:6394
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6958,65 +6876,73 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6393
+#: src/protocols/oscar/oscar.c:6408
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6409
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:6410
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6398
+#: src/protocols/oscar/oscar.c:6413
 msgid "Search"
 msgstr "搜索"
 
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:6427
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:6428
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6491
-msgid "Set Available Message"
-msgstr "设置可用消息"
-
-#: src/protocols/oscar/oscar.c:6505
+#: src/protocols/oscar/oscar.c:6499
+msgid "Set User Info..."
+msgstr "设置用户信息..."
+
+#: src/protocols/oscar/oscar.c:6506
+msgid "Set Available Message..."
+msgstr "设置可用消息..."
+
+#: src/protocols/oscar/oscar.c:6513
+msgid "Change Password..."
+msgstr "更改密码..."
+
+#: src/protocols/oscar/oscar.c:6520
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6528
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6524
-msgid "Format Screenname"
-msgstr "格式化用户名"
-
-#: src/protocols/oscar/oscar.c:6530
+#: src/protocols/oscar/oscar.c:6539
+msgid "Format Screenname..."
+msgstr "格式化用户名..."
+
+#: src/protocols/oscar/oscar.c:6545
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6551
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6542
-msgid "Change Current Registered Address"
-msgstr "更改当前注册的地址"
-
-#: src/protocols/oscar/oscar.c:6551
+#: src/protocols/oscar/oscar.c:6557
+msgid "Change Current Registered Address..."
+msgstr "更改当前注册的地址..."
+
+#: src/protocols/oscar/oscar.c:6566
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6559
-msgid "Search for Buddy by Email"
-msgstr "按电子邮件搜索好友"
+#: src/protocols/oscar/oscar.c:6574
+msgid "Search for Buddy by Email..."
+msgstr "按电子邮件搜索好友..."
 
 #. *< api_version
 #. *< type
@@ -7028,15 +6954,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6680 src/protocols/oscar/oscar.c:6682
+#: src/protocols/oscar/oscar.c:6695 src/protocols/oscar/oscar.c:6697
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6714
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:6719
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -7337,27 +7263,27 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:715
+#: src/protocols/yahoo/yahoo.c:726
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:773
+#: src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:775
+#: src/protocols/yahoo/yahoo.c:812
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:776
+#: src/protocols/yahoo/yahoo.c:815
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1396
+#: src/protocols/yahoo/yahoo.c:1465
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7367,11 +7293,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1399
+#: src/protocols/yahoo/yahoo.c:1468
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1472
+#: src/protocols/yahoo/yahoo.c:1541
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7379,132 +7305,132 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1475
+#: src/protocols/yahoo/yahoo.c:1544
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1504
+#: src/protocols/yahoo/yahoo.c:1573
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1507
+#: src/protocols/yahoo/yahoo.c:1576
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1510
+#: src/protocols/yahoo/yahoo.c:1579
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: src/protocols/yahoo/yahoo.c:1557
+#: src/protocols/yahoo/yahoo.c:1628
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1559
+#: src/protocols/yahoo/yahoo.c:1630
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1795
+#: src/protocols/yahoo/yahoo.c:1737 src/protocols/yahoo/yahoo.c:1867
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1929
-#: src/protocols/yahoo/yahoo.c:1953
+#: src/protocols/yahoo/yahoo.c:1892 src/protocols/yahoo/yahoo.c:2001
+#: src/protocols/yahoo/yahoo.c:2028
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2036 src/protocols/yahoo/yahoo.c:2339
-#: src/protocols/yahoo/yahoo.c:2437
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2423
+#: src/protocols/yahoo/yahoo.c:2529
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2341
-#: src/protocols/yahoo/yahoo.c:2438
+#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2425
+#: src/protocols/yahoo/yahoo.c:2530
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2040 src/protocols/yahoo/yahoo.c:2343
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2427
+#: src/protocols/yahoo/yahoo.c:2531
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2347
-#: src/protocols/yahoo/yahoo.c:2441
+#: src/protocols/yahoo/yahoo.c:2120 src/protocols/yahoo/yahoo.c:2431
+#: src/protocols/yahoo/yahoo.c:2533
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo.c:2351
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2435
+#: src/protocols/yahoo/yahoo.c:2535
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2144
+#: src/protocols/yahoo/yahoo.c:2188 src/protocols/yahoo/yahoo.c:2220
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2200
+#: src/protocols/yahoo/yahoo.c:2276
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2206
+#: src/protocols/yahoo/yahoo.c:2282
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/yahoo.c:2335
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2346
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:2628
+#: src/protocols/yahoo/yahoo.c:2727
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:2652
+#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2751
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
 
-#: src/protocols/yahoo/yahoo.c:2651
+#: src/protocols/yahoo/yahoo.c:2750
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>抱歉,目前不支持非英语的个人资料。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2696
+#: src/protocols/yahoo/yahoo.c:2798 src/protocols/yahoo/yahoo.c:2799
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2756 src/protocols/yahoo/yahoo.c:2760
-#: src/protocols/yahoo/yahoo.c:2764
+#: src/protocols/yahoo/yahoo.c:2843 src/protocols/yahoo/yahoo.c:2846
+#: src/protocols/yahoo/yahoo.c:2849
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2775 src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2861
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:2797
+#: src/protocols/yahoo/yahoo.c:2875
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2887
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2891
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/yahoo/yahoo.c:2893
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Member Since"
 msgstr "注册时间"
 
@@ -7518,23 +7444,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3003 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/yahoo/yahoo.c:3100 src/protocols/yahoo/yahoo.c:3102
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3022
+#: src/protocols/yahoo/yahoo.c:3119
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:3122
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3032
+#: src/protocols/yahoo/yahoo.c:3125
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3128
 msgid "File transfer port"
 msgstr "文件传送端口"
 
@@ -7547,19 +7473,19 @@
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
@@ -7603,16 +7529,16 @@
 msgstr "ZLocate"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "类:"
+msgid "_Class:"
+msgstr "类(_C):"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "实例:"
+msgid "_Instance:"
+msgstr "实例(_I):"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "接收者:"
+msgid "_Recipient:"
+msgstr "接收者(_R):"
 
 #. *< api_version
 #. *< type
@@ -7628,11 +7554,21 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/proxy.c:1692
+#. Forbidden
+#: src/proxy.c:1002
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr "访问被禁止: 代理服务器禁止端口 80 流过。"
+
+#: src/proxy.c:1004
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "代理服务器连接错误 %d"
+
+#: src/proxy.c:1721
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1692
+#: src/proxy.c:1721
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7720,42 +7656,42 @@
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/util.c:1793
+#: src/util.c:1790
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:1796
+#: src/util.c:1793
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1827 src/util.c:1832 src/util.c:1837 src/util.c:1840
+#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:1828 src/util.c:1832 src/util.c:1846 src/util.c:1848
+#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:1828 src/util.c:1837 src/util.c:1846 src/util.c:1851
+#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2183
+#: src/util.c:2180
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
-#: src/win32/win32dep.c:254
+#: src/win32/win32dep.c:271
 msgid "Moving Gaim Settings.."
 msgstr "正在移动 Gaim 设置..."
 
-#: src/win32/win32dep.c:257
+#: src/win32/win32dep.c:274
 msgid "Moving Gaim user settings to: "
 msgstr "正在将 Gaim 用户设置移动到:"
 
-#: src/win32/win32dep.c:259
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "提示"