changeset 8895:a4c2a6ab4322

[gaim-migrate @ 9664] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 06 May 2004 20:16:14 +0000
parents 217dd0cc4a3e
children 136b4e159d04
files po/zh_CN.po
diffstat 1 files changed, 2240 insertions(+), 1281 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Thu May 06 18:20:00 2004 +0000
+++ b/po/zh_CN.po	Thu May 06 20:16:14 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
-"PO-Revision-Date: 2004-04-17 00:23+0800\n"
+"POT-Creation-Date: 2004-05-06 10:09-0400\n"
+"PO-Revision-Date: 2004-05-07 04:05+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "错误消息屏蔽"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "隐藏断开连接错误"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "隐藏登录错误"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -23,7 +35,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
@@ -31,7 +43,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
@@ -146,19 +158,21 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1599 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2266 src/protocols/novell/novell.c:2318
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4827
+#: src/protocols/oscar/oscar.c:5810 src/protocols/oscar/oscar.c:6428
+#: src/protocols/silc/buddy.c:1360 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "离开"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:4745 src/protocols/oscar/oscar.c:6436
 msgid "Back"
 msgstr "回来"
 
@@ -170,12 +184,11 @@
 msgid "File Transfers"
 msgstr "文件传送"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2571
 msgid "Preferences"
 msgstr "首选项"
 
@@ -261,16 +274,17 @@
 msgstr "无效的 AIM URI"
 
 #: plugins/gaim-remote/remote.c:651
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
-msgstr "存储图像失败: %s\n"
+msgstr ""
+"将 %s 指派给套接字失败:\n"
+"%s"
 
 #: plugins/gaim-remote/remote.c:674
-#, fuzzy
 msgid "Unable to open socket"
-msgstr "无法读取套接字"
+msgstr "无法打开套接字"
 
 #. *< api_version
 #. *< type
@@ -389,15 +403,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2957 src/gtkprefs.c:836 src/gtkprefs.c:971
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1632 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "无"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1979
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1369 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
@@ -412,13 +426,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6699
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3978
+#: src/gtkblist.c:4306
 msgid "Group:"
 msgstr "组:"
 
@@ -455,8 +469,8 @@
 msgstr "关联好友(_A)"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3803
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "好友"
 
@@ -955,7 +969,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:910
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
@@ -1074,7 +1088,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:840
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -1096,15 +1110,19 @@
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:425
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "好友列表和对话窗口的可变透明度。"
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"此插件能够让对话窗口有可变的 alpha 透明度。\n"
+"此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
 "\n"
 "* 注意:此插件需要 Win2000 或 WinXP。"
 
@@ -1122,8 +1140,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2998
+#: src/gtkprefs.c:2478
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1142,8 +1160,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:880
+#: src/gtkprefs.c:2479 src/protocols/msn/msn.c:1611
 msgid "Conversations"
 msgstr "对话"
 
@@ -1179,9 +1197,8 @@
 "行。<BR><BR>"
 
 #: src/about.c:104
-#, fuzzy
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
 #: src/about.c:109
 msgid "Active Developers"
@@ -1215,268 +1232,293 @@
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:144
+#: src/about.c:145
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:145
-msgid "former libfaim maintainer"
-msgstr "先前 libfaim 维护者"
-
 #: src/about.c:146
+msgid "former libfaim maintainer"
+msgstr "先前 libfaim 维护者"
+
+#: src/about.c:147
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:150
-msgid "former Jabber developer"
-msgstr "先前 Jabber 开发者"
-
 #: src/about.c:151
+msgid "former Jabber developer"
+msgstr "先前 Jabber 开发者"
+
+#: src/about.c:152
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:162
+#: src/about.c:163
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:163 src/about.c:197
+#: src/about.c:164 src/about.c:201
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:165 src/about.c:202
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:165
-msgid "Danish"
-msgstr "丹麦语"
-
 #: src/about.c:166
+msgid "Danish"
+msgstr "丹麦语"
+
+#: src/about.c:167
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:168
+msgid "Canadian English"
+msgstr "加拿大英语"
+
+#: src/about.c:169 src/about.c:203
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:170 src/about.c:204
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:171 src/about.c:205
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:172 src/about.c:206
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:171
+#: src/about.c:173
+msgid "Hebrew"
+msgstr "希伯莱语"
+
+#: src/about.c:174
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:172
+#: src/about.c:175
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:176 src/about.c:207
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:177 src/about.c:209
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:175
+#: src/about.c:178
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:176
+#: src/about.c:179
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/about.c:177
+#: src/about.c:180
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:181 src/about.c:210
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:179
+#: src/about.c:182
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:185 src/about.c:211
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:183
+#: src/about.c:186
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:187
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: src/about.c:188 src/about.c:213
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:185
+#: src/about.c:189
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:185
+#: src/about.c:189
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南语团队"
 
-#: src/about.c:186
+#: src/about.c:190
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:187
+#: src/about.c:191
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:195
+#: src/about.c:199
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:196
+#: src/about.c:200
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "希伯莱语"
-
-#: src/about.c:205
+#: src/about.c:208
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:209
+#: src/about.c:212
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:211
+#: src/about.c:214
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:998
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:288
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:341
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:343 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1043
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:202 src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:224 src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:6489
+#: src/protocols/oscar/oscar.c:6585 src/protocols/oscar/oscar.c:6634
+#: src/protocols/oscar/oscar.c:6716 src/protocols/silc/buddy.c:447
+#: src/protocols/silc/buddy.c:1087 src/protocols/silc/chat.c:657
+#: src/protocols/silc/ops.c:978 src/protocols/silc/ops.c:1389
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
+#: src/request.h:1242
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
+#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:853 src/dialogs.c:875
+#: src/dialogs.c:892 src/dialogs.c:911 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2364 src/gtkblist.c:4345
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575
+#: src/gtkprivacy.c:588 src/gtkprivacy.c:613 src/gtkprivacy.c:624
+#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2841
+#: src/protocols/oscar/oscar.c:6307 src/protocols/oscar/oscar.c:6490
+#: src/protocols/oscar/oscar.c:6586 src/protocols/oscar/oscar.c:6635
+#: src/protocols/oscar/oscar.c:6700 src/protocols/oscar/oscar.c:6717
+#: src/protocols/silc/buddy.c:448 src/protocols/silc/buddy.c:992
+#: src/protocols/silc/buddy.c:1088 src/protocols/silc/chat.c:658
+#: src/protocols/silc/ops.c:1390 src/protocols/trepia/trepia.c:347
 #: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/account.c:381 src/dialogs.c:841 src/gtkrequest.c:242
 #: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "离开!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:375
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "您真的想要删除离开消息“%s”吗?"
+
+#: src/away.c:332 src/away.c:423
+msgid "Remove Away Message"
+msgstr "删除离开消息"
+
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3438
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "删除"
+
+#: src/away.c:403
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:395
-msgid "Remove Away Message"
-msgstr "删除离开消息"
-
-#: src/away.c:590
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:590 src/gtkprefs.c:2481
 msgid "Chats"
 msgstr "聊天"
 
@@ -1496,8 +1538,8 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:693
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2161
 msgid "Unknown"
 msgstr "未知"
 
@@ -1505,12 +1547,14 @@
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr "处理您的好友列表时出错。好友列表未装入。"
-
-#: src/blist.c:2222
+#: src/blist.c:2235
+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:2238
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1532,67 +1576,67 @@
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1969
+#: src/conversation.c:1966
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1972
+#: src/conversation.c:1969
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2061
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2064
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2107
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2185
+#: src/conversation.c:2182
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2184
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2467
+#: src/conversation.c:2464
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2466 src/gtkprefs.c:1371
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2468
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2470
 msgid "By account"
 msgstr "按账户"
 
@@ -1723,40 +1767,41 @@
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:843
+#: src/dialogs.c:845
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:847
+#: src/dialogs.c:849
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:868
+#: src/dialogs.c:871
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:872
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:874 src/dialogs.c:891 src/dialogs.c:910 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:545
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:885
+#: src/dialogs.c:888
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:889
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:906
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:905
+#: src/dialogs.c:908
 msgid "Alias Buddy"
 msgstr "好友别名"
 
@@ -1866,19 +1911,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:375 src/gaimrc.c:1439
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1248 src/gtkblist.c:2959
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1250 src/gtkblist.c:2960
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1252 src/gtkblist.c:2961
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1902,7 +1947,7 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3950
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1910,7 +1955,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484 src/gtkblist.c:3964 src/gtkblist.c:4292
 msgid "Alias:"
 msgstr "别名:"
 
