diff po/zh_CN.po @ 9754:4a8bf81b82ae

[gaim-migrate @ 10621] " This will default the room/server fields to the proper values when an add chat is requested from a conversation window. It wasn't quite as trivial as the reporter suggested..." --Nathan (noif) Fredrickson committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 15 Aug 2004 19:34:20 +0000
parents 4d05b6e9e9cd
children f462f91edeb2
line wrap: on
line diff
--- a/po/zh_CN.po	Sun Aug 15 17:05:51 2004 +0000
+++ b/po/zh_CN.po	Sun Aug 15 19:34:20 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-03 00:00-0400\n"
+"POT-Creation-Date: 2004-08-14 22:11-0400\n"
 "PO-Revision-Date: 2004-08-04 02:09+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -146,69 +146,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
+#: plugins/docklet/docklet.c:115 src/gtkaccount.c:737 src/gtkaccount.c:2158
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:117
+#: plugins/docklet/docklet.c:118
 msgid "New Message..."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:118
+#: plugins/docklet/docklet.c:119
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:149
+#: plugins/docklet/docklet.c:150
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:154 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2722
-#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6494 src/protocols/oscar/oscar.c:6694
+#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2770
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2939
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6502 src/protocols/oscar/oscar.c:6702
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "离开"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:565
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6702
+#: plugins/docklet/docklet.c:160 src/away.c:570
+#: src/protocols/oscar/oscar.c:5414 src/protocols/oscar/oscar.c:6710
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:167
+#: plugins/docklet/docklet.c:168
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:612
+#: plugins/docklet/docklet.c:173 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
+#: plugins/docklet/docklet.c:174 src/gtkaccount.c:2339
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
+#: plugins/docklet/docklet.c:175 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:183
+#: plugins/docklet/docklet.c:184
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:187
+#: plugins/docklet/docklet.c:188
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:478
+#: plugins/docklet/docklet.c:479
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:483
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -219,19 +219,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:506
+#: plugins/docklet/docklet.c:507
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:510
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:511
+#: plugins/docklet/docklet.c:512
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -448,7 +448,7 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkblist.c:3003 src/gtkprefs.c:956 src/gtkprefs.c:1008
 #: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "无"
@@ -471,13 +471,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6978
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6986
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4044
-#: src/gtkblist.c:4372
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4042
+#: src/gtkblist.c:4370
 msgid "Group:"
 msgstr "组:"
 
@@ -514,7 +514,7 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
+#: src/blist.c:774 src/blist.c:962 src/blist.c:1898 src/gtkblist.c:3861
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -578,8 +578,8 @@
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
-#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:371
+#: src/gtkaccount.c:401 src/protocols/oscar/oscar.c:420
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -644,7 +644,7 @@
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:67 src/gtkdialogs.c:808
+#: plugins/idle.c:67 src/away.c:905
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -1197,7 +1197,7 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3048
 #: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "好友列表"
@@ -1234,16 +1234,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/about.c:60
+#: src/about.c:64
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/about.c:74
+#: src/about.c:78
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:98
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1253,215 +1253,215 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
 "成,并以 GPL 许可协议发行。<BR><BR>"
 
-#: src/about.c:105
+#: src/about.c:109
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/about.c:110
+#: src/about.c:114
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/about.c:111
+#: src/about.c:115
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/about.c:113
+#: src/about.c:117
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/about.c:116
+#: src/about.c:120
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/about.c:117
+#: src/about.c:121
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
+#: src/about.c:124 src/about.c:125 src/about.c:126 src/about.c:127
 msgid "developer"
 msgstr "开发者"
 
-#: src/about.c:124
+#: src/about.c:128
 msgid "support"
 msgstr "支持"
 
-#: src/about.c:131
+#: src/about.c:135
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:147
+#: src/about.c:151
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:148
+#: src/about.c:152
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/about.c:149
+#: src/about.c:153
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:152
+#: src/about.c:156
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:153
+#: src/about.c:157
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:154
+#: src/about.c:158
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:157
+#: src/about.c:161
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:165
+#: src/about.c:169
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:166 src/about.c:205
+#: src/about.c:170 src/about.c:209
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:167 src/about.c:206
+#: src/about.c:171 src/about.c:210
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:168 src/about.c:207
+#: src/about.c:172 src/about.c:211
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:169
+#: src/about.c:173
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:170
+#: src/about.c:174
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:171
+#: src/about.c:175
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/about.c:172 src/about.c:208
+#: src/about.c:176 src/about.c:212
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:177 src/about.c:213
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:178 src/about.c:214
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:179 src/about.c:215
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:177
-msgid "Hindi"
-msgstr "印地语"
-
-#: src/about.c:178
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: src/about.c:179 src/about.c:212
-msgid "Italian"
-msgstr "意大利语"
-
-#: src/about.c:180 src/about.c:213
-msgid "Japanese"
-msgstr "日语"
-
 #: src/about.c:181
+msgid "Hindi"
+msgstr "印地语"
+
+#: src/about.c:182
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: src/about.c:183 src/about.c:216
+msgid "Italian"
+msgstr "意大利语"
+
+#: src/about.c:184 src/about.c:217
+msgid "Japanese"
+msgstr "日语"
+
+#: src/about.c:185
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/about.c:182 src/about.c:214
+#: src/about.c:186 src/about.c:218
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:183
+#: src/about.c:187
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:184
-msgid "Macedonian"
-msgstr "马其顿语"
-
-#: src/about.c:185
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: src/about.c:186 src/about.c:215
-msgid "Polish"
-msgstr "波兰语"
-
-#: src/about.c:187
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
 #: src/about.c:188
-msgid "Portuguese-Brazil"
-msgstr "巴西葡萄牙语"
+msgid "Macedonian"
+msgstr "马其顿语"
 
 #: src/about.c:189
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#: src/about.c:190 src/about.c:216 src/about.c:217
-msgid "Russian"
-msgstr "俄语"
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: src/about.c:190 src/about.c:219
+msgid "Polish"
+msgstr "波兰语"
 
 #: src/about.c:191
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/about.c:192
+msgid "Portuguese-Brazil"
+msgstr "巴西葡萄牙语"
+
+#: src/about.c:193
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: src/about.c:194 src/about.c:220 src/about.c:221
+msgid "Russian"
+msgstr "俄语"
+
+#: src/about.c:195
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:192
+#: src/about.c:196
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/about.c:193 src/about.c:219
+#: src/about.c:197 src/about.c:223
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "and the Gnome-Vi Team"
 msgstr "及 Gnome 越南语团队"
 
-#: src/about.c:195
+#: src/about.c:199
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:196
+#: src/about.c:200
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:203
+#: src/about.c:207
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:204
+#: src/about.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:218
+#: src/about.c:222
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:220
+#: src/about.c:224
 msgid "Chinese"
 msgstr "中文"
 
@@ -1497,47 +1497,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
-#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
-#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
-#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
-#: src/protocols/oscar/oscar.c:6765 src/protocols/oscar/oscar.c:6857
-#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6995
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
-#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
-#: src/request.h:1243
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2377
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:262 src/gtkdialogs.c:315
+#: src/gtkrequest.c:241 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6917
+#: src/protocols/oscar/oscar.c:7003 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:447 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1072 src/protocols/silc/ops.c:1680
+#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2795
+#: src/protocols/yahoo/yahoo.c:2804 src/request.h:1243
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
-#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
-#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
-#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
-#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
-#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
-#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
-#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
-#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
-#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
-#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6766
-#: src/protocols/oscar/oscar.c:6858 src/protocols/oscar/oscar.c:6910
-#: src/protocols/oscar/oscar.c:6979 src/protocols/oscar/oscar.c:6996
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
-#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
-#: src/request.h:1243 src/request.h:1253
+#: src/account.c:343 src/account.c:381 src/away.c:353 src/connection.c:199
+#: src/gtkaccount.c:2008 src/gtkaccount.c:2504 src/gtkblist.c:2378
+#: src/gtkblist.c:4408 src/gtkconn.c:168 src/gtkdialogs.c:124
+#: src/gtkdialogs.c:263 src/gtkdialogs.c:316 src/gtkdialogs.c:404
+#: src/gtkdialogs.c:422 src/gtkdialogs.c:440 src/gtkdialogs.c:479
+#: src/gtkdialogs.c:535 src/gtkdialogs.c:581 src/gtkdialogs.c:600
+#: src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:623 src/gtkprivacy.c:634 src/gtkrequest.c:242
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/chat.c:702 src/protocols/jabber/jabber.c:667
+#: src/protocols/jabber/jabber.c:1049 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1361
+#: src/protocols/oscar/oscar.c:3319 src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3397 src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:6774 src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6918 src/protocols/oscar/oscar.c:6987
+#: src/protocols/oscar/oscar.c:7004 src/protocols/silc/buddy.c:461
+#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
+#: src/protocols/silc/chat.c:582 src/protocols/silc/chat.c:711
+#: src/protocols/silc/ops.c:1681 src/protocols/silc/silc.c:699
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2796
+#: src/protocols/yahoo/yahoo.c:2805 src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
@@ -1546,47 +1546,85 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:248 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
-#: src/away.c:227
+#: src/account.c:739 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2782
+msgid "Unknown"
+msgstr "未知"
+
+#: src/away.c:231
 msgid "Away!"
 msgstr "离开!"
 
