diff po/zh_CN.po @ 9526:38648963d1fd

[gaim-migrate @ 10353] lots of translation updates, and 2 i18n updates that don't add/remove strings. see patches 990640 and 988329 committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 14 Jul 2004 19:05:16 +0000
parents cbc7c336fe88
children 8c4d99bea74d
line wrap: on
line diff
--- a/po/zh_CN.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/zh_CN.po	Wed Jul 14 19:05:16 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-21 00:02-0400\n"
-"PO-Revision-Date: 2004-06-21 21:56+0800\n"
+"POT-Creation-Date: 2004-07-13 00:01-0400\n"
+"PO-Revision-Date: 2004-07-14 11:58+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"
@@ -142,7 +142,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -158,13 +158,13 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -172,7 +172,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "回来"
 
@@ -180,15 +180,15 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "首选项"
 
@@ -238,18 +238,22 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "按数字放置时分离即时消息和聊天窗口"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -257,23 +261,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "限制每个窗口的对话数,或者为即时消息和聊天使用单独的窗口"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
 
 #. *< api_version
 #. *< type
@@ -432,100 +436,100 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "本地地址簿"
 
-#: 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:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "无"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4045
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3866
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "账户"
 
@@ -536,7 +540,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -544,46 +548,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "电子邮件:"
 
@@ -807,15 +811,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -882,7 +886,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -890,7 +894,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1106,30 +1110,30 @@
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1140,19 +1144,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1177,8 +1181,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3057
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1197,8 +1201,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "对话"
 
@@ -1269,260 +1273,264 @@
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "日语"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Gnome 越南语团队"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "及 Gnome 越南语团队"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "日语"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:340
+#: src/account.c:339
 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:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
@@ -1545,8 +1553,8 @@
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "删除"
 
@@ -1578,23 +1586,19 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "组名无效"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 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:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1616,71 +1620,71 @@
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "按账户"
 
@@ -1828,8 +1832,8 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "别名"
 
@@ -1850,22 +1854,51 @@
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "文件不存在。"
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "无法发送 0 字节的文件。"
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 想要给您发送 %s (%s)"
+
+#: src/ft.c:230
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受来自 %s 的文件传送吗?"
+
+#: src/ft.c:234
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"可从以下地址下载文件:\n"
+"远程主机: %s\n"
+"远程端口: %d"
+
+#: src/ft.c:286
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:157
+#: src/ft.c:299
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:786
+#: src/ft.c:928
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:788
+#: src/ft.c:930
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1956,23 +1989,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "对不起,我临时有事离开一会儿。麻烦您稍后再联络我。"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "临时有事"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1984,164 +2017,164 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4017
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4031 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2151,224 +2184,228 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4410 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3211
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3202
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "发送文件(_S)"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2377,7 +2414,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2385,12 +2422,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2398,7 +2435,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2406,7 +2443,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2414,7 +2451,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2422,7 +2459,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2430,7 +2467,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2438,7 +2475,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2446,7 +2483,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2454,7 +2491,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2462,7 +2499,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2470,96 +2507,96 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3084
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3087
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3090
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3093
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3182
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3184
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3208
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3217
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3220
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3225
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3228
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3233
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3971 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3995
 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. "
@@ -2569,35 +2606,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4055 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4298
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4329
 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:4373
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4408
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4975 src/gtkblist.c:5072
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2646,29 +2683,16 @@
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>与 %s 的谈话</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "该文件不存在"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "您是否想要覆盖?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2676,11 +2700,11 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2689,7 +2713,7 @@
 "没有这样的命令。如果您本来并不想输入命令,您可以在工具->首选项->界面->转换->"
 "启用“斜线”命令中关闭命令。"
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2698,550 +2722,543 @@
 "语法错误: 您为命令输入的参数个数不对。如果您本来并不想输入命令,您可以在工具-"
 ">首选项->界面->转换->启用“斜线”命令中关闭命令。"
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "无法打开文件。"
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>与 %s 的谈话</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "保存对话"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "发送文件"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "无法将图标文件保存到磁盘。"
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "保存图标"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "保存对话"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/对话(C)/发送文件(_N)..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/选项/显示时间戳(_I)"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/对话(C)/发送文件(N)..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/选项/显示时间戳(I)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "给用户发送文件"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help: 列出可用的命令。"
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "进度"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "进度"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "文件不存在。"
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "无法发送 0 字节的文件。"
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "该文件不存在。"
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "打开..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "另存为..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s 想要给您发送 %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "接受来自 %s 的文件传送吗?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"可从以下地址下载文件:\n"
-"远程主机: %s\n"
-"远程端口: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3283,74 +3300,74 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "交谈对象"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3399,7 +3416,7 @@
 msgstr "浏览器命令“%s”无效。"
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
@@ -3408,488 +3425,492 @@
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错: %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "回来(_T)"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "忽略字体(_F)"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "较大字体(_Z)"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "忽略收到信息的格式(_I)"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} 更改格式(_F)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "允许斜线开头的命令(_S)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "在标签/标题中显示别名(_A)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "发生事件时激活对话窗口(_R)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "发生事件时激活聊天窗口(_W)"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天中使用多种颜色来区分用户名(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3898,83 +3919,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3983,86 +4004,86 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4077,7 +4098,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4092,64 +4113,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "网络"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "插件"
 