@@ -1971,7 +2016,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1172
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -1987,15 +2032,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:937 src/gtkprefs.c:1166
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:946 src/gtkprefs.c:1196
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:950 src/gtkprefs.c:1214
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -2003,7 +2048,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:963 src/gtkprefs.c:1251
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -2025,7 +2070,7 @@
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
 msgid "Register"
 msgstr "注册"
 
@@ -2038,14 +2083,15 @@
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3364
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:6427 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1182
+#: src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "在线"
 
@@ -2077,13 +2123,13 @@
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2234 src/gtkblist.c:4344 src/gtkconv.c:1113
+#: src/gtkconv.c:3332 src/gtkconv.c:3431 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3003
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
+#: src/gtkblist.c:801 src/gtkblist.c:4232
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2099,15 +2145,15 @@
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:848 src/gtkpounce.c:431 src/gtkroomlist.c:365
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1087 src/gtkblist.c:3148
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1090 src/gtkblist.c:3139
 msgid "I_M"
 msgstr "开聊(_M)"
 
@@ -2162,7 +2208,7 @@
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: src/gtkblist.c:1964 src/gtkconv.c:3943 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
@@ -2226,8 +2272,8 @@
 msgstr "/工具(T)/好友千里眼(_P)"
 
 #: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/工具(T)/协议操作(_R)"
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具(T)/账户操作(_T)"
 
 #: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
@@ -2292,8 +2338,10 @@
 "<b>账户:</b>%s"
 
 #: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>状态:</b> 离线"
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr "\n<b>状态:</b> 离线"
 
 #: src/gtkblist.c:2468
 #, c-format
@@ -2380,77 +2428,79 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2765
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2767
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2772
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2775
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3032
+#: src/gtkblist.c:3025
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3028
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/工具(T)/协议操作(R)"
+#: src/gtkblist.c:3031
+msgid "/Tools/Account Actions"
+msgstr "/工具(T)/账户操作(T)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3119
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3121
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3145
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3154
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3164
+#: src/gtkblist.c:3157
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3162
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3165
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3170
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3905 src/protocols/silc/buddy.c:686
+#: src/protocols/silc/buddy.c:944 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/buddy.c:1079 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3928
 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. "
@@ -2460,29 +2510,29 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3988 src/gtkblist.c:4272
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4239
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4262
 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:4345
+#: src/gtkblist.c:4341
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4342
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4887
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2579,7 +2629,7 @@
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1081 src/gtkprefs.c:767
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2592,182 +2642,176 @@
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "删除"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2200
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2205
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2211
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2578
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2586
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2689
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3109
 msgid "Save Conversation"
 msgstr "保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3126
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3128
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3133
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3135
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3136
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3141
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3143
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3145
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3147
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3152
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3154
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3156
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3163
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3165
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3170
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3174
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3175
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3176
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3177
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3219
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3224
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3230
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3234
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3238
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3244
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3248
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3252
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3256
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3262
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3266
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3272
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3275
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3278
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3410 src/gtkconv.c:3412
 msgid "Send"
 msgstr "发送"
 
@@ -2798,55 +2842,55 @@
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3349 src/gtkconv.c:3690
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3424
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3427
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3434
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3441
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3551
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3612
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:3667
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3679
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4234
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:4779 src/gtkconv.c:4811 src/gtkconv.c:4932 src/gtkconv.c:4999
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5532 src/gtkconv.c:5535
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2970,7 +3014,8 @@
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
-#: src/gtkft.c:1131
+#. Open file selector to select the public key.
+#: src/gtkft.c:1131 src/protocols/silc/buddy.c:978
 msgid "Open..."
 msgstr "打开..."
 
@@ -3011,22 +3056,22 @@
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2642
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2650
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2659
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2682
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3061,52 +3106,56 @@
 msgid "Insert Image"
 msgstr "插入图像"
 
+#: src/gtkimhtmltoolbar.c:616
+msgid "This theme has no available smileys."
+msgstr "此主题没有可用的笑脸。"
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:631
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:849
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:860
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:871
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:887
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:899
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:892
-msgid "Font Face"
-msgstr "字体"
-
-#: src/gtkimhtmltoolbar.c:904
-msgid "Foreground font color"
-msgstr "字体颜色"
-
 #: src/gtkimhtmltoolbar.c:916
+msgid "Font Face"
+msgstr "字体"
+
+#: src/gtkimhtmltoolbar.c:928
+msgid "Foreground font color"
+msgstr "字体颜色"
+
+#: src/gtkimhtmltoolbar.c:940
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:955
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:965
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:976
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3158,602 +3207,539 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:434
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:437 src/gtknotify.c:451 src/gtknotify.c:466
+#: src/gtknotify.c:574
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:448 src/gtknotify.c:463
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错:%s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:575
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:193
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:406 src/gtkpounce.c:846
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:406
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:424
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
-msgstr "好友(_B):"
+#: src/gtkpounce.c:451
+msgid "_Buddy name:"
+msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:475
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:483 src/main.c:298
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:485
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:487
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:489
 msgid "Re_turn from away"
 msgstr "回来(_T)"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:491
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:493
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:495
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:497
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:526
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:533
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:534
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:535
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:536
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:537
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:541
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:543
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:544
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:627
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:853
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:903
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 开始向您打字"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:904
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已登入"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:905
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 睡醒了"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:906
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 回来了"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:907
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止了给您打字"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:908
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已登出"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:909
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 打起瞌睡"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:911
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:407
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:409
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:603
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:638
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:645 src/gtkprefs.c:2016 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "样式"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "粗体(_B)"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "斜体(_I)"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "下划线(_U)"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "删除线(_S)"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "字体"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "使用自定义字体(_M)"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "使用自定义大小(_Z)"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "颜色"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "文字颜色(_T)"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "背景颜色(_K)"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:759 src/gtkprefs.c:1041
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "显示图形化笑脸(_S)"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:760
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "将 URLs 显示为链接(_U)"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:763
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:768
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:770
 msgid "Ignore font _faces"
-msgstr "忽略字体名称(_F)"
-
-#: src/gtkprefs.c:822
+msgstr "忽略字体(_F)"
+
+#: src/gtkprefs.c:772
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:775
+msgid "Ignore formatting on incoming messages"
+msgstr "忽略收到信息的格式"
+
+#: src/gtkprefs.c:786
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:787
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:789
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:792
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:793
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:796
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:846
+#: src/gtkprefs.c:797
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:799
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:815
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:824
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:830
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:831 src/gtkprefs.c:966 src/gtkprefs.c:1016
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:833 src/gtkprefs.c:968 src/gtkprefs.c:1018
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:834 src/gtkprefs.c:969 src/gtkprefs.c:1019
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:835 src/gtkprefs.c:970 src/gtkprefs.c:1020
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:841 src/gtkprefs.c:982 src/gtkprefs.c:1032
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
+#: src/gtkprefs.c:845
+msgid "Group Display"
+msgstr "组显示"
+
+#: src/gtkprefs.c:846
+msgid "Show _numbers in groups"
+msgstr "在组中显示数字(_N)"
+
+#: src/gtkprefs.c:850
+msgid "Buddy Display"
+msgstr "好友显示"
+
+#: src/gtkprefs.c:851 src/gtkprefs.c:989
+msgid "Show buddy _icons"
+msgstr "显示好友图标(_I)"
+
+#: src/gtkprefs.c:853
+msgid "Show _warning levels"
+msgstr "显示警告级别(_W)"
+
+#: src/gtkprefs.c:855
+msgid "Show idle _times"
+msgstr "显示瞌睡时间(_T)"
+
+#: src/gtkprefs.c:857
+msgid "Dim i_dle buddies"
+msgstr "显示睡着的好友(_D)"
+
+#: src/gtkprefs.c:859
+msgid "_Automatically expand contacts"
+msgstr "自动展开联系人(_A)"
+
+#: src/gtkprefs.c:884
+msgid "_Placement:"
+msgstr "位置(_P):"
+
 #: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "分组显示"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "在分组旁显示数字(_N)"