-#: src/away.c:291
+#: src/away.c:295
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:345
+#: src/away.c:349
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "您真的想要删除离开消息“%s”吗?"
 
-#: src/away.c:347 src/away.c:438
+#: src/away.c:351 src/away.c:442
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
-#: src/gtkrequest.c:248
+#: src/away.c:352 src/gtkconv.c:1378 src/gtkconv.c:3721 src/gtkconv.c:3825
+#: src/gtkrequest.c:247
 msgid "Remove"
 msgstr "删除"
 
-#: src/away.c:418
+#: src/away.c:422
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:633
+#: src/away.c:638
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:681
+#: src/away.c:745
+msgid "You cannot save an away message with a blank title"
+msgstr "您不能保存空标题的离开消息"
+
+#: src/away.c:747
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "请给消息指定标题,或者不保存直接“使用”。"
+
+#: src/away.c:757
+msgid "You cannot create an empty away message"
+msgstr "您不能创建空的离开消息"
+
+#: src/away.c:822
+msgid "New away message"
+msgstr "新建离开消息"
+
+#: src/away.c:837
+msgid "Away title: "
+msgstr "离开标题:"
+
+#: src/away.c:893
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/away.c:897
+msgid "Sa_ve & Use"
+msgstr "保存并使用(_V)"
+
+#: src/away.c:901
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: src/blist.c:680
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1318
+#: src/blist.c:1317
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1598,18 +1636,18 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1327
+#: src/blist.c:1326
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:2030
+#: src/blist.c:2029
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "分析您的好友列表时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
 
-#: src/blist.c:2033
+#: src/blist.c:2032
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1627,8 +1665,8 @@
 msgstr "连接错误"
 
 #: src/connection.c:195
-#, c-format
-msgid "Enter password for %s"
+#, fuzzy, c-format
+msgid "Enter password for %s (%s)"
 msgstr "输入 %s 的密码"
 
 #: src/conversation.c:229
@@ -1639,232 +1677,66 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1950
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1953
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2049
+#: src/conversation.c:2052
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2055
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2093
+#: src/conversation.c:2096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2098
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2164
+#: src/conversation.c:2167
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2166
+#: src/conversation.c:2169
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2571
+#: src/conversation.c:2574
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2573
+#: src/conversation.c:2576
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2575 src/gtkprefs.c:1377
+#: src/conversation.c:2578 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2577
+#: src/conversation.c:2580
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2579
+#: src/conversation.c:2582
 msgid "By account"
 msgstr "按账户"
 
-#: src/gtkdialogs.c:149
-msgid "Warn User"
-msgstr "警告用户"
-
-#: src/gtkdialogs.c:168
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
-"\n"
-"这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
-
-#: src/gtkdialogs.c:177
-msgid "Warn _anonymously?"
-msgstr "匿名警告吗(_A)?"
-
-#: src/gtkdialogs.c:184
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>匿名警告较不容易引起注意。</b>"
-
-#: src/gtkdialogs.c:295
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
-
-#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
-msgid "Remove Buddy"
-msgstr "删除好友"
-
-#: src/gtkdialogs.c:307
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
-
-#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
-msgid "Remove Chat"
-msgstr "删除聊天"
-
-#: src/gtkdialogs.c:319
-#, 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/gtkdialogs.c:322 src/gtkdialogs.c:323
-msgid "Remove Group"
-msgstr "删除组"
-
-#: src/gtkdialogs.c:340
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr ""
-"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
-"吗?"
-
-#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
-msgid "Remove Contact"
-msgstr "删除联系人"
-
-#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
-msgid "_Screen name"
-msgstr "用户名(_S)"
-
-#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
-msgid "_Account"
-msgstr "账户(_A)"
-
-#: src/gtkdialogs.c:468
-msgid "New Instant Message"
-msgstr "新即时消息"
-
-#: src/gtkdialogs.c:470
-msgid "Please enter the screen name of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:524
-msgid "Get User Info"
-msgstr "获取用户信息"
-
-#: src/gtkdialogs.c:526
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr "您想要查看谁的信息?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:577
-msgid "Get User Log"
-msgstr "获取用户日志"
-
-#: src/gtkdialogs.c:579
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:645
-msgid "You cannot save an away message with a blank title"
-msgstr "您不能保存空标题的离开消息"
-
-#: src/gtkdialogs.c:647
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
-msgstr "请给消息指定标题,或者不保存直接“使用”。"
-
-#: src/gtkdialogs.c:657
-msgid "You cannot create an empty away message"
-msgstr "您不能创建空的离开消息"
-
-#: src/gtkdialogs.c:719
-msgid "New away message"
-msgstr "新建离开消息"
-
-#: src/gtkdialogs.c:740
-msgid "Away title: "
-msgstr "离开标题:"
-
-#: src/gtkdialogs.c:796
-msgid "_Save"
-msgstr "保存(_S)"
-
-#: src/gtkdialogs.c:800
-msgid "Sa_ve & Use"
-msgstr "保存并使用(_V)"
-
-#: src/gtkdialogs.c:804
-msgid "_Use"
-msgstr "使用(_U)"
-
-#: src/gtkdialogs.c:826
-msgid "Alias Chat"
-msgstr "给聊天起名"
-
-#: src/gtkdialogs.c:827
-msgid "Enter an alias for this chat."
-msgstr "请输入此聊天的别名。"
-
-#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
-#: src/protocols/silc/chat.c:572
-msgid "Alias"
-msgstr "别名"
-
-#: src/gtkdialogs.c:842
-msgid "Alias Contact"
-msgstr "给联系人起名"
-
-#: src/gtkdialogs.c:843
-msgid "Enter an alias for this contact."
-msgstr "请输入此联系人的别名。"
-
-#: src/gtkdialogs.c:859
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "输入 %s 的别名。"
-
-#: src/gtkdialogs.c:861
-msgid "Alias Buddy"
-msgstr "好友别名"
-
 #: src/ft.c:125
 msgid "That file does not exist."
 msgstr "文件不存在。"
@@ -1948,12 +1820,12 @@
 "    选项:\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
-#: src/gaim-remote.c:224
+#: src/gaim-remote.c:174 src/gaim-remote.c:190 src/gaim-remote.c:206
+#: src/gaim-remote.c:222
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 未运行(会话 0)\n"
 
-#: src/gaim-remote.c:238
+#: src/gaim-remote.c:236
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1993,7 +1865,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:257
+#: src/gaim-remote.c:256
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2001,12 +1873,19 @@
 "\n"
 "关闭 Gaim 的运行副本\n"
 