@@ -4173,7 +4194,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4237,27 +4258,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "该文件不存在"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "您是否想要覆盖?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "保存文件..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "打开文件..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "房间列表"
@@ -4325,23 +4362,15 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "无法保存 0 字节的图标文件。"
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "保存图标"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4350,7 +4379,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4359,25 +4388,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "纯文本"
 
@@ -4466,12 +4495,12 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "可用"
 
@@ -4483,12 +4512,12 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4504,14 +4533,14 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4531,175 +4560,177 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "好友信息"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "正在读取数据"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "正在读取服务器密钥"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: 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:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "好友信息"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4707,77 +4738,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 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:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 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:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 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:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4795,7 +4826,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4809,14 +4840,14 @@
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4836,17 +4867,19 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4878,54 +4911,51 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "服务器已断开连接"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "发送文件"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "话题"
 
@@ -4938,34 +4968,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "用户名"
 
@@ -4990,12 +5021,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "目前位于"
 
@@ -5017,111 +5048,111 @@
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -5208,7 +5239,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
@@ -5282,7 +5313,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5301,7 +5332,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5334,87 +5365,88 @@
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "生日"
 
@@ -5433,25 +5465,25 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "地址"
 
@@ -5471,31 +5503,31 @@
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -5582,446 +5614,446 @@
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 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:1176
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "已登出"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 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:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 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:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "密码已更改"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "密码已更改"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
-#: src/protocols/jabber/jabber.c:1452
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -6036,24 +6068,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6192,7 +6224,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -6337,8 +6369,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6416,88 +6448,88 @@
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "更新好友图标"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6505,106 +6537,122 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>别名:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>别名:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "MSN 个人资料"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "用户尚未创建公开的个人资料。"
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的个人资料。"
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "用户的配置文件为空。"
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6619,15 +6667,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6648,11 +6696,11 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6674,7 +6722,7 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
@@ -6707,11 +6755,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
@@ -6768,7 +6816,7 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "组(_G):"
@@ -6784,131 +6832,131 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "请求的参数未传入"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "无法写入网络"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "无法从网络读取套接字"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "与服务器通讯出错"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "会议未找到"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "会议不存在"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "已存在同名文件夹"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "支持"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密码已过期"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "无效的密码"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "用户未找到"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "账户已经被禁用"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系统管理员已经禁用此操作"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "服务器不可用;请稍候再试"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "无法为同一个文件夹添加两次联系人"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "无法添加您自己"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "无效的用户名或密码"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您无法将同一个人两次添加到对话"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您输入了无效的用户名"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "用户已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "试用版本不允许超过十个用户同时在线"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "用户或者离线,或者已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
@@ -6988,7 +7036,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
@@ -6998,11 +7046,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "用户 ID"
 
@@ -7013,46 +7061,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7063,15 +7111,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7081,34 +7129,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -7123,15 +7171,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "服务器端口"
 
@@ -7231,181 +7279,187 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 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:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7415,46 +7469,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7462,21 +7516,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7484,24 +7538,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 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 "
@@ -7510,42 +7564,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, 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:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7554,11 +7608,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7568,17 +7622,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7591,7 +7645,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7604,7 +7658,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7617,32 +7671,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7650,82 +7704,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:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:3803
-#, 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:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7733,166 +7782,166 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "家庭住址"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "邮政编码"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "办公地址"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "家庭住址"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "邮政编码"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "办公地址"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, 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:5057
+#: src/protocols/oscar/oscar.c:5073
 #, 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:5060
+#: src/protocols/oscar/oscar.c:5076
 #, 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:5063
+#: src/protocols/oscar/oscar.c:5079
 #, 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:5066
+#: src/protocols/oscar/oscar.c:5082
 #, 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:5069
+#: src/protocols/oscar/oscar.c:5085
 #, 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:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7901,25 +7950,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -7928,7 +7977,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7938,19 +7987,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7959,7 +8008,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7971,11 +8020,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7985,16 +8034,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8003,13 +8052,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8017,11 +8066,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8031,18 +8080,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, 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:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8052,17 +8101,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8072,71 +8121,71 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8144,75 +8193,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -8227,15 +8276,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -8322,32 +8371,32 @@
 msgstr "设定聊天密码"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "显示公钥"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
@@ -8364,6 +8413,11 @@
 "除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令来获取公"
 "钥。"
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "打开..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8420,143 +8474,111 @@
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "模式"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "用户模式"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "寻呼"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "短信"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "彩信"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "视频会议"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "计算机"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "终端"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "发送文件..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8569,8 +8591,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "频道信息"
 