-
-#: src/gtkprefs.c:895
-msgid "Buddy Display"
-msgstr "好友显示"
-
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
-msgid "Show buddy _icons"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkprefs.c:898
-msgid "Show _warning levels"
-msgstr "显示警告级别(_W)"
-
-#: src/gtkprefs.c:900
-msgid "Show idle _times"
-msgstr "显示瞌睡时间(_T)"
-
-#: src/gtkprefs.c:902
-msgid "Dim i_dle buddies"
-msgstr "显示睡着的好友(_D)"
-
-#: src/gtkprefs.c:904
-msgid "_Automatically expand contacts"
-msgstr "自动展开联系人(_A)"
-
-#: src/gtkprefs.c:929
-msgid "_Placement:"
-msgstr "位置(_P):"
-
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "将 URLs 发送为链接(_U)"
-
-#: src/gtkprefs.c:939
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:894
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:897
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:947
+#: src/gtkprefs.c:899
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:901
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:902
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:903
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:904
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:910
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:913
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:923
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:934
 msgid "Show status _icons on tabs"
 msgstr "在标签上显示状态图标(_I)"
 
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:965 src/gtkprefs.c:1015
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
+#: src/gtkprefs.c:976 src/gtkprefs.c:1026
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
+#: src/gtkprefs.c:978 src/gtkprefs.c:1028
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
+#: src/gtkprefs.c:980 src/gtkprefs.c:1030
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:1027
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
-msgstr "发送时隐藏窗口(_S)"
-
-#: src/gtkprefs.c:1031
+msgstr "发送后隐藏窗口(_S)"
+
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "在窗口中显示登录(_L)"
-
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:994
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:995
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1079
+#: src/gtkprefs.c:1035
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1080
+#: src/gtkprefs.c:1036
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1038
 msgid "_Old-style tab completion"
-msgstr "旧风格的 Tab 补全(_O)"
-
-#: src/gtkprefs.c:1086
+msgstr "旧风格的 Tab 补全"
+
+#: src/gtkprefs.c:1043
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1088
+#: src/gtkprefs.c:1045
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1090
+#: src/gtkprefs.c:1048
 msgid "Co_lorize screen names"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1069 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4219
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1071
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1080
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1104
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1107
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1110
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1117
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1165
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1168
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1175
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1233
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1289
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1290
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1291
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1292
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1293
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1294
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1295
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1296
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1305
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1356
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1360
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1367
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1369
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1370
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1372
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1386
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3762,84 +3748,87 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1423
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1426
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1429
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1431
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1434
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1436
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1439
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1445
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1451
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1457
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1464
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "为每个好友的登入创建独立的日志文件(_N)"
+
+#: src/gtkprefs.c:1508
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1551
-#, fuzzy
+#: src/gtkprefs.c:1510
 msgid "Sounds when you _log in"
-msgstr "您登入时无声(_N)"
-
-#: src/gtkprefs.c:1553
+msgstr "您登录时发声(_L)"
+
+#: src/gtkprefs.c:1513
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1515
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1519
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1520
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1522
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1524
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1531
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1541
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3848,73 +3837,73 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1601
 msgid "_Sending messages removes away status"
-msgstr "发送消息就取消离开的状态(_S)"
-
-#: src/gtkprefs.c:1640
+msgstr "发送消息的同时清除离开状态(_S)"
+
+#: src/gtkprefs.c:1604
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1607
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1611
 msgid "Seconds before _resending:"
-msgstr "重发前等的秒数(_R):"
-
-#: src/gtkprefs.c:1649
+msgstr "重发前等待的秒数(_R):"
+
+#: src/gtkprefs.c:1615
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1617
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1620
 msgid "Send auto-response in _active conversations"
-msgstr "在当前对话中发送自动回复(_A)"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
+msgstr "在激活的对话中发送自动回复(_A)"
+
+#: src/gtkprefs.c:1629 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2155 src/protocols/oscar/oscar.c:3377
 #: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1630
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1633
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1636
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1638
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1646
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1647
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1651
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1659
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1734
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3929,7 +3918,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1739
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3944,108 +3933,108 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:1972
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:1986
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2034
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2161
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2268
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2275
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2321
+#: src/gtkprefs.c:2294
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:2325
+#: src/gtkprefs.c:2298
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2329
+#: src/gtkprefs.c:2302
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2437
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2473
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2474
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2502
+#: src/gtkprefs.c:2475
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2476
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2477
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2480
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2482
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2483
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2486
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2488
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2489
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2490
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2491
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2492
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2495
 msgid "Protocols"
 msgstr "协议"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2496
 msgid "Plugins"
 msgstr "插件"
 
@@ -4069,7 +4058,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1277
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4133,13 +4122,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
+#: src/protocols/novell/novell.c:1318 src/protocols/silc/buddy.c:303
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
+#: src/protocols/novell/novell.c:1319 src/protocols/silc/buddy.c:304
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
 
@@ -4147,7 +4138,8 @@
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
+#: src/protocols/silc/util.c:298
 msgid "Close"
 msgstr "关闭"
 
@@ -4224,11 +4216,11 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:130
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:165
 msgid "Save Icon"
 msgstr "保存图标"
 
@@ -4289,16 +4281,21 @@
 msgstr "登入"
 
 #: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>用户名:</b>"
+msgid "<b>_Account:</b>"
+msgstr "<b>账户(_A):</b>"
 
 #: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>密码:</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "登入"
+msgid "<b>_Password:</b>"
+msgstr "<b>密码(_P):</b>"
+
+#. And now for the buttons
+#: src/main.c:286
+msgid "_Accounts"
+msgstr "账户(_A)"
+
+#: src/main.c:292
+msgid "_Preferences"
+msgstr "首选项(_P)"
 
 #. full help text
 #: src/main.c:522
@@ -4360,10 +4357,10 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2146
+#: src/protocols/novell/novell.c:2265 src/protocols/novell/novell.c:2316
 #: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
 #: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
@@ -4377,11 +4374,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/oscar/oscar.c:4740 src/protocols/oscar/oscar.c:4818
+#: src/protocols/oscar/oscar.c:4842 src/protocols/oscar/oscar.c:6433
+#: src/protocols/oscar/oscar.c:6438 src/protocols/yahoo/yahoo.c:2293
 #: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隐身"
@@ -4398,7 +4395,7 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1160
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
@@ -4430,18 +4427,18 @@
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:399
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:406
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/gg/gg.c:593 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:518
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:475
 #: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
 #: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
 #: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
@@ -4449,149 +4446,149 @@
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:609
 msgid "Reading data"
 msgstr "正在读取数据"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:612
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:615
 msgid "Reading server key"
 msgstr "正在读取服务器密钥"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:618
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:628
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:646 src/protocols/gg/gg.c:737
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:694
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:706
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:711
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:714
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:761
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:827
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:832
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:857
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4211
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4222 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1627
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4212
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:882 src/protocols/gg/gg.c:885
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:895
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1305
+#: src/protocols/msn/msn.c:1549 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:3405
 #: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
 #: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
 #: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:940
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:948
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1011
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1019
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1027
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1035
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1044
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1051
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1170
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1171
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4599,76 +4596,76 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1200
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1201
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1274
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1275 src/protocols/gg/gg.c:1298
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1297
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1347
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1348
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1381
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1382
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1399
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: src/protocols/gg/gg.c:1408 src/protocols/jabber/jabber.c:1060
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1416
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1422
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1428
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1462
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1463
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4686,7 +4683,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1608 src/protocols/gg/gg.c:1610
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4700,16 +4697,16 @@
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:2931
+#: src/protocols/oscar/oscar.c:5453
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:2933
+#: src/protocols/oscar/oscar.c:5454
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4793,12 +4790,12 @@
 msgstr "查看 MOTD"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6534
 #: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:168 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
@@ -4819,15 +4816,22 @@
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
+msgid "Couldn't connect to host"
+msgstr "无法连接到主机"
+
+#: src/protocols/irc/irc.c:372 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:506 src/protocols/silc/chat.c:1264
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:509 src/protocols/silc/chat.c:1267
+#: src/protocols/silc/ops.c:1001 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "话题"
 
@@ -4840,32 +4844,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:615
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:616
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:633 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1388 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:636 src/protocols/jabber/jabber.c:1409
+#: src/protocols/msn/msn.c:1732 src/protocols/napster/napster.c:663
+#: src/protocols/silc/silc.c:1047 src/protocols/trepia/trepia.c:1307
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:639 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:642 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586
 msgid "Username"
 msgstr "用户名"
 
@@ -4939,83 +4943,83 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:404
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:415
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:418
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:423
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:443
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:499
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s:%s 踢出了"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:601
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:701
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:723
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
 msgstr "错误:服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后:%lu 秒"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:840
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:862
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:871
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -5085,11 +5089,11 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/jabber.c:606 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
 msgid "URL"
 msgstr "URL"
 