-#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
-msgid "Unknown"
-msgstr "未知"
-
-#: src/gtkaccount.c:333
+#: src/gaim-remote.c:260
+msgid ""
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+msgstr ""
+
+#: src/gaim-remote.c:264
+msgid ""
+"\n"
+"Set all accounts as not away.\n"
+msgstr ""
+
+#: src/gtkaccount.c:324
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2018,164 +1897,164 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:621
+#: src/gtkaccount.c:624
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:638
+#: src/gtkaccount.c:641
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:643 src/gtkblist.c:4016
+#: src/gtkaccount.c:646 src/gtkblist.c:4014
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:716
+#: src/gtkaccount.c:719
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:721 src/gtkblist.c:4030 src/gtkblist.c:4358
+#: src/gtkaccount.c:724 src/gtkblist.c:4028 src/gtkblist.c:4356
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:725
+#: src/gtkaccount.c:728
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:781
+#: src/gtkaccount.c:784
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:794
+#: src/gtkaccount.c:797
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:803
+#: src/gtkaccount.c:806
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:895
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1031 src/gtkaccount.c:1078
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1037 src/gtkaccount.c:1085
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1043 src/gtkaccount.c:1092
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1049 src/gtkaccount.c:1099
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
+#: src/gtkaccount.c:1055 src/gtkaccount.c:1106
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
+#: src/gtkaccount.c:1061 src/gtkaccount.c:1113 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1149
+#: src/gtkaccount.c:1152
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1156
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1172
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
+#: src/gtkaccount.c:1190 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
+#: src/gtkaccount.c:1199 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
+#: src/gtkaccount.c:1203 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1211
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1581
+#: src/gtkaccount.c:1584
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1583
+#: src/gtkaccount.c:1586
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1610
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1608
+#: src/gtkaccount.c:1611
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1638 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:2000
+#: src/gtkaccount.c:2003
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2004 src/gtkrequest.c:246
+#: src/gtkaccount.c:2007 src/gtkrequest.c:245
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
+#: src/gtkaccount.c:2121 src/protocols/oscar/oscar.c:4000
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6693 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
-#: src/protocols/zephyr/zephyr.c:1375
+#: src/gtkaccount.c:2145 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:6701 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1362
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:2163
+#: src/gtkaccount.c:2166
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2476
+#: src/gtkaccount.c:2479
 #, 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:2490
+#: src/gtkaccount.c:2493
 msgid ""
 "\n"
 "\n"
@@ -2185,18 +2064,18 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2494
+#: src/gtkaccount.c:2497
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2498
+#: src/gtkaccount.c:2501
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2500 src/gtkblist.c:4409 src/gtkconv.c:1380
-#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
+#: src/gtkaccount.c:2503 src/gtkblist.c:4407 src/gtkconv.c:1380
+#: src/gtkconv.c:3714 src/gtkconv.c:3818 src/gtkrequest.c:246
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3628
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "添加"
@@ -2211,15 +2090,15 @@
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
+#: src/gtkblist.c:834 src/gtkpounce.c:410 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3204
+#: src/gtkblist.c:1122 src/gtkblist.c:3200
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1125 src/gtkblist.c:3194
+#: src/gtkblist.c:1125 src/gtkblist.c:3190
 msgid "I_M"
 msgstr "开聊(_M)"
 
@@ -2278,135 +2157,135 @@
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:313
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2322
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2323
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2324
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2325
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2326
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2328
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2329
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2330
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2331
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2332
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2334
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2335
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2338
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2339
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2340
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
+#: src/gtkblist.c:2341
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具(T)/账户操作(_T)"
+
+#: src/gtkblist.c:2342
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具(T)/插件操作(_U)"
+
 #: src/gtkblist.c:2344
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具(T)/账户操作(_T)"
+msgid "/Tools/A_ccounts"
+msgstr "/工具(T)/账户(_C)"
 
 #: src/gtkblist.c:2345
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/工具(T)/插件操作(_U)"
+msgid "/Tools/_File Transfers"
+msgstr "/工具(T)/文件传送(_F)"
+
+#: src/gtkblist.c:2346
+msgid "/Tools/R_oom List"
+msgstr "/工具(T)/房间列表(_O)"
 
 #: src/gtkblist.c:2347
-msgid "/Tools/A_ccounts"
-msgstr "/工具(T)/账户(_C)"
+msgid "/Tools/Pr_eferences"
+msgstr "/工具(T)/首选项(_E)"
 
 #: src/gtkblist.c:2348
-msgid "/Tools/_File Transfers"
-msgstr "/工具(T)/文件传送(_F)"
-
-#: src/gtkblist.c:2349
-msgid "/Tools/R_oom List"
-msgstr "/工具(T)/房间列表(_O)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具(T)/隐私(_I)"
 
 #: src/gtkblist.c:2350
-msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
-
-#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2353
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2354
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2355
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2356
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2377
+#: src/gtkblist.c:2374
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2377
+#: src/gtkblist.c:2374
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2378
+#: src/gtkblist.c:2375
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2406
+#: src/gtkblist.c:2403
 #, c-format
 msgid ""
 "\n"
@@ -2415,7 +2294,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2423,12 +2302,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2482
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2501
+#: src/gtkblist.c:2498
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2436,7 +2315,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2499
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2444,7 +2323,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2503
+#: src/gtkblist.c:2500
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2452,7 +2331,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2460,7 +2339,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2505
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2468,7 +2347,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2476,7 +2355,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2484,7 +2363,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2509
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2492,7 +2371,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2500,7 +2379,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2511
+#: src/gtkblist.c:2508
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2508,108 +2387,108 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2793
+#: src/gtkblist.c:2790
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2795
+#: src/gtkblist.c:2792
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2797
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2800
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2918
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2921
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:2927
+#: src/gtkblist.c:2924
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3008
+#: src/gtkblist.c:3005
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3009
+#: src/gtkblist.c:3006
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3010
+#: src/gtkblist.c:3007
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3073
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
+#: src/gtkblist.c:3076
+msgid "/Tools/Buddy Pounce"
+msgstr "/工具(T)/好友千里眼(P)"
+
 #: src/gtkblist.c:3079
-msgid "/Tools/Buddy Pounce"
-msgstr "/工具(T)/好友千里眼(P)"
+msgid "/Tools/Account Actions"
+msgstr "/工具(T)/账户操作(T)"
 
 #: src/gtkblist.c:3082
-msgid "/Tools/Account Actions"
-msgstr "/工具(T)/账户操作(T)"
-
-#: src/gtkblist.c:3085
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3170
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3172
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3200
+#: src/gtkblist.c:3196
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3210
+#: src/gtkblist.c:3206
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3214
+#: src/gtkblist.c:3210
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3219
+#: src/gtkblist.c:3215
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3224
+#: src/gtkblist.c:3220
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3225
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3970 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3968 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
 #: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3994
+#: src/gtkblist.c:3992
 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. "
@@ -2619,35 +2498,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4054 src/gtkblist.c:4338
+#: src/gtkblist.c:4052 src/gtkblist.c:4336
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4295
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4304
+#: src/gtkblist.c:4302
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4328
+#: src/gtkblist.c:4326
 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:4406
+#: src/gtkblist.c:4404
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4407
+#: src/gtkblist.c:4405
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4974 src/gtkblist.c:5071
+#: src/gtkblist.c:4972 src/gtkblist.c:5069
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2770,7 +2649,7 @@
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2475 src/gtkdebug.c:181
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
@@ -2783,11 +2662,11 @@
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:887 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:130
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:913 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:158
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
@@ -2796,7 +2675,7 @@
 msgstr "开聊"
 
 #. Send File button
-#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
+#: src/gtkconv.c:1337 src/gtkconv.c:3707 src/protocols/oscar/oscar.c:435
 msgid "Send File"
 msgstr "发送文件"
 
@@ -2809,7 +2688,7 @@
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1357 src/gtkconv.c:3725
+#: src/gtkconv.c:1357 src/gtkconv.c:3728
 msgid "Info"
 msgstr "信息"
 
@@ -2817,269 +2696,269 @@
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2483
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2501
+#: src/gtkconv.c:2504
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2531
+#: src/gtkconv.c:2534
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2539
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2545
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:2929
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2934
+#: src/gtkconv.c:2937
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3040
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3488
+#: src/gtkconv.c:3491
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3493
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3495
-msgid "/Conversation/_Find..."
-msgstr "/对话(C)/查找(_F)..."
-
-#: src/gtkconv.c:3497
-msgid "/Conversation/View _Log"
-msgstr "/对话(C)/查看日志(_L)"
-
 #: src/gtkconv.c:3498