@@ -8578,86 +8599,68 @@
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "频道名称:\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "用户计数:\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "频道创建人:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "频道密码句:\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "频道 HMAC:\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>频道名称:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>用户数:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>频道创建人:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>频道密码句:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"频道主题:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr "\n频道模式:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"创建者密钥指纹:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr "创建者密钥漏印:\n%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>频道 HMAC:</b> %s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>频道话题:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>频道模式:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>创建者密钥指纹:</b><br%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>创建者密钥漏印:</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8669,122 +8672,122 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, 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:1040
+#: src/protocols/silc/chat.c:1046
 #, 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:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -8834,221 +8837,275 @@
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, 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
+#: src/protocols/silc/ops.c:413
 #, 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
+#: src/protocols/silc/ops.c:417
 #, 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
+#: src/protocols/silc/ops.c:448
 #, 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
+#: src/protocols/silc/ops.c:452
 #, 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
+#: src/protocols/silc/ops.c:479
 #, 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
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, 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
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "主机名"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "用户模式"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "频道"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "更改昵称失败"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "服务器统计"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "无法获取服务器统计"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "没有可用的服务器统计"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"本地服务器启动时间: %s\n"
+"本地服务器运行时间: %s\n"
+"本地服务器客户数: %d\n"
+"本地服务器频道数: %d\n"
+"本地服务器管理员: %d\n"
+"本地路由器管理员: %d\n"
+"本地单元客户数: %d\n"
+"本地单元频道数: %d\n"
+"本地单元服务器数: %d\n"
+"总计客户数: %d\n"
+"总计频道数: %d\n"
+"总计服务器数: %d\n"
+"总计路由器数: %d\n"
+"总计服务器管理员数: %d\n"
+"总计路由器管理员数: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "网络统计"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping 失败"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "服务器对 ping 的响应"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -9110,15 +9167,15 @@
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9126,31 +9183,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "短信"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "彩信"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9159,113 +9228,226 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
-msgstr "part: 离开聊天"
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave: 离开聊天"
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "离开频道失败"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "话题太长"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "您必须指定昵称"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "频道 %s 未找到"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s 的频道模式: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s 未设置频道模式"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "为 %s 设置频道模式失败"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "未知命令: %s,(可能是 Gaim bug)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [频道]: 离开聊天"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [频道]: 离开聊天"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;昵称&gt;: 邀请昵称加入此频道"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1191
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;用户模式&gt;: 设置您的用户选项"
-
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;频道&gt; [+|-&lt;模式&gt]; [参数]: 更改或显示频道模式"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [服务器]: 查看服务器管理细节"
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stat: 查看服务器和网络统计"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: 向连接的服务器发送 PING"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用户"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9279,109 +9461,130 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "电子邮件:\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
-msgstr "公钥指纹:\n%s\n\n"
-
-#: src/protocols/silc/util.c:304
+msgstr ""
+"公钥指纹:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
-msgstr "公钥漏印:\n%s"
-
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+msgstr ""
+"公钥漏印:\n"
+"%s"
+
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "公钥信息"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "寻呼"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "计算机"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "终端"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9585,15 +9788,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9677,46 +9880,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9726,11 +9929,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9738,76 +9941,90 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "普通认证失败!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"普通的身份验证方法失败。这意味着您的密码可能不对,或者是 Yahoo! 的身份验证方法"
+"发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和特性。"
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -9816,27 +10033,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
@@ -9851,191 +10068,225 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "寻呼主机"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "日本寻呼主机"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "寻呼端口"
+msgid "Pager host"
+msgstr "寻呼主机"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "文件传送主机"
+msgid "Japan Pager host"
+msgstr "日本寻呼主机"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "日本文件传送主机"
+msgid "Pager port"
+msgstr "寻呼端口"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "文件传送主机"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "日本文件传送主机"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "YCHT 主机"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "YCHT 端口"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 地址:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo 日本资料"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Yahoo! 资料"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
 
-#: src/protocols/yahoo/yahoo_profile.c:827
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "嗜好"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "最新新闻"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "主页"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "酷链接 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "酷链接 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "酷链接 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s 的用户信息不可用"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "嗜好"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "最新新闻"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "主页"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "酷链接 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "酷链接 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "酷链接 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s 的用户信息不可用"
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"无法获取用户的个人资料。可能临时出现了服务器端问题。请稍后再试。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个人资料。"
+"如果您确定用户存在的话,请稍候再试。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "用户的配置文件为空。"
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您现在正在 %s 中聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "用户房间"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10043,18 +10294,82 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "试图订阅 %s,%s,%s 失败。"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;昵称&gt;: 定位用户"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;昵称&gt;: 定位用户"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>收件人</i>&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "重订"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "从服务器获取订阅"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10066,19 +10381,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "暴露"
 
@@ -10105,14 +10420,14 @@
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "自定义"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "接受"
 
@@ -10135,27 +10450,27 @@
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
@@ -10165,17 +10480,17 @@
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10184,11 +10499,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10197,12 +10512,12 @@
 "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -10237,22 +10552,27 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "秒"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"