@@ -5110,7 +5114,7 @@
 msgstr "区域"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -5126,7 +5130,8 @@
 msgstr "电话号码"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:632
+#: src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "电子邮件"
 
@@ -5147,7 +5152,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/oscar/oscar.c:4246
 msgid "Birthday"
 msgstr "生日"
 
@@ -5166,14 +5171,15 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2168
+#: src/protocols/novell/novell.c:2172 src/protocols/oscar/oscar.c:566
 #: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
 #: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1391
 msgid "Resource"
 msgstr "资源"
 
@@ -5181,8 +5187,8 @@
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4264 src/protocols/oscar/oscar.c:4272
 msgid "Address"
 msgstr "地址"
 
@@ -5314,25 +5320,9 @@
 msgstr "初始化会话出错"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "写错误"
 
@@ -5340,376 +5330,376 @@
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:322
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:325
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:431
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1031
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:601
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4266
+#: src/protocols/oscar/oscar.c:4274 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/silc.c:634
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:651
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:659
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1576 src/protocols/oscar/oscar.c:944
 #: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
 #: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:784
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:790
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:799
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5818
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:910
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:912
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:909
-msgid "From"
-msgstr "来自"
-
-#: src/protocols/jabber/jabber.c:912
-msgid "To"
-msgstr "到"
-
 #: src/protocols/jabber/jabber.c:914
+msgid "From"
+msgstr "来自"
+
+#: src/protocols/jabber/jabber.c:917
+msgid "To"
+msgstr "到"
+
+#: src/protocols/jabber/jabber.c:919
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:923
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:943
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:6429
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:976
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:977
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1036
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1041 src/protocols/jabber/jabber.c:1042
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1042
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1138
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1142
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1144
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1152
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1166
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1176
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1185
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1196
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1214
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1234
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1242
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1246
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1281
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -5724,23 +5714,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1367 src/protocols/jabber/jabber.c:1369
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1389
-msgid "Use TLS if available"
-msgstr "若可用则使用 TLS"
-
 #: src/protocols/jabber/jabber.c:1394
-msgid "Force old SSL"
-msgstr "强制旧 SSL"
+msgid "Use TLS if available"
+msgstr "若可用则使用 TLS"
 
 #: src/protocols/jabber/jabber.c:1399
+msgid "Force old SSL"
+msgstr "强制旧 SSL"
+
+#: src/protocols/jabber/jabber.c:1404
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1413 src/protocols/silc/silc.c:1043
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -5823,19 +5814,19 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
 msgid "Unable to request USR\n"
 msgstr "无法请求 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
 msgid "Unable to login using MD5"
 msgstr "无法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
 msgid "Requesting to send password"
 msgstr "正在请求发送密码"
 
@@ -5843,11 +5834,11 @@
 msgid "Protocol version not supported"
 msgstr "协议版本不支持"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
 msgid "Unable to request CVR\n"
 msgstr "无法请求 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
@@ -5863,12 +5854,11 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
+#: src/protocols/msn/dispatch.c:232
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
@@ -6029,7 +6019,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
 msgid "Unable to write"
 msgstr "无法写入"
 
@@ -6065,8 +6055,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1356
+#: src/protocols/silc/ops.c:1198 src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6100,35 +6090,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误:%s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:79
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:187
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:188
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:200
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:211
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:222
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:231
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:232
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6136,91 +6126,92 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:236
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:237
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:255
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:257
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:675
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:677
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
 #: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:679
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2152
+#: src/protocols/novell/novell.c:2267 src/protocols/novell/novell.c:2321
+#: src/protocols/silc/buddy.c:1364 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:681
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
 #: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:683
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
 #: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:685
 #: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:377
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:385
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:397
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:406
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:413
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:442
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:452
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:476
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6228,7 +6219,7 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:785
+#: src/protocols/msn/msn.c:802
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6237,11 +6228,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:806 src/protocols/msn/msn.c:843
 msgid "Invalid MSN screen name"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:839
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6250,81 +6241,81 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1306 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1376 src/protocols/oscar/oscar.c:4251
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1383 src/protocols/oscar/oscar.c:4238
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1391 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1398 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1406 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1423 src/protocols/msn/msn.c:1429
+#: src/protocols/msn/msn.c:1436 src/protocols/msn/msn.c:1443
+#: src/protocols/msn/msn.c:1450
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1459 src/protocols/msn/msn.c:1472
+#: src/protocols/msn/msn.c:1479
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1488 src/protocols/msn/msn.c:1494
+#: src/protocols/msn/msn.c:1501
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
 #: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1535 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1616
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1621
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6339,15 +6330,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1707 src/protocols/msn/msn.c:1709
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1727 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1736
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6367,53 +6358,49 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/oscar/oscar.c:1645
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "无法发送密码"
-
-#: src/protocols/msn/notification.c:397
+#: src/protocols/msn/notification.c:355
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:386
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:392
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:584
+#: src/protocols/msn/notification.c:527
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1362
+#: src/protocols/msn/notification.c:1351
 #, c-format
 msgid ""
 "Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
 "again."
 msgstr "您 %s 的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/notification.c:1607
+#: src/protocols/msn/notification.c:1612
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1799
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6435,24 +6422,44 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "输入输出出错。"
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/servconn.c:210
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "无法连接到 %s 服务器"
+
+#: src/protocols/msn/servconn.c:214
+#, c-format
+msgid "Error writing to %s server"
+msgstr "从 %s 服务器读取时出错"
+
+#: src/protocols/msn/servconn.c:218
+#, c-format
+msgid ""
+"Error reading from %s server. Lastcommand was:\n"
+" %s"
+msgstr ""
+"从 %s 服务器读取时出错。上个命令是:\n"
+" %s"
+
+#: src/protocols/msn/servconn.c:222
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "%s 服务器的未知错误"
+
+#: src/protocols/msn/servconn.c:315
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:130
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/switchboard.c:300
+#: src/protocols/msn/switchboard.c:264
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
@@ -6498,11 +6505,11 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:541
+#: src/protocols/napster/napster.c:541 src/protocols/silc/chat.c:741
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5524
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "组(_G):"
@@ -6525,67 +6532,65 @@
 #: src/protocols/novell/novell.c:113
 #, c-format
 msgid "Login failed (0x%X)."
-msgstr ""
+msgstr "登录失败(0x%X)。"
 
 #: src/protocols/novell/novell.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "无法发送消息。消息太大。"
+msgstr "无法发送消息。无法获得用户的详细信息(0x%X)。"
 
 #: src/protocols/novell/novell.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
+msgstr "无法将“%s”添加到您的好友列表中(0x%X)。"
 
 #. TODO: Improve this! message to who or for what conference?
 #: src/protocols/novell/novell.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message (0x%X)."
-msgstr "无法发送消息。"
+msgstr "无法发送消息(0x%X)。"
 
 #: src/protocols/novell/novell.c:485
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
+msgstr "无法给 %s 发送消息。无法创建会议(0x%X)。"
 
 #: src/protocols/novell/novell.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "无法发送消息。消息太大。"
+msgstr "无法发送消息。无法创建会议(0x%X)。"
 
 #: src/protocols/novell/novell.c:536
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (0x%X)."
-msgstr ""
+msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(0x%X)。"
 
 #: src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, fuzzy, c-format
+msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(0x%X)。"
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1345
+#, c-format
 msgid "GroupWise Conference %d"
-msgstr "发起会议"
+msgstr "GroupWise 会议 %d"
 
 #: src/protocols/novell/novell.c:659
 #, c-format
 msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
-#, fuzzy
+msgstr "无法获得用户 %s 的详细信息(0x%X)。"
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1108
 msgid "Error communicating with server. Closing connection."
-msgstr "与 Gadu-Gadu 服务器通讯出错"
-
-#: src/protocols/novell/novell.c:982
-#, fuzzy
+msgstr "与服务器通讯出错。关闭连接。"
+
+#: src/protocols/novell/novell.c:983
 msgid "Userid"
-msgstr "用户"
+msgstr "用户 ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6594,107 +6599,90 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
-#, fuzzy
+#: src/protocols/novell/novell.c:997
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1016
-#, fuzzy
+#: src/protocols/novell/novell.c:1017
 msgid "User Properties"