+msgid "/Conversation/_Find..."
+msgstr "/对话(C)/查找(_F)..."
+
+#: src/gtkconv.c:3500
+msgid "/Conversation/View _Log"
+msgstr "/对话(C)/查看日志(_L)"
+
+#: src/gtkconv.c:3501
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3503
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3507
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3505
+#: src/gtkconv.c:3508
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3510
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3512
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3511
+#: src/gtkconv.c:3514
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3516
+#: src/gtkconv.c:3519
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3518
+#: src/gtkconv.c:3521
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3520
+#: src/gtkconv.c:3523
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3522
+#: src/gtkconv.c:3525
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3527
+#: src/gtkconv.c:3530
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3532
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3537
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3538
+#: src/gtkconv.c:3541
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3539
+#: src/gtkconv.c:3542
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3543
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3544
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3545
 msgid "/Options/Show T_imestamps"
 msgstr "/选项/显示时间戳(_I)"
 
-#: src/gtkconv.c:3584
+#: src/gtkconv.c:3587
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3589
+#: src/gtkconv.c:3592
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3596
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3602
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3606
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3607
+#: src/gtkconv.c:3610
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3613
+#: src/gtkconv.c:3616
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3620
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3621
+#: src/gtkconv.c:3624
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3625
+#: src/gtkconv.c:3628
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3631
+#: src/gtkconv.c:3634
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3635
+#: src/gtkconv.c:3638
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3641
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3647
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3650
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3653
 msgid "/Options/Show Timestamps"
 msgstr "/选项/显示时间戳(I)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
+#: src/gtkconv.c:3677 src/gtkconv.c:3679 src/gtkconv.c:3797 src/gtkconv.c:3799
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3690
+#: src/gtkconv.c:3693
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3696
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkconv.c:3700 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3700
+#: src/gtkconv.c:3703
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3710
 msgid "Send a file to the user"
 msgstr "给用户发送文件"
 
-#: src/gtkconv.c:3714
+#: src/gtkconv.c:3717
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3721
+#: src/gtkconv.c:3724
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3728 src/gtkconv.c:4108
+#: src/gtkconv.c:3731 src/gtkconv.c:4110
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3808
+#: src/gtkconv.c:3811
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:3814
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3818
+#: src/gtkconv.c:3821
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3825
+#: src/gtkconv.c:3828
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3961
+#: src/gtkconv.c:3963
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4024
+#: src/gtkconv.c:4026
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:4085
+#: src/gtkconv.c:4087
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:4097
+#: src/gtkconv.c:4099
 msgid "Ignore the user"
 msgstr "忽略用户"
 
@@ -3087,46 +2966,179 @@
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
+#: src/gtkconv.c:5228 src/gtkconv.c:5257 src/gtkconv.c:5353 src/gtkconv.c:5411
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5958 src/gtkconv.c:5961
+#: src/gtkconv.c:5969 src/gtkconv.c:5972
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkconv.c:6333
+#: src/gtkconv.c:6344
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6336
+#: src/gtkconv.c:6347
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6340
+#: src/gtkconv.c:6351
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:197
+#: src/gtkdebug.c:196
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:249
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:287
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:293
 msgid "Timestamps"
 msgstr "时间戳"
 
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:244 src/gtkdialogs.c:296
+msgid "_Screen name"
+msgstr "用户名(_S)"
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:250 src/gtkdialogs.c:302
+msgid "_Account"
+msgstr "账户(_A)"
+
+#: src/gtkdialogs.c:118
+msgid "New Instant Message"
+msgstr "新即时消息"
+
+#: src/gtkdialogs.c:120
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "您想要跟谁聊?请输入他/她的用户名。"
+
+#: src/gtkdialogs.c:257
+msgid "Get User Info"
+msgstr "获取用户信息"
+
+#: src/gtkdialogs.c:259
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr "您想要查看谁的信息?请输入他/她的用户名。"
+
+#: src/gtkdialogs.c:310
+msgid "Get User Log"
+msgstr "获取用户日志"
+
+#: src/gtkdialogs.c:312
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "您想要查看谁的日志?请输入他/她的用户名。"
+
+#: src/gtkdialogs.c:346
+msgid "Warn User"
+msgstr "警告用户"
+
+#: src/gtkdialogs.c:365
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
+"\n"
+"这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
+
+#: src/gtkdialogs.c:374
+msgid "Warn _anonymously?"
+msgstr "匿名警告吗(_A)?"
+
+#: src/gtkdialogs.c:381
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>匿名警告较不容易引起注意。</b>"
+
+#: src/gtkdialogs.c:400
+msgid "Alias Contact"
+msgstr "给联系人起名"
+
+#: src/gtkdialogs.c:401
+msgid "Enter an alias for this contact."
+msgstr "请输入此联系人的别名。"
+
+#: src/gtkdialogs.c:403 src/gtkdialogs.c:421 src/gtkdialogs.c:439
+#: src/gtkrequest.c:249 src/protocols/silc/chat.c:572
+msgid "Alias"
+msgstr "别名"
+
+#: src/gtkdialogs.c:417
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "输入 %s 的别名。"
+
+#: src/gtkdialogs.c:419
+msgid "Alias Buddy"
+msgstr "好友别名"
+
+#: src/gtkdialogs.c:436
+msgid "Alias Chat"
+msgstr "给聊天起名"
+
+#: src/gtkdialogs.c:437
+msgid "Enter an alias for this chat."
+msgstr "请输入此聊天的别名。"
+
+#: src/gtkdialogs.c:474
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr ""
+"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
+"吗?"
+
+#: src/gtkdialogs.c:477 src/gtkdialogs.c:478
+msgid "Remove Contact"
+msgstr "删除联系人"
+
+#: src/gtkdialogs.c:530
+#, 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/gtkdialogs.c:533 src/gtkdialogs.c:534
+msgid "Remove Group"
+msgstr "删除组"
+
+#: src/gtkdialogs.c:577
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
+
+#: src/gtkdialogs.c:579 src/gtkdialogs.c:580
+msgid "Remove Buddy"
+msgstr "删除好友"
+
+#: src/gtkdialogs.c:596
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
+
+#: src/gtkdialogs.c:598 src/gtkdialogs.c:599
+msgid "Remove Chat"
+msgstr "删除聊天"
+
 #: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
@@ -3214,7 +3226,7 @@
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:698 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:91
 msgid "_Pause"
 msgstr "暂停(_P)"
 
@@ -3251,22 +3263,22 @@
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2803
+#: src/gtkimhtml.c:2819
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2811
+#: src/gtkimhtml.c:2827
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
+#: src/gtkimhtml.c:2904 src/gtkimhtml.c:2916
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2921
+#: src/gtkimhtml.c:2937
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3381,23 +3393,23 @@
 msgstr "系统日志"
 
 #. Descriptive label
-#: src/gtknotify.c:217
+#: src/gtknotify.c:215
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:231
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:240
+#: src/gtknotify.c:238
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:245
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3408,7 +3420,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:261
+#: src/gtknotify.c:259
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3419,176 +3431,176 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:421
+#: src/gtknotify.c:419
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
-#: src/gtknotify.c:571
+#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:435 src/gtknotify.c:450
+#: src/gtknotify.c:433 src/gtknotify.c:448
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错: %s"
 
-#: src/gtknotify.c:572
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:130
+#: src/gtkpounce.c:129
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:160
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:889
+#: src/gtkpounce.c:386 src/gtkpounce.c:888
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:387
+#: src/gtkpounce.c:386
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:403
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:431
+#: src/gtkpounce.c:430
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:454
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:462
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:464
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:467
+#: src/gtkpounce.c:466
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:469
+#: src/gtkpounce.c:468
 msgid "_Return from away"
 msgstr "回来(_R)"
 
-#: src/gtkpounce.c:471
+#: src/gtkpounce.c:470
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:472
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:475
+#: src/gtkpounce.c:474
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:477
+#: src/gtkpounce.c:476
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:506
+#: src/gtkpounce.c:505
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:514
+#: src/gtkpounce.c:513
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:516
+#: src/gtkpounce.c:515
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:518
+#: src/gtkpounce.c:517
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:520
+#: src/gtkpounce.c:519
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:521
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:525
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
+#: src/gtkpounce.c:527
+msgid "Bro_wse..."
+msgstr "浏览(_W)..."
+
 #: src/gtkpounce.c:528
-msgid "Bro_wse..."
-msgstr "浏览(_W)..."
-
-#: src/gtkpounce.c:529
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:611
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:896
+#: src/gtkpounce.c:895
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:960
+#: src/gtkpounce.c:953
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:962
+#: src/gtkpounce.c:955
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:957
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:959
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:968
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
@@ -3810,8 +3822,8 @@
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
-#: src/protocols/oscar/oscar.c:4848
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:4860
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -4046,16 +4058,18 @@
 msgstr "从不"
 
 #: src/gtkprefs.c:1809