-msgstr "用户选项"
-
-#: src/protocols/novell/novell.c:1084
-#, fuzzy
+msgstr "用户属性"
+
+#: src/protocols/novell/novell.c:1085
 msgid "Unable to make SSL connection to server."
-msgstr "无法连接到服务器。"
-
-#: src/protocols/novell/novell.c:1113
+msgstr "无法通过 SSL 连接到服务器。"
+
+#: src/protocols/novell/novell.c:1114
 #, c-format
 msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
-#, fuzzy
+msgstr "处理事件或响应出错。(0x%X)"
+
+#: src/protocols/novell/novell.c:1148
 msgid "Authenticating..."
-msgstr "正在认证"
-
-#: src/protocols/novell/novell.c:1162
-#, fuzzy
+msgstr "正在认证..."
+
+#: src/protocols/novell/novell.c:1163
 msgid "Waiting for response..."
-msgstr "正在等候回复..."
-
-#: src/protocols/novell/novell.c:1302
-#, fuzzy
-msgid "Invitation to Conversation"
-msgstr "保存对话"
+msgstr "正在等候响应..."
 
 #: src/protocols/novell/novell.c:1303
+msgid "Invitation to Conversation"
+msgstr "对话邀请"
+
+#: src/protocols/novell/novell.c:1304
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1305
-#, fuzzy
+"发出邀请者: %s\n"
+"\n"
+"发出时间: %s"
+
+#: src/protocols/novell/novell.c:1306
 msgid "Would you like to join the conversation?"
-msgstr "您是否想要覆盖?"
-
-#: src/protocols/novell/novell.c:1408
-#, fuzzy
+msgstr "您是否想要加入对话?"
+
+#: src/protocols/novell/novell.c:1409
 msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
-
-#: src/protocols/novell/novell.c:1462
+msgstr "您已被注销,因为您已从其它计算机上登录。"
+
+#: src/protocols/novell/novell.c:1463
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr ""
+msgstr "%s 显示为离线,因此未接受到您刚刚发出的消息。"
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
-#, fuzzy
+#: src/protocols/novell/novell.c:1561
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "请输入您想要屏蔽的用户名称。"
-
-#: src/protocols/novell/novell.c:1582
+msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
+
+#: src/protocols/novell/novell.c:1583
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1846
+msgstr "出错。SSL 支持未安装。"
+
+#: src/protocols/novell/novell.c:1847
 msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
-
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgstr "此会议已关筹。不会再送出消息。"
+
+#: src/protocols/novell/novell.c:2158 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5820 src/protocols/yahoo/yahoo.c:2297
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2168
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
-#, fuzzy
+#: src/protocols/novell/novell.c:2169
+msgid "Message"
+msgstr "消息"
+
+#: src/protocols/novell/novell.c:2268 src/protocols/novell/novell.c:2324
 msgid "Appear Offline"
-msgstr "离线"
+msgstr "显示为离线"
 
 #. *< api_version
 #. *< type
@@ -6707,19 +6695,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:2413 src/protocols/novell/novell.c:2415
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2428
-#, fuzzy
-msgid "Server address"
-msgstr "街道地址"
+msgstr "Novell GroupWise Messenger 协议插件"
 
 #: src/protocols/novell/novell.c:2432
-#, fuzzy
+msgid "Server address"
+msgstr "服务器地址"
+
+#: src/protocols/novell/novell.c:2436
 msgid "Server port"
-msgstr "服务器"
+msgstr "服务器端口"
 
 #: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
@@ -6825,11 +6811,11 @@
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:434 src/protocols/silc/silc.c:630
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6542
 msgid "Get File"
 msgstr "获取文件"
 
@@ -6901,18 +6887,18 @@
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4839
+#: src/protocols/oscar/oscar.c:6432
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4833
+#: src/protocols/oscar/oscar.c:6430
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4836
+#: src/protocols/oscar/oscar.c:6431
 msgid "Occupied"
 msgstr "琐事缠身"
 
@@ -6947,10 +6933,6 @@
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "无法连接到主机"
-
 #: src/protocols/oscar/oscar.c:886
 msgid "Screen name sent"
 msgstr "用户名已发送"
@@ -6969,7 +6951,7 @@
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1449
 msgid "Could Not Connect"
 msgstr "无法连接"
 
@@ -6990,20 +6972,20 @@
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1333 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1338
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1342
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:1347
 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."
@@ -7011,21 +6993,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:1352
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:1384
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:1522
+#: src/protocols/oscar/oscar.c:1610
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7033,29 +7015,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:1525
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:1613
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
+#: src/protocols/oscar/oscar.c:2195 src/protocols/oscar/oscar.c:5924
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:2551
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:2715
 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 "
@@ -7064,46 +7046,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
+#: src/protocols/oscar/oscar.c:2720 src/protocols/oscar/oscar.c:6306
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:2749
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
+#: src/protocols/oscar/oscar.c:2757
+msgid "Authorization Request Message:"
+msgstr "认证请求消息:"
+
 #: src/protocols/oscar/oscar.c:2758
-msgid "Authorization Request Message:"
-msgstr "认证请求消息:"
-
-#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:2787
 #, 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:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:2792 src/protocols/oscar/oscar.c:2794
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:2832
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:2921
+#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3285
+#: src/protocols/oscar/oscar.c:3345 src/protocols/oscar/oscar.c:5445
+#: src/protocols/oscar/oscar.c:5491
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:2838
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2921
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7112,11 +7094,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:2929 src/protocols/oscar/oscar.c:5451
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:2941
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7126,17 +7108,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:2942
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:2957
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7149,7 +7131,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:2965
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7162,7 +7144,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7175,32 +7157,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:2994
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3000
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3004
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3089
 #, 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:3099
+#: src/protocols/oscar/oscar.c:3098
 #, 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:3108
+#: src/protocols/oscar/oscar.c:3107
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7208,79 +7190,77 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3116
 #, 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:3126
+#: src/protocols/oscar/oscar.c:3125
 #, 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:3135
+#: src/protocols/oscar/oscar.c:3134
 #, 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:3189
+#: src/protocols/oscar/oscar.c:3188
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3247
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3248
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3283
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3342
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3366
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3365
 msgid "Warning Level"
-msgstr "显示警告级别(_W)"
-
-#: src/protocols/oscar/oscar.c:3369
-#, fuzzy
+msgstr "警告级别"
+
+#: src/protocols/oscar/oscar.c:3368
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3372 src/protocols/yahoo/yahoo.c:3088
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3454
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:3640
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:3858
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3859
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7288,162 +7268,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:3922
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:3924
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3955
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4237
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4254
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4258
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4263
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4267 src/protocols/oscar/oscar.c:4275
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4271
 msgid "Work Address"
 msgstr "办公地址"
 
+#: src/protocols/oscar/oscar.c:4279
+msgid "Work Information"
+msgstr "工作信息"
+
 #: src/protocols/oscar/oscar.c:4280
-msgid "Work Information"
-msgstr "工作信息"
+msgid "Company"
+msgstr "公司"
 
 #: src/protocols/oscar/oscar.c:4281
-msgid "Company"
-msgstr "公司"
-
-#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4282
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4284
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4290
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4340
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4361
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4365
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4382
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4403
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4405
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:4433
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:4436
 #, 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:4440
+#: src/protocols/oscar/oscar.c:4439
 #, 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:4443
+#: src/protocols/oscar/oscar.c:4442
 #, 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:4446
+#: src/protocols/oscar/oscar.c:4445
 #, 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:4449
+#: src/protocols/oscar/oscar.c:4448
 #, 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:4452
+#: src/protocols/oscar/oscar.c:4451
 #, 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:4455
+#: src/protocols/oscar/oscar.c:4454
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:4464
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7452,20 +7432,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4465 src/protocols/oscar/oscar.c:4472
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4470
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:4688
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:4689
 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 "
@@ -7474,7 +7454,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:4716
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7484,19 +7464,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:4721
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:4737 src/protocols/oscar/oscar.c:6437
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:4755
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:4756
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7505,7 +7485,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:4796
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7517,11 +7497,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:4801
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:4894
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7531,16 +7511,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:5312
+#: src/protocols/oscar/oscar.c:5325
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5031
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5032
 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 "
@@ -7549,13 +7529,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5208 src/protocols/oscar/oscar.c:5209
+#: src/protocols/oscar/oscar.c:5214 src/protocols/oscar/oscar.c:5369
+#: src/protocols/oscar/oscar.c:5370 src/protocols/oscar/oscar.c:5375
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7563,11 +7543,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5311 src/protocols/oscar/oscar.c:5324
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5324
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7577,18 +7557,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:5406
 #, 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:5410
+#: src/protocols/oscar/oscar.c:5412
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5445
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7598,17 +7578,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5487
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5488
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:5491
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7618,83 +7598,83 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:5492
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5529 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:5551
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:5792
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6286
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:6297
+#: src/protocols/oscar/oscar.c:6299
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6302
 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:6485
+#: src/protocols/oscar/oscar.c:6487
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6503
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6511
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6526
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6555
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6576
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6577
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6583
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6632
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6676
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6679
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6680
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7702,75 +7682,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6694
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6695
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6696
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6713
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6714
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6790
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:6797
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:6805
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:6812
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:6819
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6827
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:6838
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:6844
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:6850
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:6856
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:6865
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:6873
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6880
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -7785,18 +7765,1014 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7004 src/protocols/oscar/oscar.c:7006
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7023
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7028
 msgid "Auth port"
 msgstr "认证端口"
 
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:401
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:661
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "用户 %s 未出现于网络中"
+
+#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
+#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+msgid "Key Agreement"
+msgstr "密钥协议"
+
+#: src/protocols/silc/buddy.c:49
+msgid "Cannot perform the key agreement"
+msgstr "无法执行密钥协议"
+
+#: src/protocols/silc/buddy.c:106
+msgid "Error occurred during key agreement"
+msgstr "密钥协议中发生了错误"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Key Agreement failed"
+msgstr "密钥协议失败"
+
+#: src/protocols/silc/buddy.c:115
+msgid "Timeout during key agreement"
+msgstr "密钥协议时超时"
+
+#: src/protocols/silc/buddy.c:120
+msgid "Key agreement was aborted"
+msgstr "密钥协议已中止"
+
+#: src/protocols/silc/buddy.c:125
+msgid "Key agreement is already started"
+msgstr "密钥协议已经开始"
+
+#: src/protocols/silc/buddy.c:130
+msgid "Key agreement cannot be started with yourself"
+msgstr "无法与您自己进行密钥协议"
+
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:369
+#: src/protocols/silc/buddy.c:480
+msgid "The remote user is not present in the network any more"
+msgstr "远程用户已经从网络中消失了"
+
+#: src/protocols/silc/buddy.c:284
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"远程用户正在如下地址等候密钥协议:\n"
+"远程主机: %s\n"
+"远程端口: %d"
+
+#: src/protocols/silc/buddy.c:301
+msgid "Key Agreement Request"
+msgstr "密钥协议请求"
+
+#: src/protocols/silc/buddy.c:368 src/protocols/silc/buddy.c:403
+#: src/protocols/silc/buddy.c:445
+msgid "IM With Password"
+msgstr "带密码开聊"
+
+#: src/protocols/silc/buddy.c:404
+msgid "Cannot set IM key"
+msgstr "无法设定聊天密钥"
+
+#: src/protocols/silc/buddy.c:446
+msgid "Set IM Password"
+msgstr "设定聊天密码"
+
+#: src/protocols/silc/buddy.c:479 src/protocols/silc/buddy.c:514
+#: src/protocols/silc/ops.c:1064 src/protocols/silc/ops.c:1075
+msgid "Get Public Key"
+msgstr "获取公钥"
+
+#: src/protocols/silc/buddy.c:515 src/protocols/silc/ops.c:1065
+#: src/protocols/silc/ops.c:1076
+msgid "Cannot fetch the public key"
+msgstr "无法获取公钥"
+
+#: src/protocols/silc/buddy.c:584 src/protocols/silc/buddy.c:1596
+msgid "Show Public Key"
+msgstr "显示公钥"
+
+#: src/protocols/silc/buddy.c:585 src/protocols/silc/buddy.c:944
+#: src/protocols/silc/chat.c:210
+msgid "Could not load public key"
+msgstr "无法装入公钥"
+
+#: src/protocols/silc/buddy.c:662 src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:892 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:976 src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:983
+msgid "User Information"
+msgstr "用户信息"
+
+#: src/protocols/silc/buddy.c:663 src/protocols/silc/ops.c:893
+msgid "Cannot get user information"
+msgstr "无法获取用户信息"
+
+#: src/protocols/silc/buddy.c:684
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "%s 好友不可信"
+
+#: src/protocols/silc/buddy.c:687
+msgid ""
+"You cannot receive buddy notifications untill you import its public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令。"
+
+#: src/protocols/silc/buddy.c:987
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "%s 好友未出现于网络中"
+
+#: src/protocols/silc/buddy.c:990
+msgid ""
+"To add the buddy you must import its public key. Press Import to import a "
+"public key."
+msgstr "要添加好友,您必须导入其公钥。请按[导入]以导入公钥。"
+
+#: src/protocols/silc/buddy.c:993
+msgid "Import..."
+msgstr "导入..."
+
+#: src/protocols/silc/buddy.c:1080
+msgid "Select correct user"
+msgstr "选择正确用户"
+
+#: src/protocols/silc/buddy.c:1082
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"发现了多个用户使用同样的公钥。请从列表中选择想要添加到好友列表中的那个人。"
+
+#: src/protocols/silc/buddy.c:1084
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
+
+#: src/protocols/silc/buddy.c:1358
+msgid "Detached"
+msgstr "已脱离"
+
+#: src/protocols/silc/buddy.c:1362 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "不舒服"
+
+#: src/protocols/silc/buddy.c:1366 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "叫醒我"
+
+#: src/protocols/silc/buddy.c:1368 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "多动"
+
+#: src/protocols/silc/buddy.c:1370
+msgid "Robot"
+msgstr "机器人"
+
+#: src/protocols/silc/buddy.c:1377 src/protocols/silc/silc.c:605
+msgid "Happy"
+msgstr "高兴"
+
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:607
+msgid "Sad"
+msgstr "郁闷"
+
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:609
+msgid "Angry"
+msgstr "生气"
+
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:611
+msgid "Jealous"
+msgstr "警惕"
+
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:613
+msgid "Ashamed"
+msgstr "害羞"
+
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:615
+msgid "Invincible"
+msgstr "无敌"
+
+#: src/protocols/silc/buddy.c:1389 src/protocols/silc/silc.c:617
+msgid "In Love"
+msgstr "热恋"
+
+#: src/protocols/silc/buddy.c:1391 src/protocols/silc/silc.c:619
+msgid "Sleepy"
+msgstr "打盹"
+
+#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:621
+msgid "Bored"
+msgstr "枯燥"
+
+#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:623
+msgid "Excited"
+msgstr "激动"
+
+#: src/protocols/silc/buddy.c:1397 src/protocols/silc/silc.c:625
+msgid "Anxious"
+msgstr "饥渴"
+
+#: src/protocols/silc/buddy.c:1576
+msgid "Reset IM Key"
+msgstr "重置聊天密钥"
+
+#: src/protocols/silc/buddy.c:1582
+msgid "IM with Key Exchange"
+msgstr "带密钥交换开聊"
+
+#: src/protocols/silc/buddy.c:1588
+msgid "IM with Password"
+msgstr "带密码开聊"
+
+#: src/protocols/silc/buddy.c:1602
+msgid "Get Public Key..."
+msgstr "获取公钥..."
+
+#: src/protocols/silc/buddy.c:1609
+msgid "Send File..."
+msgstr "发送文件..."
+
+#: src/protocols/silc/buddy.c:1616 src/protocols/silc/ops.c:1111
+msgid "Kill User"
+msgstr "杀死用户"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "密码句(_P):"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "频道 %s 不在网络中"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:153
+#: src/protocols/silc/chat.c:154
+msgid "Channel Information"
+msgstr "频道信息"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "无法获取频道信息信息"
+
+#: src/protocols/silc/chat.c:209
+msgid "Add Channel Public Key"
+msgstr "添加频道公钥"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:264
+msgid "Open Public Key..."
+msgstr "打开公钥..."
+
+#: src/protocols/silc/chat.c:375
+msgid "Channel Passphrase"
+msgstr "频道密码句"
+
+#: src/protocols/silc/chat.c:382
+msgid "Channel Public Keys List"
+msgstr "频道公钥列表"
+
+#: src/protocols/silc/chat.c:387
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码句和数字签名。"
+"如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么"
+"只有那些公钥已经列出的用户才能加入。"
+
+#: src/protocols/silc/chat.c:396 src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:434 src/protocols/silc/chat.c:435
+#: src/protocols/silc/chat.c:773
+msgid "Channel Authentication"
+msgstr "频道认证"
+
+#: src/protocols/silc/chat.c:536
+msgid "Group Name"
+msgstr "组名称"
+
+#: src/protocols/silc/chat.c:540 src/protocols/silc/ops.c:1387
+msgid "Passphrase"
+msgstr "密码句"
+
+#: src/protocols/silc/chat.c:551
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "请输入 %s 频道私有组的名称和密码句。"
+
+#: src/protocols/silc/chat.c:553
+msgid "Add Channel Private Group"
+msgstr "添加频道私有组"
+
+#: src/protocols/silc/chat.c:654
+msgid "User Limit"
+msgstr "允许限制"
+
+#: src/protocols/silc/chat.c:655
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
+
+#: src/protocols/silc/chat.c:750
+msgid "Invite List"
+msgstr "邀请列表"
+
+#: src/protocols/silc/chat.c:756
+msgid "Ban List"
+msgstr "屏蔽列表"
+
+#: src/protocols/silc/chat.c:765
+msgid "Add Private Group"
+msgstr "添加私有组"
+
+#: src/protocols/silc/chat.c:780
+msgid "Reset Permanent"
+msgstr "重置永久"
+
+#: src/protocols/silc/chat.c:786
+msgid "Set Permanent"
+msgstr "设置永久"
+
+#: src/protocols/silc/chat.c:795
+msgid "Set User Limit"
+msgstr "设置用户限制"
+
+#: src/protocols/silc/chat.c:802
+msgid "Reset Topic Restriction"
+msgstr "重置话题限制"
+
+#: src/protocols/silc/chat.c:808
+msgid "Set Topic Restriction"
+msgstr "设定话题限制"
+
+#: src/protocols/silc/chat.c:816
+msgid "Reset Private Channel"
+msgstr "重置私有频道"
+
+#: src/protocols/silc/chat.c:822
+msgid "Set Private Channel"
+msgstr "设定私有频道"
+
+#: src/protocols/silc/chat.c:830
+msgid "Reset Secret Channel"
+msgstr "重置绝密频道"
+
+#: src/protocols/silc/chat.c:836
+msgid "Set Secret Channel"
+msgstr "设定绝密频道"
+
+#: src/protocols/silc/chat.c:907
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "您是 <I>%s</I> 的频道建立者"
+
+#: src/protocols/silc/chat.c:911
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
+
+#: src/protocols/silc/chat.c:961
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"在您加入私有组之前,必须先加入 %s 频道"
+
+#: src/protocols/silc/chat.c:963
+msgid "Join Private Group"
+msgstr "加入私有组"
+
+#: src/protocols/silc/chat.c:964
+msgid "Cannot join private group"
+msgstr "无法加入私有组"
+
+#: src/protocols/silc/chat.c:1146 src/protocols/silc/silc.c:844
+msgid "Cannot call command"
+msgstr "无法调用命令"
+
+#: src/protocols/silc/chat.c:1147 src/protocols/silc/silc.c:845
+msgid "Unknown command"
+msgstr "未知命令"
+
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "安全文件传送"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr "文件传送时出错"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "权限被禁止"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "密钥协议失败"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "文件传送会话不存在"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "没有激活的文件传送会话"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "文件传送已开始"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "无法执行文件传送的密钥协议"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "无法开始传送文件"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "无法发送文件"
+
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s 已经将 <I>%s</I> 的话题改为:%s"
+
+#: src/protocols/silc/ops.c:398
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
+
+#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "您被 %s (%s) 杀死了"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "被 %s (%s) 杀死"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "服务器登出"
+
+#: src/protocols/silc/ops.c:767
+msgid ""
+"Personal Information:\n"
+"\n"
+msgstr "个人信息:\n\n"
+
+#: src/protocols/silc/ops.c:769
+#, c-format
+msgid "Full Name:\t\t%s\n"
+msgstr "全名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:772
+#, c-format
+msgid "First Name:\t%s\n"
+msgstr "名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:775
+#, c-format
+msgid "Middle Names:\t%s\n"
+msgstr "中名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:778
+#, c-format
+msgid "Family Name:\t%s\n"
+msgstr "姓:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:781 src/protocols/silc/ops.c:911
+#, c-format
+msgid "Nickname:\t\t%s\n"
+msgstr "昵称:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:784
+#, c-format
+msgid "Birth Day:\t\t%s\n"
+msgstr "生日:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:787
+#, c-format
+msgid "Job Title:\t\t%s\n"
+msgstr "职称:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:790
+#, c-format
+msgid "Job Role:\t\t%s\n"
+msgstr "职位:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:793
+#, c-format
+msgid "Organization:\t%s\n"
+msgstr "组织:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:796
+#, c-format
+msgid "Unit:\t\t%s\n"
+msgstr "单元:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:799
+#, c-format
+msgid "Homepage:\t%s\n"
+msgstr "主页:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:802
+#, c-format
+msgid "Address:\t%s\n"
+msgstr "地址:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:806
+#, c-format
+msgid "Tel:\t\t\t%s\n"
+msgstr "电话:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:811
+#, c-format
+msgid "EMail:\t\t%s\n"
+msgstr "电子邮件:\t%s\n"
+
+#: src/protocols/silc/ops.c:815
+#, c-format
+msgid ""
+"\n"
+"Note:\t\t%s\n"
+msgstr "\n注释:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:862
+msgid "Join Chat"
+msgstr "加入聊天"
+
+#: src/protocols/silc/ops.c:913
+#, c-format
+msgid "Real Name:\t%s\n"
+msgstr "真名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:915
+#, c-format
+msgid "Username:\t\t%s\n"
+msgstr "用户名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:917
+#, c-format
+msgid "Hostname:\t\t%s\n"
+msgstr "主机名:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:919
+#, c-format
+msgid "Server:\t\t%s\n"
+msgstr "服务器:\t\t%s\n"
+
+#: src/protocols/silc/ops.c:924
+#, c-format
+msgid "User Mode:\t%s\n"
+msgstr "用户模式:\t%s\n"
+
+#: src/protocols/silc/ops.c:938
+msgid ""
+"\n"
+"Channels:\n"
+msgstr "\n频道:\n"
+
+#: src/protocols/silc/ops.c:965
+#, c-format
+msgid ""
+"\n"
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"\n"
+"公钥指纹:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/ops.c:966
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr "公钥漏印:\n%s"
+
+#: src/protocols/silc/ops.c:979
+msgid "More..."
+msgstr "更多..."
+
+#: src/protocols/silc/ops.c:990 src/protocols/silc/silc.c:744
+msgid "Detach From Server"
+msgstr "与服务器脱离"
+
+#: src/protocols/silc/ops.c:990
+msgid "Cannot detach"
+msgstr "无法脱离"
+
+#: src/protocols/silc/ops.c:1001
+msgid "Cannot set topic"
+msgstr "无法设定话题"
+
+#: src/protocols/silc/ops.c:1029
+msgid "Roomlist"
+msgstr "房间列表"
+
+#: src/protocols/silc/ops.c:1029
+msgid "Cannot get room list"
+msgstr "无法获取房间列表"
+
+#: src/protocols/silc/ops.c:1077
+msgid "No public key was received"
+msgstr "没有收到公钥"
+
+#: src/protocols/silc/ops.c:1090 src/protocols/silc/ops.c:1103
+#: src/protocols/silc/ops.c:1104
+msgid "Server Information"
+msgstr "服务器信息"
+
+#: src/protocols/silc/ops.c:1091
+msgid "Cannot get server information"
+msgstr "无法获取服务器信息"
+
+#: src/protocols/silc/ops.c:1112
+msgid "Could not kill user"
+msgstr "无法杀死用户"
+
+#: src/protocols/silc/ops.c:1189
+msgid "Error during connecting to SILC Server"
+msgstr "连接到 SILC 服务器时出错"
+
+#: src/protocols/silc/ops.c:1194
+msgid "Key Exchange failed"
+msgstr "密钥交换失败"
+
+#: src/protocols/silc/ops.c:1203
+msgid ""
+"Resuming detached session failed.Press Reconnect to create new connection."
+msgstr ""
+"恢复脱离的会话失败。请按[重新连接]以创建新连接。"
+
+#: src/protocols/silc/ops.c:1209
+msgid "Connection timeout"
+msgstr "连接超时"
+
+#: src/protocols/silc/ops.c:1238
+msgid "Disconnected by server"
+msgstr "服务器断开连接"
+
+#: src/protocols/silc/ops.c:1298 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "恢复会话"
+
+#: src/protocols/silc/ops.c:1300
+msgid "Authenticating connection"
+msgstr "身份验证连接"
+
+#: src/protocols/silc/ops.c:1347
+msgid "Verifying server public key"
+msgstr "校验服务器公钥"
+
+#: src/protocols/silc/ops.c:1388
+msgid "Passphrase required"
+msgstr "请求密码句"
+
+#: src/protocols/silc/ops.c:1417
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失败:版本不匹配,请升级您的客户端"
+
+#: src/protocols/silc/ops.c:1420
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "失败:远程不信任或不支持您的公钥"
+
+#: src/protocols/silc/ops.c:1423
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失败:远程不支持提议的 KE 组"
+
+#: src/protocols/silc/ops.c:1426
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失败:远程不支持提议的密码算法"
+
+#: src/protocols/silc/ops.c:1429
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失败:远程不支持提议的 PKCS"
+
+#: src/protocols/silc/ops.c:1432
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "失败:远程不支持提议的散列函数"
+
+#: src/protocols/silc/ops.c:1435
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失败:远程不支持 HMAC"
+
+#: src/protocols/silc/ops.c:1437
+msgid "Failure: Incorrect signature"
+msgstr "失败:签名不正确"
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Invalid cookie"
+msgstr "失败:无效的 cookie"
+
+#: src/protocols/silc/ops.c:1450
+msgid "Failure: Authentication failed"
+msgstr "失败:身份验证失败"
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "收到了 %s 的公钥。您想要接受此公钥吗?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr "%s 密钥的指纹和漏印分别是:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "校验公钥"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "查看..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "不支持的公钥类型"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "连接失败"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "无法初始化 SILC 客户连接"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "执行密钥交换"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "内存溢出"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "连接到 SILC 服务器"
+
+#: src/protocols/silc/silc.c:601
+msgid "Your Current Mood"
+msgstr "您目前的心情"
+
+#: src/protocols/silc/silc.c:603
+msgid "Normal"
+msgstr "普通"
+
+#: src/protocols/silc/silc.c:628
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr "\n您首选的联系方式"
+
+#: src/protocols/silc/silc.c:636
+msgid "SMS"
+msgstr "短信"
+
+#: src/protocols/silc/silc.c:638
+msgid "MMS"
+msgstr "彩信"
+
+#: src/protocols/silc/silc.c:640
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: src/protocols/silc/silc.c:645
+msgid "Your Current Status"
+msgstr "您的当前状态"
+
+#: src/protocols/silc/silc.c:652
+msgid "Online Services"
+msgstr "在线服务"
+
+#: src/protocols/silc/silc.c:655
+msgid "Let others see what services you are using"
+msgstr "让其它人看到您正在使用何种服务"
+
+#: src/protocols/silc/silc.c:661
+msgid "Let others see what computer you are using"
+msgstr "让其它人看到您正在使用哪台计算机"
+
+#: src/protocols/silc/silc.c:668
+msgid "Your VCard File"
+msgstr "您的 VCard 文件"
+
+#: src/protocols/silc/silc.c:673 src/protocols/silc/silc.c:675
+msgid "Timezone"
+msgstr "时区"
+
+#: src/protocols/silc/silc.c:681 src/protocols/silc/silc.c:682
+msgid "User Online Status Attributes"
+msgstr "用户在线状态属性"
+
+#: src/protocols/silc/silc.c:683
+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 "
+"about yourself."
+msgstr ""
+"您可以让其它用户看到您的在线状态信息以及您的个人信息。"
+"请填入您想要其它用户看到的有关您自己的信息。"
+
+#: src/protocols/silc/silc.c:720
+msgid "Message of the Day"
+msgstr "每日消息"
+
+#: src/protocols/silc/silc.c:720
+msgid "No Message of the Day available"
+msgstr "没有可用的每日消息"
+
+#: src/protocols/silc/silc.c:721
+msgid "There is no Message of the Day associated with this connection"
+msgstr "没有与此连接关联的每日消息"
+
+#: src/protocols/silc/silc.c:737
+msgid "Online Status"
+msgstr "在线状态"
+
+#: src/protocols/silc/silc.c:750
+msgid "View Message of the Day"
+msgstr "查看每日消息"
+
+#: src/protocols/silc/silc.c:815
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "用户 <I>%s</I> 未出现于网络中"
+
+#: src/protocols/silc/silc.c:895
+msgid "Instant Messages"
+msgstr "即时消息"
+
+#: src/protocols/silc/silc.c:900
+msgid "Digitally sign all IM messages"
+msgstr "对全部聊天消息进行数字签名"
+
+#: src/protocols/silc/silc.c:905
+msgid "Verify all IM message signatures"
+msgstr "校验全部聊天消息签名"
+
+#: src/protocols/silc/silc.c:908
+msgid "Channel Messages"
+msgstr "频道消息"
+
+#: src/protocols/silc/silc.c:913
+msgid "Digitally sign all channel messages"
+msgstr "对全部频道消息进行数字签名"
+
+#: src/protocols/silc/silc.c:918
+msgid "Verify all channel message signatures"
+msgstr "校验全部频道消息签名"
+
+#: src/protocols/silc/silc.c:921
+msgid "Default SILC Key Pair"
+msgstr "默认 SILC 密钥对"
+
+#: src/protocols/silc/silc.c:926
+msgid "SILC Public Key"
+msgstr "SILC 公钥"
+
+#: src/protocols/silc/silc.c:931
+msgid "SILC Private Key"
+msgstr "SILC 私钥"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1019
+msgid "SILC Protocol Plugin"
+msgstr "SILC 协议插件"
+
+#. *  description
+#: src/protocols/silc/silc.c:1021
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "安全网际实时会议(SILC)协议"
+
+#: src/protocols/silc/silc.c:1050
+msgid "Public key authentication"
+msgstr "公钥认证"
+
+#: src/protocols/silc/silc.c:1056
+msgid "Public Key File"
+msgstr "公钥文件"
+
+#: src/protocols/silc/silc.c:1060
+msgid "Private Key File"
+msgstr "私钥文件"
+
+#: src/protocols/silc/silc.c:1065
+msgid "Reject watching by other users"
+msgstr "拒绝其他用户监视"
+
+#: src/protocols/silc/silc.c:1068
+msgid "Block invites"
+msgstr "屏蔽邀请"
+
+#: src/protocols/silc/silc.c:1071
+msgid "Block IMs without Key Exchange"
+msgstr "屏蔽没有密钥交换的聊天"
+
+#: src/protocols/silc/silc.c:1074
+msgid "Reject online status attribute requests"
+msgstr "拒绝在线状态属性请求"
+
+#: src/protocols/silc/util.c:196 src/protocols/silc/util.c:216
+msgid "Creating SILC key pair..."
+msgstr "创建 SILC 密钥对..."
+
+#: src/protocols/silc/util.c:295 src/protocols/silc/util.c:296
+msgid "Public Key Information"
+msgstr "公钥信息"
+
 #: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