-msgid "Only when away"
+#, fuzzy
+msgid "When away"
 msgstr "仅当离开时"
 
 #: src/gtkprefs.c:1810
-msgid "Only when away and idle"
+#, fuzzy
+msgid "When away and idle"
 msgstr "仅当离开和瞌睡时"
 
 #: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
-#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2776
+#: src/protocols/oscar/oscar.c:4013 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "瞌睡"
@@ -4267,40 +4281,40 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:239 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1864 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:244
+#: src/gtkrequest.c:243
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:244 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1391
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkrequest.c:1393
+#: src/gtkrequest.c:1392
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4375,11 +4389,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:489
+#: src/log.c:491
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:575
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4388,7 +4402,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:577
+#: src/log.c:579
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4397,59 +4411,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:628 src/log.c:815
+#: src/log.c:630 src/log.c:817
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:638 src/log.c:827
+#: src/log.c:640 src/log.c:829
 #, 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:675
+#: src/log.c:677
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:760
+#: src/log.c:762
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:860
+#: src/log.c:862
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/main.c:150
+#: src/main.c:149
 msgid "Please create an account."
 msgstr "请创建一个账户。"
 
-#: src/main.c:232
+#: src/main.c:231
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:248
+#: src/main.c:247
 msgid "<b>_Account:</b>"
 msgstr "<b>账户(_A):</b>"
 
-#: src/main.c:262
+#: src/main.c:261
 msgid "<b>_Password:</b>"
 msgstr "<b>密码(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:279
+#: src/main.c:278
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: src/main.c:285
+#: src/main.c:284
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: src/main.c:291
+#: src/main.c:290
 msgid "_Sign on"
 msgstr "登入(_S)"
 
 #. full help text
-#: src/main.c:517
+#: src/main.c:516
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4482,16 +4496,16 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/main.c:532
+#: src/main.c:531
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/main.c:845
+#: src/main.c:844
 msgid "Unable to load preferences"
 msgstr "无法装入首选项"
 
-#: src/main.c:845
+#: src/main.c:844
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -4523,9 +4537,9 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
-#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
-#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2767
+#: src/protocols/novell/novell.c:2886 src/protocols/novell/novell.c:2937
+#: src/protocols/oscar/oscar.c:600 src/protocols/yahoo/yahoo.c:2894
 #: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "可用"
@@ -4539,10 +4553,10 @@
 msgstr "只对好友离开"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
-#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6699
-#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:5409 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:5511 src/protocols/oscar/oscar.c:6707
+#: src/protocols/oscar/oscar.c:6712 src/protocols/yahoo/yahoo.c:2552
 #: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "隐身"
@@ -4559,7 +4573,7 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1684
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
@@ -4586,17 +4600,17 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3817
 #, 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"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
-#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
-#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:644
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3821
+#: src/protocols/oscar/oscar.c:4042 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:467
+#: src/protocols/zephyr/zephyr.c:643
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4614,9 +4628,9 @@
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
+#: src/protocols/toc/toc.c:169 src/protocols/yahoo/yahoo.c:2199
 #: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
@@ -4644,7 +4658,7 @@
 msgstr "GG 库的关键错误\n"
 
 #: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
-#: src/protocols/toc/toc.c:146
+#: src/protocols/toc/toc.c:145
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
@@ -4681,25 +4695,25 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4840
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4852
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4851 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4863 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4864 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4841
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4853
 #: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "昵称"
@@ -4715,7 +4729,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4907 src/protocols/oscar/oscar.c:4915
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
@@ -4814,7 +4828,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1551
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -4856,56 +4870,56 @@
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
-#: src/protocols/icq/gaim_icq.c:224
+#: src/protocols/icq/gaim_icq.c:223
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
-#: src/protocols/icq/gaim_icq.c:294
+#: src/protocols/icq/gaim_icq.c:293
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:6129
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:240
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6141
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
-#: src/protocols/oscar/oscar.c:6130
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:6142
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/icq/gaim_icq.c:310
+#: src/protocols/icq/gaim_icq.c:309
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:352
+#: src/protocols/icq/gaim_icq.c:351
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:497
 msgid "Nick:"
 msgstr "昵称:"
 
-#: src/protocols/icq/gaim_icq.c:499
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1292
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
 #: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
-#: src/protocols/silc/silc.c:995
+#: src/protocols/silc/silc.c:1001
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
 #: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
-#: src/protocols/silc/silc.c:998
+#: src/protocols/silc/silc.c:1004
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4920,68 +4934,68 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 无法打开监听端口。"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:74
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:74
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:75
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
+#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:387
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:157
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:179 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:205
+#: src/protocols/irc/irc.c:204
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:223 src/protocols/toc/toc.c:197
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/irc/irc.c:233
+#: src/protocols/irc/irc.c:232
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
+#: src/protocols/irc/irc.c:247 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1517 src/protocols/oscar/oscar.c:1581
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:384 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1380
+#: src/protocols/irc/irc.c:535 src/protocols/silc/chat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1379
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1388
 msgid "Topic"
 msgstr "话题"
 
@@ -4994,32 +5008,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:642
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:643
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:643
 #: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
-#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:648
+#: src/protocols/silc/silc.c:1583 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
+#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1918
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
 #: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
 #: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
@@ -5352,7 +5366,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:264
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5371,9 +5385,9 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
-#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
-#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1414
+#: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
+#: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
 msgid "Disconnected."
 msgstr "已断开连接。"
 
@@ -5463,7 +5477,7 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "电子邮件"
@@ -5485,7 +5499,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4888
 msgid "Birthday"
 msgstr "生日"
 
@@ -5505,9 +5519,9 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
-#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:562
-#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2789
+#: src/protocols/novell/novell.c:2793 src/protocols/oscar/oscar.c:560
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:568
 #: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "状态"
@@ -5521,7 +5535,7 @@
 msgstr "中名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:4902
+#: src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4914
 #: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "地址"
@@ -5566,7 +5580,7 @@
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1001
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -5719,14 +5733,14 @@
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4896
-#: src/protocols/oscar/oscar.c:4904 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4916 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
 #: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
-#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
 
@@ -5748,9 +5762,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
-#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2122
+#: src/protocols/oscar/oscar.c:1585 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "正在连接"
 
@@ -5768,7 +5782,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6502
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6510
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -5801,19 +5815,19 @@
 msgstr "出错"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:124
 msgid "Chatty"
 msgstr "唠叨"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:129
 msgid "Extended Away"
 msgstr "远远离开"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5499
+#: src/protocols/oscar/oscar.c:6703
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -5841,7 +5855,7 @@
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -6124,7 +6138,7 @@
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1579
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6161,39 +6175,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:232
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:230
+#: src/protocols/jabber/presence.c:235
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:285 src/protocols/jabber/presence.c:286
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:285
+#: src/protocols/jabber/presence.c:287
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:287
+#: src/protocols/jabber/presence.c:289
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:289
+#: src/protocols/jabber/presence.c:291
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:319
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:314
+#: src/protocols/jabber/presence.c:322
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -6263,7 +6277,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:601
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -6315,7 +6329,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6408,8 +6422,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
-#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2014
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:629
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6516,8 +6530,8 @@
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2773
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2942
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
 #: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
 #: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
@@ -6537,7 +6551,7 @@
 msgstr "外出就餐"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1357 src/protocols/zephyr/zephyr.c:1376
 msgid "Hidden"
 msgstr "隐身"
 
@@ -6586,23 +6600,18 @@
 "ssl.php 中的更多信息。"
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/zephyr/zephyr.c:634
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
 #. put a link to the actual profile URL
 #: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
-#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1173
-#, c-format
-msgid "<font sml=\"msn\">%s</font><br>"
-msgstr "<font sml=\"msn\">%s</font><br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
@@ -6613,14 +6622,14 @@
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4881
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4893
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4867
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4879
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6740,7 +6749,7 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2306
+#: src/protocols/oscar/oscar.c:2304
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6818,50 +6827,50 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "用户 %s 想要将 %s 添加为好友。"
 