@@ -8475,20 +9451,20 @@
 msgstr "暴露"
 
 #. Forbidden
-#: src/proxy.c:955
+#: src/proxy.c:853
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 80 流过。"
 
-#: src/proxy.c:957
+#: src/proxy.c:855
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1594
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1594
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8502,7 +9478,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "接受"
 
@@ -8510,57 +9486,57 @@
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:962
+#: src/server.c:958
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:976
+#: src/server.c:972
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1154 src/server.c:1164
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1184
+#: src/server.c:1177
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1200
+#: src/server.c:1193
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1202
+#: src/server.c:1195
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1217
+#: src/server.c:1210
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/server.c:1231
+#: src/server.c:1224
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1235 src/server.c:1243
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1267
+#: src/server.c:1257
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1317
+#: src/server.c:1307
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8569,11 +9545,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1310
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1430
+#: src/server.c:1420
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8582,12 +9558,12 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1424
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1440
+#: src/server.c:1430
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -8637,7 +9613,7 @@
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2430
+#: src/util.c:2435
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
@@ -8653,20 +9629,3 @@
 msgid "Notification"
 msgstr "提示"
 
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "用户名: <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "警告级别: <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "上线时间: <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "成员时间: <b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "瞌睡: <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "瞌睡:<b>活跃</b>"