-#: src/protocols/napster/napster.c:230
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:244
+#: src/protocols/napster/napster.c:243
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6200
-#: src/protocols/toc/toc.c:1267
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6212
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -6876,7 +6885,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
+#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -7015,86 +7024,86 @@
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:375
+#: src/protocols/novell/novell.c:378
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:401
+#: src/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "无法发送消息(%s)。"
 
-#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "无法邀请用户(%s)。"
 
-#: src/protocols/novell/novell.c:511
+#: src/protocols/novell/novell.c:514
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:516
+#: src/protocols/novell/novell.c:519
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "无法发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:563
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:611
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:683
+#: src/protocols/novell/novell.c:686
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "无法获得用户 %s 的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
-#: src/protocols/novell/novell.c:776
+#: src/protocols/novell/novell.c:779
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "无法将“%s”添加到您的好友列表中(%s)。"
 
-#: src/protocols/novell/novell.c:829
+#: src/protocols/novell/novell.c:832
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "无法将 %s 添加到您的许可列表中(%s)。"
 
-#: src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:900
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1593
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
 
-#: src/protocols/novell/novell.c:992
+#: src/protocols/novell/novell.c:995
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1632
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1426
+#: src/protocols/novell/novell.c:1445
 msgid "Userid"
 msgstr "用户 ID"
 
@@ -7105,46 +7114,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1440
+#: src/protocols/novell/novell.c:1459
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1479
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1564
+#: src/protocols/novell/novell.c:1583
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1589
+#: src/protocols/novell/novell.c:1608
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1638
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1653
+#: src/protocols/novell/novell.c:1672
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1687
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1822
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1849
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1850
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7155,15 +7164,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1852
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1936
+#: src/protocols/novell/novell.c:1955
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:1990
+#: src/protocols/novell/novell.c:2009
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7173,34 +7182,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2088
+#: src/protocols/novell/novell.c:2107
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2110
+#: src/protocols/novell/novell.c:2129
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2419
+#: src/protocols/novell/novell.c:2433
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:570
-#: src/protocols/oscar/oscar.c:6504 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2779 src/protocols/oscar/oscar.c:568
+#: src/protocols/oscar/oscar.c:6512 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2790
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2945
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3291
+#: src/protocols/novell/novell.c:3339
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -7215,295 +7224,295 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
+#: src/protocols/novell/novell.c:3435 src/protocols/novell/novell.c:3437
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3408
+#: src/protocols/novell/novell.c:3456
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3412
+#: src/protocols/novell/novell.c:3460
 msgid "Server port"
 msgstr "服务器端口"
 
+#: src/protocols/oscar/oscar.c:184
+msgid "Invalid error"
+msgstr "无效错误"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Invalid SNAC"
+msgstr "无效 SNAC"
+
 #: src/protocols/oscar/oscar.c:186
-msgid "Invalid error"
-msgstr "无效错误"
+msgid "Rate to host"
+msgstr "主机等级"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Invalid SNAC"
-msgstr "无效 SNAC"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Rate to host"
-msgstr "主机等级"
-
-#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:189
 msgid "Service unavailable"
 msgstr "服务不可用"
 
+#: src/protocols/oscar/oscar.c:190
+msgid "Service not defined"
+msgstr "服务未定义"
+
+#: src/protocols/oscar/oscar.c:191
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
+
 #: src/protocols/oscar/oscar.c:192
-msgid "Service not defined"
-msgstr "服务未定义"
+msgid "Not supported by host"
+msgstr "主机不支持"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
+msgid "Not supported by client"
+msgstr "客户不支持"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Not supported by host"
-msgstr "主机不支持"
+msgid "Refused by client"
+msgstr "客户拒绝"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Not supported by client"
-msgstr "客户不支持"
-
-#: src/protocols/oscar/oscar.c:196
-msgid "Refused by client"
-msgstr "客户拒绝"
-
-#: src/protocols/oscar/oscar.c:197
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:196
 msgid "Responses lost"
 msgstr "响应丢失"
 
+#: src/protocols/oscar/oscar.c:197
+msgid "Request denied"
+msgstr "请求被禁止"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Busted SNAC payload"
+msgstr "SNAC 有效负载激增"
+
 #: src/protocols/oscar/oscar.c:199
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Insufficient rights"
+msgstr "权限不够"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Busted SNAC payload"
-msgstr "SNAC 有效负载激增"
+msgid "In local permit/deny"
+msgstr "本地许可/禁止"
 
 #: src/protocols/oscar/oscar.c:201
-msgid "Insufficient rights"
-msgstr "权限不够"
+msgid "Too evil (sender)"
+msgstr "太邪恶(发送者)"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "In local permit/deny"
-msgstr "本地许可/禁止"
-
-#: src/protocols/oscar/oscar.c:203
-msgid "Too evil (sender)"
-msgstr "太邪恶(发送者)"
-
-#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:203
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
+#: src/protocols/oscar/oscar.c:204
+msgid "No match"
+msgstr "无匹配"
+
+#: src/protocols/oscar/oscar.c:205
+msgid "List overflow"
+msgstr "列表溢出"
+
 #: src/protocols/oscar/oscar.c:206
-msgid "No match"
-msgstr "无匹配"
+msgid "Request ambiguous"
+msgstr "请求含糊"
 
 #: src/protocols/oscar/oscar.c:207
-msgid "List overflow"
-msgstr "列表溢出"
+msgid "Queue full"
+msgstr "队列满"
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Request ambiguous"
-msgstr "请求含糊"
-
-#: src/protocols/oscar/oscar.c:209
-msgid "Queue full"
-msgstr "队列满"
-
-#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:398
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:423
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:426
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:429 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6806
+#: src/protocols/oscar/oscar.c:432 src/protocols/oscar/oscar.c:6814
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:439
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:442
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:445
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:448
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:451
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:454
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:457
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:460
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:463
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:466
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:469
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:472
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:475
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:478
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:482
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:485
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:488
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:506 src/protocols/oscar/oscar.c:5508
+#: src/protocols/oscar/oscar.c:6706
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5502
+#: src/protocols/oscar/oscar.c:6704
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:6705
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:516
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:584
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:595
+#: src/protocols/oscar/oscar.c:593
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:728
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:737
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
+#: src/protocols/oscar/oscar.c:814 src/protocols/oscar/oscar.c:945
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:897
+#: src/protocols/oscar/oscar.c:895
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1314
+#: src/protocols/oscar/oscar.c:1312
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1319
+#: src/protocols/oscar/oscar.c:1317
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1354
+#: src/protocols/oscar/oscar.c:1352
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1358
+#: src/protocols/oscar/oscar.c:1356
 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:1362 src/protocols/oscar/oscar.c:3320
+#: src/protocols/oscar/oscar.c:1360 src/protocols/oscar/oscar.c:3318
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
+#: src/protocols/oscar/oscar.c:1427 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1448
+#: src/protocols/oscar/oscar.c:1446
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1527
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1543
+#: src/protocols/oscar/oscar.c:1541
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7513,46 +7522,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1571
+#: src/protocols/oscar/oscar.c:1569
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
+#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:2107
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1680
+#: src/protocols/oscar/oscar.c:1678
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1791 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1798
+#: src/protocols/oscar/oscar.c:1796
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1867
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1991 src/protocols/toc/toc.c:540
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1998
+#: src/protocols/oscar/oscar.c:1996
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2002
+#: src/protocols/oscar/oscar.c:2000
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2007
+#: src/protocols/oscar/oscar.c:2005
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7560,21 +7569,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2010
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2044
+#: src/protocols/oscar/oscar.c:2042
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2116
+#: src/protocols/oscar/oscar.c:2114
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
-#: src/protocols/oscar/oscar.c:2271
+#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2269
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7582,24 +7591,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2153 src/protocols/oscar/oscar.c:2183
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2274
+#: src/protocols/oscar/oscar.c:2272
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3102 src/protocols/oscar/oscar.c:3124
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:3310
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3315
+#: src/protocols/oscar/oscar.c:3313
 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 "
@@ -7608,42 +7617,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3349
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3357
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3358
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3390
+#: src/protocols/oscar/oscar.c:3388
 #, 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:3395 src/protocols/oscar/oscar.c:3397
+#: src/protocols/oscar/oscar.c:3393 src/protocols/oscar/oscar.c:3395
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
-#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
-#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
-#: src/protocols/oscar/oscar.c:6121 src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:3443 src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3452 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:6133 src/protocols/oscar/oscar.c:6179
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3453
+#: src/protocols/oscar/oscar.c:3451
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3546
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7652,11 +7661,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6127
+#: src/protocols/oscar/oscar.c:3554 src/protocols/oscar/oscar.c:6139
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7666,17 +7675,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3557
+#: src/protocols/oscar/oscar.c:3567
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3574
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3582
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7689,7 +7698,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7702,7 +7711,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3588
+#: src/protocols/oscar/oscar.c:3598
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7715,32 +7724,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3619
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3625
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3629
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3713
 #, 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:3712
+#: src/protocols/oscar/oscar.c:3722
 #, 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:3721
+#: src/protocols/oscar/oscar.c:3731
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7748,85 +7757,85 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3730
+#: src/protocols/oscar/oscar.c:3740
 #, 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:3739
+#: src/protocols/oscar/oscar.c:3749
 #, 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:3748
+#: src/protocols/oscar/oscar.c:3758
 #, 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:3802 src/protocols/oscar/oscar.c:4031
+#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:3868
+#: src/protocols/oscar/oscar.c:3878
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3869
+#: src/protocols/oscar/oscar.c:3879
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/protocols/oscar/oscar.c:3905
+#: src/protocols/oscar/oscar.c:3915
 msgid "Your message did not get sent."
 msgstr "未发送您的消息。"
 
-#: src/protocols/oscar/oscar.c:3906
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3965
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:3967
+#: src/protocols/oscar/oscar.c:3977
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:4001
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:4004
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4008 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4092
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4268
+#: src/protocols/oscar/oscar.c:4278
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4486
+#: src/protocols/oscar/oscar.c:4498
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:4499
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7834,166 +7843,166 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4550
+#: src/protocols/oscar/oscar.c:4562
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4552
+#: src/protocols/oscar/oscar.c:4564
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4583
+#: src/protocols/oscar/oscar.c:4595
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:4854 src/protocols/oscar/oscar.c:4861
+#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4873
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4878 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4879
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4884
+#: src/protocols/oscar/oscar.c:4896
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:4900
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4893
+#: src/protocols/oscar/oscar.c:4905
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:4909 src/protocols/oscar/oscar.c:4917
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4913
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4921
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4922
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4911
+#: src/protocols/oscar/oscar.c:4923
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4924
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4914
+#: src/protocols/oscar/oscar.c:4926
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4936
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4973
+#: src/protocols/oscar/oscar.c:4985
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4994
+#: src/protocols/oscar/oscar.c:5006
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5010
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5036
+#: src/protocols/oscar/oscar.c:5048
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5050
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5081
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5084
 #, 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:5075
+#: src/protocols/oscar/oscar.c:5087
 #, 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:5078
+#: src/protocols/oscar/oscar.c:5090
 #, 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:5081
+#: src/protocols/oscar/oscar.c:5093
 #, 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:5084
+#: src/protocols/oscar/oscar.c:5096
 #, 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:5087
+#: src/protocols/oscar/oscar.c:5099
 #, 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:5090
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5112
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8002,25 +8011,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5113 src/protocols/oscar/oscar.c:5120
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5183
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5345
+#: src/protocols/oscar/oscar.c:5357
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5358
 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 "
@@ -8029,7 +8038,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5385
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8039,19 +8048,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5390
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:5406 src/protocols/oscar/oscar.c:6711
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5424
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5425
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8060,7 +8069,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/oscar/oscar.c:5465
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8072,11 +8081,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:5470
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5548
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8086,16 +8095,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5538 src/protocols/oscar/oscar.c:5987
-#: src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:5550 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6013
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5711
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5712
 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 "
@@ -8104,13 +8113,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5882 src/protocols/oscar/oscar.c:5883
-#: src/protocols/oscar/oscar.c:5888 src/protocols/oscar/oscar.c:6045
-#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:5894 src/protocols/oscar/oscar.c:5895
+#: src/protocols/oscar/oscar.c:5900 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:6058 src/protocols/oscar/oscar.c:6063
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5985
+#: src/protocols/oscar/oscar.c:5997
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8118,11 +8127,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5985 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6011
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6011
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8132,18 +8141,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6094
 #, 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:6088
+#: src/protocols/oscar/oscar.c:6100
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6121
+#: src/protocols/oscar/oscar.c:6133
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8153,17 +8162,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6175
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6176
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:6179
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8173,76 +8182,76 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6180
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6205 src/protocols/toc/toc.c:1272
+#: src/protocols/oscar/oscar.c:6217 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6227
+#: src/protocols/oscar/oscar.c:6239
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6317
+#: src/protocols/oscar/oscar.c:6329
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6484
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:6770
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:6763
+#: src/protocols/oscar/oscar.c:6771
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6782
+#: src/protocols/oscar/oscar.c:6790
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6796
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6800
+#: src/protocols/oscar/oscar.c:6808
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:6825
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6847
+#: src/protocols/oscar/oscar.c:6855
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:6856
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6863
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6907
+#: src/protocols/oscar/oscar.c:6915
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6960
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6955
+#: src/protocols/oscar/oscar.c:6963
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6956
+#: src/protocols/oscar/oscar.c:6964
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8250,75 +8259,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:6981
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:6982
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6975
+#: src/protocols/oscar/oscar.c:6983
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:7000
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:7001
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:7075 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7083 src/protocols/silc/silc.c:795
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:7088
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7086
+#: src/protocols/oscar/oscar.c:7094
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:7091 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7099 src/protocols/silc/silc.c:791
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7096
+#: src/protocols/oscar/oscar.c:7104
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7100
+#: src/protocols/oscar/oscar.c:7108
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7109
-msgid "Format Screen Name..."
-msgstr "格式化用户名..."
-
-#: src/protocols/oscar/oscar.c:7113
-msgid "Confirm Account"
-msgstr "确认账户"
-
 #: src/protocols/oscar/oscar.c:7117
+msgid "Format Screen Name..."
+msgstr "格式化用户名..."
+
+#: src/protocols/oscar/oscar.c:7121
+msgid "Confirm Account"
+msgstr "确认账户"
+
+#: src/protocols/oscar/oscar.c:7125
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7129
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7128
+#: src/protocols/oscar/oscar.c:7136
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7134
+#: src/protocols/oscar/oscar.c:7142
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7139
+#: src/protocols/oscar/oscar.c:7147
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -8333,15 +8342,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7257 src/protocols/oscar/oscar.c:7259
+#: src/protocols/oscar/oscar.c:7265 src/protocols/oscar/oscar.c:7267
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7278
+#: src/protocols/oscar/oscar.c:7286
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7291
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -8531,57 +8540,57 @@
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:616
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:618
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:620
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:622
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:624
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:626
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:628
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:630
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:632
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "饥渴"
@@ -8611,7 +8620,7 @@
 msgstr "设备"
 
 #: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
-#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
+#: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
 msgid "Timezone"
 msgstr "时区"
 
@@ -8840,11 +8849,11 @@
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:894
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:895
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -8989,7 +8998,7 @@
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:783
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
@@ -9110,7 +9119,7 @@
 msgstr "服务器断开连接"
 
 #: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
-#: src/protocols/silc/silc.c:167
+#: src/protocols/silc/silc.c:173
 msgid "Resuming session"
 msgstr "恢复会话"
 
@@ -9207,32 +9216,32 @@
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/protocols/silc/silc.c:159
+#: src/protocols/silc/silc.c:165
 msgid "Cannot initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
-#: src/protocols/silc/silc.c:170
+#: src/protocols/silc/silc.c:176
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: src/protocols/silc/silc.c:242
+#: src/protocols/silc/silc.c:248
 msgid "Out of memory"
 msgstr "内存溢出"
 
 #. Progress
-#: src/protocols/silc/silc.c:276
+#: src/protocols/silc/silc.c:282
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/silc.c:612
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/silc.c:614
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:639
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9240,43 +9249,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:647 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:649 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:651 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:650
+#: src/protocols/silc/silc.c:656
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:663
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:660
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:672
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:673
+#: src/protocols/silc/silc.c:679
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:693
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:688
+#: src/protocols/silc/silc.c:694
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9285,186 +9294,186 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
-#: src/protocols/silc/silc.c:1135
+#: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:1141
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:728
+#: src/protocols/silc/silc.c:734
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
+#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1136
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:772
+#: src/protocols/silc/silc.c:778
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:781
+#: src/protocols/silc/silc.c:787
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:853
+#: src/protocols/silc/silc.c:859
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:962
+#: src/protocols/silc/silc.c:968
 msgid "Failed to leave channel"
 msgstr "离开频道失败"
 
-#: src/protocols/silc/silc.c:1006
+#: src/protocols/silc/silc.c:1012
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1087
+#: src/protocols/silc/silc.c:1093
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1189
+#: src/protocols/silc/silc.c:1195
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1194
+#: src/protocols/silc/silc.c:1200
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1196
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1209
+#: src/protocols/silc/silc.c:1215
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1239
+#: src/protocols/silc/silc.c:1245
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1302
+#: src/protocols/silc/silc.c:1308
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1306
+#: src/protocols/silc/silc.c:1312
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1310
+#: src/protocols/silc/silc.c:1316
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1315
+#: src/protocols/silc/silc.c:1321
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1319
+#: src/protocols/silc/silc.c:1325
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1323
+#: src/protocols/silc/silc.c:1329
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
+#: src/protocols/silc/silc.c:1333 src/protocols/zephyr/zephyr.c:1675
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1331
+#: src/protocols/silc/silc.c:1337
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1335
+#: src/protocols/silc/silc.c:1341
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1345
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1349
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1353
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1359
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1357
+#: src/protocols/silc/silc.c:1363
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1361
+#: src/protocols/silc/silc.c:1367
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1365
+#: src/protocols/silc/silc.c:1371
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: src/protocols/silc/silc.c:1369
+#: src/protocols/silc/silc.c:1375
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: src/protocols/silc/silc.c:1373
+#: src/protocols/silc/silc.c:1379
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1383
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1387
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1391
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1395
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1399
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1403
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1407
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1411
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1410
+#: src/protocols/silc/silc.c:1416
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1414
+#: src/protocols/silc/silc.c:1420
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9472,39 +9481,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1426
+#: src/protocols/silc/silc.c:1432
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1431
+#: src/protocols/silc/silc.c:1437
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1436
+#: src/protocols/silc/silc.c:1442
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1445
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1444
+#: src/protocols/silc/silc.c:1450
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1449
+#: src/protocols/silc/silc.c:1455
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1452
+#: src/protocols/silc/silc.c:1458
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1463
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1468
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9518,40 +9527,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1548
+#: src/protocols/silc/silc.c:1554
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1550
+#: src/protocols/silc/silc.c:1556
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1580
+#: src/protocols/silc/silc.c:1586
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1586
+#: src/protocols/silc/silc.c:1592
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1590
+#: src/protocols/silc/silc.c:1596
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1595
+#: src/protocols/silc/silc.c:1601
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1598
+#: src/protocols/silc/silc.c:1604
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/silc/silc.c:1607
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1610
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -9642,110 +9651,110 @@
 msgid "Terminal"
 msgstr "终端"
 
-#: src/protocols/toc/toc.c:137
+#: src/protocols/toc/toc.c:136
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:479
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:495
+#: src/protocols/toc/toc.c:494
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:498
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:501
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:504
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:507
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:534
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:543
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:546
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:550
+#: src/protocols/toc/toc.c:549
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -9753,37 +9762,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息: %s"
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:575
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:616
+#: src/protocols/toc/toc.c:615
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:695
+#: src/protocols/toc/toc.c:694
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:891
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
+#: src/protocols/toc/toc.c:894
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 发送了 PAUSE 命令。"
+
 #: src/protocols/toc/toc.c:895
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC 发送了 PAUSE 命令。"
-
-#: src/protocols/toc/toc.c:896
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -9793,43 +9802,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1410
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1668
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1704
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
-#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1946
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2046
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2080
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -9845,15 +9854,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -10050,7 +10059,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
 #: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "连接问题"
@@ -10255,57 +10264,57 @@
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:192
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
 
-#: src/protocols/yahoo/yahoochat.c:195
+#: src/protocols/yahoo/yahoochat.c:194
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:425
+#: src/protocols/yahoo/yahoochat.c:424
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您现在正在 %s 中聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:578
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1337
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1337
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1383
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1386
+#: src/protocols/yahoo/yahoochat.c:1385
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1451
+#: src/protocols/yahoo/yahoochat.c:1450
 msgid "User Rooms"
 msgstr "用户房间"
 
@@ -10313,79 +10322,79 @@
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
 
-#: src/protocols/zephyr/zephyr.c:598
+#: src/protocols/zephyr/zephyr.c:597
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:632
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:637
+#: src/protocols/zephyr/zephyr.c:636
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:642
+#: src/protocols/zephyr/zephyr.c:641
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
+#: src/protocols/zephyr/zephyr.c:986 src/protocols/zephyr/zephyr.c:987
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:1389
+#: src/protocols/zephyr/zephyr.c:1388
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1394
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/zephyr/zephyr.c:1400
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:1412
+#: src/protocols/zephyr/zephyr.c:1411
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:1681
+#: src/protocols/zephyr/zephyr.c:1680
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:1686
+#: src/protocols/zephyr/zephyr.c:1685
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:1691
+#: src/protocols/zephyr/zephyr.c:1690
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:1696
+#: src/protocols/zephyr/zephyr.c:1695
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:1702
+#: src/protocols/zephyr/zephyr.c:1701
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
 
-#: src/protocols/zephyr/zephyr.c:1707
+#: src/protocols/zephyr/zephyr.c:1706
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:1713
+#: src/protocols/zephyr/zephyr.c:1712
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:1719
+#: src/protocols/zephyr/zephyr.c:1718
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10393,7 +10402,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:1725
+#: src/protocols/zephyr/zephyr.c:1724
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10401,15 +10410,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:1730
+#: src/protocols/zephyr/zephyr.c:1729
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:1806
+#: src/protocols/zephyr/zephyr.c:1805
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:1809
+#: src/protocols/zephyr/zephyr.c:1808
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10424,46 +10433,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
+#: src/protocols/zephyr/zephyr.c:1888 src/protocols/zephyr/zephyr.c:1890
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1910
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1913
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1916
+#: src/protocols/zephyr/zephyr.c:1915
 msgid "Exposure"
 msgstr "暴露"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:845
+#: src/proxy.c:870
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:849
+#: src/proxy.c:874
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:171
+#: src/prpl.h:181
 msgid "Custom"
 msgstr "自定义"
 
@@ -10474,66 +10483,66 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:63
+#: src/server.c:64
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:534
+#: src/server.c:535
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: src/server.c:945
+#: src/server.c:946
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:959
+#: src/server.c:960
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1188 src/server.c:1197
+#: src/server.c:1189 src/server.c:1198
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1209
+#: src/server.c:1210
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1224
+#: src/server.c:1225
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1226
+#: src/server.c:1227
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1240
+#: src/server.c:1241
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/server.c:1251
+#: src/server.c:1252
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1261 src/server.c:1268
+#: src/server.c:1262 src/server.c:1269
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1281
+#: src/server.c:1282
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1343
+#: src/server.c:1344
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10542,11 +10551,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1346
+#: src/server.c:1347
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1456
+#: src/server.c:1457
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10555,12 +10564,12 @@
 "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 "%s"
 
-#: src/server.c:1460
+#: src/server.c:1461
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 
-#: src/server.c:1466
+#: src/server.c:1467
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -10576,46 +10585,51 @@
 msgstr "别名(_A)"
 
 #: src/stock.c:88
-msgid "_Modify"
-msgstr "修改(_M)"
+#, fuzzy
+msgid "_Invite"
+msgstr "邀请"
 
 #: src/stock.c:89
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/stock.c:90
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/stock.c:91
+#: src/stock.c:92
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2363
+#: src/util.c:2353
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2366
+#: src/util.c:2356
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2392
+#: src/util.c:2382
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2406
+#: src/util.c:2396
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2414
+#: src/util.c:2404
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2422
+#: src/util.c:2412
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2832
+#: src/util.c:2822
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
@@ -10631,3 +10645,5 @@
 msgid "Notification"
 msgstr "提示"
 
+#~ msgid "<font sml=\"msn\">%s</font><br>"
+#~ msgstr "<font sml=\"msn\">%s</font><br>"