diff po/zh_CN.po @ 11274:67a929d50cfe

[gaim-migrate @ 13459] commit the make dist changes to po files, as otherwise it takes 15 minutes to process them (and a minute amount of time after the first attempt) committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 15 Aug 2005 16:22:25 +0000
parents e099f00b2f93
children 4be6232ffcd3
line wrap: on
line diff
--- a/po/zh_CN.po	Mon Aug 15 16:18:00 2005 +0000
+++ b/po/zh_CN.po	Mon Aug 15 16:22:25 2005 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-09 03:10+0800\n"
+"POT-Creation-Date: 2005-08-15 12:01-0400\n"
 "PO-Revision-Date: 2005-06-09 03:19+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/autorecon.c:292
+#: plugins/autorecon.c:291
 msgid "Error Message Suppression"
 msgstr "错误消息屏蔽"
 
-#: plugins/autorecon.c:296
+#: plugins/autorecon.c:295
 msgid "Hide Disconnect Errors"
 msgstr "隐藏断开连接错误"
 
-#: plugins/autorecon.c:300
+#: plugins/autorecon.c:299
 msgid "Hide Login Errors"
 msgstr "隐藏登录错误"
 
-#: plugins/autorecon.c:304
+#: plugins/autorecon.c:303
 msgid "Hide Reconnecting Dialog"
 msgstr "隐藏重新连接错误"
 
@@ -38,7 +38,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:328
+#: plugins/autorecon.c:327
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
@@ -46,28 +46,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:331 plugins/autorecon.c:333
+#: plugins/autorecon.c:330 plugins/autorecon.c:332
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ciphertest.c:200
-msgid "Cipher Test"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ciphertest.c:203 plugins/ciphertest.c:205
-msgid "Tests the ciphers that ship with gaim."
-msgstr ""
-
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "程序内部所用的权值,当..."
@@ -130,6 +112,21 @@
 "in contact priority computations."
 msgstr "允许在进行好友优先级比较时为瞌睡/离开/离线状态所用的权值。"
 
+#.
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: plugins/docklet/docklet-win32.c:44
+msgid "Gaim"
+msgstr "Gaim"
+
+#: plugins/docklet/docklet-win32.c:45
+msgid "Gaim - Signed off"
+msgstr "Gaim - 已登出"
+
+#: plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "Gaim - 离开"
+
 #: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "新消息..."
@@ -138,26 +135,24 @@
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:170
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:1775 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:53 src/protocols/irc/irc.c:179
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1087
-#: src/protocols/jabber/jabber.c:998 src/protocols/msn/msn.c:540
-#: src/protocols/novell/novell.c:2811 src/protocols/novell/novell.c:2949
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:689
-#: src/protocols/oscar/oscar.c:5725 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6899 src/protocols/rendezvous/rendezvous.c:652
-#: src/protocols/rendezvous/rendezvous.c:672
-#: src/protocols/sametime/sametime.c:2717 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3058
-#: src/protocols/zephyr/zephyr.c:2271 src/status.c:160
+#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
+#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
+#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
+#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
+#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
+#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
+#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
+#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
+#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:182
+#: plugins/docklet/docklet.c:184
 msgid "Back"
 msgstr "回来"
 
@@ -165,15 +160,15 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:198 src/gtkft.c:652
+#: plugins/docklet/docklet.c:198 src/gtkft.c:694
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2322
+#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2162
+#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
 msgid "Preferences"
 msgstr "首选项"
 
@@ -218,29 +213,6 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - 已登出"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - 离开"
-
-#: plugins/docklet/eggtrayicon.c:122
-msgid "Orientation"
-msgstr "方向"
-
-#: plugins/docklet/eggtrayicon.c:123
-msgid "The orientation of the tray."
-msgstr "托盘的方向。"
-
 #: plugins/extplacement.c:77
 msgid "By conversation count"
 msgstr "按对话计数"
@@ -299,6 +271,59 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
 
+#: plugins/gaim-remote/remote.c:91
+msgid "Not connected to AIM"
+msgstr "未连接到 AIM"
+
+#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
+msgid "No screenname given."
+msgstr "没有给出用户名。"
+
+#: plugins/gaim-remote/remote.c:176
+msgid "No roomname given."
+msgstr "没有给出聊天室名。"
+
+#: plugins/gaim-remote/remote.c:195
+msgid "Invalid AIM URI"
+msgstr "无效的 AIM URI"
+
+#: plugins/gaim-remote/remote.c:750
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"将 %s 指派给套接字失败:\n"
+"%s"
+
+#: plugins/gaim-remote/remote.c:774
+msgid "Unable to open socket"
+msgstr "无法打开套接字"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:824
+msgid "Remote Control"
+msgstr "远程控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:827
+msgid "Provides remote control for gaim applications."
+msgstr "提供 gaim 程序的远程控制。"
+
+#. *  description
+#: plugins/gaim-remote/remote.c:829
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -399,59 +424,6 @@
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供对常用 gtkrc 设置的访问。"
 
-#: plugins/gaim-remote/remote.c:91
-msgid "Not connected to AIM"
-msgstr "未连接到 AIM"
-
-#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
-msgid "No screenname given."
-msgstr "没有给出用户名。"
-
-#: plugins/gaim-remote/remote.c:176
-msgid "No roomname given."
-msgstr "没有给出聊天室名。"
-
-#: plugins/gaim-remote/remote.c:195
-msgid "Invalid AIM URI"
-msgstr "无效的 AIM URI"
-
-#: plugins/gaim-remote/remote.c:750
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"将 %s 指派给套接字失败:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:774
-msgid "Unable to open socket"
-msgstr "无法打开套接字"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaim-remote/remote.c:824
-msgid "Remote Control"
-msgstr "远程控制"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaim-remote/remote.c:827
-msgid "Provides remote control for gaim applications."
-msgstr "提供 gaim 程序的远程控制。"
-
-#. *  description
-#: plugins/gaim-remote/remote.c:829
-msgid ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
-msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
-
 #. Configuration frame
 #: plugins/gestures/gestures.c:241
 msgid "Mouse Gestures Configuration"
@@ -505,9 +477,9 @@
 "向上再向右可切换到下个对话。"
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2020
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:611
-#: src/protocols/msn/msn.c:1492 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
+#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "名称"
 
@@ -516,30 +488,30 @@
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:455
+#: plugins/gevolution/add_buddy_dialog.c:459
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7263
+#: plugins/gevolution/add_buddy_dialog.c:472
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4309
-#: src/gtkblist.c:4686
+#: plugins/gevolution/add_buddy_dialog.c:553
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
+#: src/gtkblist.c:4777
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/add_buddy_dialog.c:579
 #: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/add_buddy_dialog.c:596
 msgid "Select Buddy"
 msgstr "选择好友"
 
@@ -564,32 +536,45 @@
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
-#: src/gtkblist.c:3317 src/gtkprefs.c:1789 src/protocols/jabber/jabber.c:939
-msgid "None"
-msgstr "无"
-
-#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
-#: src/blist.c:517 src/blist.c:1235 src/blist.c:1449 src/gtkblist.c:4126
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:225
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#, fuzzy
+msgid "Unable to send e-mail"
+msgstr "无法发送消息。"
+
+#: plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
+#: plugins/gevolution/gevolution.c:290
+#, fuzzy
+msgid "Send E-Mail"
+msgstr "电子邮件"
+
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:349
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:382 plugins/idle.c:52 src/gtkconn.c:432
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
 msgid "Account"
 msgstr "账户"
 
@@ -599,7 +584,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:465
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -607,80 +592,79 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
-msgid "Provides integration with Ximian Evolution."
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#, fuzzy
+msgid "Provides integration with Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:264
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:288
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:312
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:595
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
+#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:347
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:359
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:379
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gtk-signals-test.c:102
-msgid "GTK Signals Test"
-msgstr "GTK 信号测试"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
-msgid "Test to see that all ui signals are working properly."
-msgstr "测试看看所有的信号是否都工作正确。"
-
-#: plugins/history.c:93
+#: plugins/history.c:137
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: plugins/history.c:138
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: plugins/history.c:177
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:95
+#: plugins/history.c:179
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:96
+#: plugins/history.c:180
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
+"conversation into the current conversation.\n"
+"\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -704,7 +688,7 @@
 msgid "Minutes"
 msgstr "分钟"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:63 plugins/idle.c:97
 msgid "I'dle Mak'er"
 msgstr "瞌睡虫"
 
@@ -720,7 +704,7 @@
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: plugins/idle.c:100 plugins/idle.c:101
+#: plugins/idle.c:99 plugins/idle.c:100
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
@@ -783,73 +767,73 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:643
+#: plugins/notify.c:642
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:647
+#: plugins/notify.c:646
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:654
+#: plugins/notify.c:653
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:661
+#: plugins/notify.c:660
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:669
+#: plugins/notify.c:668
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:676
+#: plugins/notify.c:675
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:695
+#: plugins/notify.c:694
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:703
+#: plugins/notify.c:702
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. Raise window method button
-#: plugins/notify.c:711
+#: plugins/notify.c:710
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:719
+#: plugins/notify.c:718
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:724
+#: plugins/notify.c:723
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:731
+#: plugins/notify.c:730
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:739
+#: plugins/notify.c:738
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:747
+#: plugins/notify.c:746
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:756
+#: plugins/notify.c:755
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -859,7 +843,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:846
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -867,7 +851,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:849 plugins/notify.c:851
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读消息。"
 
@@ -877,14 +861,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:535
+#: plugins/perl/perl.c:567
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -961,7 +945,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:624
+#: plugins/signals-test.c:626
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -969,7 +953,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:627 plugins/signals-test.c:629
+#: plugins/signals-test.c:629 plugins/signals-test.c:631
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -991,43 +975,43 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:1602
+#: plugins/spellchk.c:1680
 msgid "Duplicate Correction"
 msgstr ""
 
-#: plugins/spellchk.c:1603
+#: plugins/spellchk.c:1681
 msgid "The specified word already exists in the correction list."
 msgstr ""
 
-#: plugins/spellchk.c:1748
+#: plugins/spellchk.c:1826
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:1772
+#: plugins/spellchk.c:1850
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:1784
+#: plugins/spellchk.c:1862
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:1810
+#: plugins/spellchk.c:1888
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:1817
+#: plugins/spellchk.c:1895
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:1831
+#: plugins/spellchk.c:1909
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:1873
+#: plugins/spellchk.c:1951
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:1875 plugins/spellchk.c:1876
+#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -1037,6 +1021,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: plugins/ssl/ssl-gnutls.c:227
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+msgid "Provides SSL support through GNUTLS."
+msgstr "提供通过 GNUTLS 的 SSL 支持。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:319
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -1049,42 +1069,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-gnutls.c:226
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
-msgid "Provides SSL support through GNUTLS."
-msgstr "提供通过 GNUTLS 的 SSL 支持。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:318
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
-
 #: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
@@ -1254,186 +1238,206 @@
 "\n"
 "* 注意: 此插件需要 Win2000 或 WinXP。"
 
-#: plugins/win32/winprefs/winprefs.c:320
+#: plugins/win32/winprefs/winprefs.c:401
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:328
+#: plugins/win32/winprefs/winprefs.c:409
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:329
+#: plugins/win32/winprefs/winprefs.c:410
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3404
-#: src/gtkprefs.c:2116
+#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
+#: src/gtkprefs.c:2099
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:339
+#: plugins/win32/winprefs/winprefs.c:422
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
-#. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:343
-msgid "Docked _Buddy List is always on top"
-msgstr "停靠的好友列表常居顶端(_B)"
-
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:353
-msgid "_Keep Buddy List window on top"
+#: plugins/win32/winprefs/winprefs.c:426
+#, fuzzy
+msgid "_Keep Buddy List window on top:"
 msgstr "好友列表窗口常居顶端(_K)"
 
+#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
+msgid "Never"
+msgstr "从不"
+
+#: plugins/win32/winprefs/winprefs.c:429
+#, fuzzy
+msgid "Always"
+msgstr "离开"
+
+#. XXX: Did this ever work?
+#: plugins/win32/winprefs/winprefs.c:431
+msgid "Only when docked"
+msgstr ""
+
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:937
-#: src/gtkprefs.c:2117
+#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
+#: src/gtkprefs.c:2100
 msgid "Conversations"
 msgstr "对话"
 
-#: plugins/win32/winprefs/winprefs.c:359
-msgid "_Flash Window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:436
+#, fuzzy
+msgid "_Flash window when messages are received"
 msgstr "收到信息时闪烁窗口(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:383
+#: plugins/win32/winprefs/winprefs.c:459
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:385 plugins/win32/winprefs/winprefs.c:386
+#: plugins/win32/winprefs/winprefs.c:461
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/account.c:631
+#: plugins/win32/winprefs/winprefs.c:462
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+
+#: src/account.c:773
 msgid "accounts"
 msgstr "账户"
 
-#: src/account.c:763
+#: src/account.c:913
 msgid "Password is required to sign on."
 msgstr "需要密码才能登入。"
 
-#: src/account.c:787
+#: src/account.c:939
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
-#: src/account.c:789
+#: src/account.c:946
 msgid "Enter Password"
 msgstr "输入密码"
 
+#: src/account.c:951
+#, fuzzy
+msgid "Save password"
+msgstr "新密码"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:791 src/account.c:942 src/gtkblist.c:2634
-#: src/gtkdialogs.c:516 src/gtkdialogs.c:659 src/gtkdialogs.c:715
-#: src/gtkrequest.c:260 src/protocols/jabber/jabber.c:1101
-#: 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:2394
-#: src/protocols/oscar/oscar.c:3658 src/protocols/oscar/oscar.c:3739
-#: src/protocols/oscar/oscar.c:6992 src/protocols/oscar/oscar.c:7117
-#: src/protocols/oscar/oscar.c:7142 src/protocols/oscar/oscar.c:7194
-#: src/protocols/sametime/sametime.c:4637 src/protocols/silc/buddy.c:460
+#: src/account.c:959 src/account.c:1111 src/gtkdialogs.c:504
+#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
+#: src/protocols/jabber/jabber.c:1103 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:2476 src/protocols/oscar/oscar.c:3774
+#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
+#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
 #: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
 #: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
 #: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2777
-#: src/protocols/yahoo/yahoo.c:2786 src/request.h:1244
+#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:792 src/account.c:943 src/account.c:981 src/gtkaccount.c:2012
-#: src/gtkaccount.c:2482 src/gtkblist.c:2635 src/gtkblist.c:4724
-#: src/gtkdialogs.c:517 src/gtkdialogs.c:660 src/gtkdialogs.c:716
-#: src/gtkdialogs.c:814 src/gtkdialogs.c:836 src/gtkdialogs.c:856
-#: src/gtkdialogs.c:900 src/gtkdialogs.c:962 src/gtkdialogs.c:1004
-#: src/gtkdialogs.c:1046 src/gtkimhtmltoolbar.c:446 src/gtkprivacy.c:589
-#: src/gtkprivacy.c:602 src/gtkprivacy.c:627 src/gtkprivacy.c:638
+#: src/account.c:960 src/account.c:1112 src/account.c:1150
+#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
 #: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
 #: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:680 src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
 #: 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:1578 src/protocols/oscar/oscar.c:2395
-#: src/protocols/oscar/oscar.c:3616 src/protocols/oscar/oscar.c:3659
-#: src/protocols/oscar/oscar.c:3696 src/protocols/oscar/oscar.c:3740
-#: src/protocols/oscar/oscar.c:6993 src/protocols/oscar/oscar.c:7118
-#: src/protocols/oscar/oscar.c:7143 src/protocols/oscar/oscar.c:7195
-#: src/protocols/oscar/oscar.c:7264 src/protocols/sametime/sametime.c:4638
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:595
-#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1701
-#: src/protocols/silc/silc.c:726 src/protocols/trepia/trepia.c:348
-#: src/protocols/yahoo/yahoo.c:2778 src/protocols/yahoo/yahoo.c:2787
-#: src/request.h:1244 src/request.h:1254
+#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
+#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
+#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
+#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
+#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:813 src/connection.c:95
+#: src/account.c:982 src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
-#: src/account.c:815 src/connection.c:98
+#: src/account.c:984 src/connection.c:99
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/account.c:877 src/protocols/jabber/jabber.c:1054
+#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:886
+#: src/account.c:1055
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:911
+#: src/account.c:1080
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:918
+#: src/account.c:1087
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:925
+#: src/account.c:1094
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:931
+#: src/account.c:1100
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:939
+#: src/account.c:1108
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
-#: src/account.c:972
+#: src/account.c:1141
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:980 src/gtkrequest.c:267 src/protocols/jabber/buddy.c:568
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
+#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1397 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1077 src/protocols/jabber/buddy.c:1094
-#: src/protocols/novell/novell.c:2823
+#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
+#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
+#: src/protocols/novell/novell.c:2825
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:544
+#: src/blist.c:545
 msgid "buddy list"
 msgstr "好友列表"
 
-#: src/blist.c:1141
+#: src/blist.c:1145
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1822
+#: src/blist.c:1835
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1445,96 +1449,92 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1831
+#: src/blist.c:1844
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/connection.c:97
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/conversation.c:236
+#: src/conversation.c:237
 msgid "Unable to send message: The message is too large."
 msgstr "无法发送消息: 消息太大。"
 
-#: src/conversation.c:239 src/conversation.c:252
+#: src/conversation.c:240 src/conversation.c:253
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "无法给 %s 发送消息。"
 
-#: src/conversation.c:240
+#: src/conversation.c:241
 msgid "The message is too large."
 msgstr "消息太长。"
 
-#: src/conversation.c:249
+#: src/conversation.c:250
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1956
+#: src/conversation.c:1962
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1959
+#: src/conversation.c:1965
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2056
+#: src/conversation.c:2062
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2059
+#: src/conversation.c:2065
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2101
+#: src/conversation.c:2107
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2103
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2180
+#: src/conversation.c:2186
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2188
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2587
+#: src/conversation.c:2596
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2589
+#: src/conversation.c:2598
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2591 src/gtkprefs.c:1295
+#: src/conversation.c:2600 src/gtkprefs.c:1279
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2593
+#: src/conversation.c:2602
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2595
+#: src/conversation.c:2604
 msgid "By account"
 msgstr "按账户"
 
-#: src/desktopitem.c:286 src/desktopitem.c:875
-msgid "No name"
-msgstr "无名称"
-
-#: src/ft.c:151 src/protocols/msn/msn.c:369
+#: src/ft.c:150 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1543,7 +1543,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:155
+#: src/ft.c:154
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1552,7 +1552,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:159
+#: src/ft.c:158
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1561,35 +1561,35 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:192
+#: src/ft.c:191
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:202
+#: src/ft.c:201
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:211
+#: src/ft.c:210
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:269
+#: src/ft.c:268
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:276
+#: src/ft.c:275
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:317
+#: src/ft.c:316
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:321
+#: src/ft.c:320
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1600,57 +1600,62 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:379
+#: src/ft.c:344
+#, fuzzy, c-format
+msgid "%s is offering to send file %s"
+msgstr "%2$s 发送 %1$s"
+
+#: src/ft.c:384
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:400
+#: src/ft.c:405
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:411
+#: src/ft.c:416
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "开始来自 %2$s 的 %1$s 传送"
 
-#: src/ft.c:565
+#: src/ft.c:570
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:568
+#: src/ft.c:573
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:952
+#: src/ft.c:957
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:957
+#: src/ft.c:962
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:1014
+#: src/ft.c:1019
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1019
+#: src/ft.c:1024
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1076
-#, c-format
-msgid "File transfer to %s failed.\n"
+#: src/ft.c:1081
+#, fuzzy, c-format
+msgid "File transfer to %s failed."
 msgstr "给 %s 传送文件失败。\n"
 
-#: src/ft.c:1078
-#, c-format
-msgid "File transfer from %s failed.\n"
+#: src/ft.c:1083
+#, fuzzy, c-format
+msgid "File transfer from %s failed."
 msgstr "来自 %s 的文件传送失败。\n"
 
 #: src/gaim-remote.c:104
@@ -1805,11 +1810,11 @@
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:682 src/gtkft.c:584
+#: src/gtkaccount.c:682 src/gtkft.c:626
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:687 src/gtkblist.c:4278
+#: src/gtkaccount.c:687 src/gtkblist.c:4369
 msgid "Screen Name:"
 msgstr "用户名:"
 
@@ -1817,7 +1822,7 @@
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4292 src/gtkblist.c:4671
+#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
 msgid "Alias:"
 msgstr "别名:"
 
@@ -1870,7 +1875,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1096
+#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -1886,15 +1891,15 @@
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1090
+#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1117
+#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1135
+#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
 msgid "_Port:"
 msgstr "端口(_P):"
 
@@ -1902,7 +1907,7 @@
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1172
+#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
@@ -1914,17 +1919,8 @@
 msgid "Modify Account"
 msgstr "修改账户"
 
-#. Add the disclosure
-#: src/gtkaccount.c:1651
-msgid "Show more options"
-msgstr "显示全部选项"
-
-#: src/gtkaccount.c:1652
-msgid "Show fewer options"
-msgstr "显示主要选项"
-
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:679
+#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
 msgid "Register"
 msgstr "注册"
 
@@ -1938,7 +1934,7 @@
 msgstr "删除"
 
 #: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4295
+#: src/protocols/oscar/oscar.c:4420
 msgid "Screen Name"
 msgstr "用户名"
 
@@ -1950,12 +1946,12 @@
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2457
+#: src/gtkaccount.c:2466
 #, 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:2471
+#: src/gtkaccount.c:2480
 msgid ""
 "\n"
 "\n"
@@ -1965,248 +1961,232 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2475
-msgid "Information"
-msgstr "信息"
-
-#: src/gtkaccount.c:2479
+#: src/gtkaccount.c:2488
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2481 src/gtkblist.c:4723 src/gtkconv.c:1504
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:3920
+#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
+#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
 #: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:824
+#: src/gtkblist.c:888
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:845
+#: src/gtkblist.c:909
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:856 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1225
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1160
+#: src/gtkblist.c:1228
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1234
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1172
+#: src/gtkblist.c:1240
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1176 src/gtkblist.c:1180 src/gtkblist.c:1278
-#: src/gtkblist.c:1301
+#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
+#: src/gtkblist.c:1369
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1259
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1261
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1263
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1198 src/gtkdialogs.c:898 src/gtkdialogs.c:899
+#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1286 src/gtkblist.c:1307
+#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1204 src/gtkblist.c:1288 src/gtkblist.c:1309
-#: src/gtkconn.c:172
+#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
+#: src/gtkconn.c:171
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1250
+#: src/gtkblist.c:1318
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1252
+#: src/gtkblist.c:1320
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1254
+#: src/gtkblist.c:1322
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:1324
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1274 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:101
+#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:102
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1276
+#: src/gtkblist.c:1344
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1314 src/gtkblist.c:1337
+#: src/gtkblist.c:1382 src/gtkblist.c:1405
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1342
+#: src/gtkblist.c:1410
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1559 src/gtkblist.c:1569 src/gtkblist.c:3537
-#: src/gtkblist.c:3540
+#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
+#: src/gtkblist.c:3649
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:2010 src/gtkconv.c:4165 src/gtkpounce.c:314
+#: src/gtkblist.c:2106 src/gtkconv.c:4255 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:2579
+#: src/gtkblist.c:2675
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2580
+#: src/gtkblist.c:2676
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2677
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2582
+#: src/gtkblist.c:2678
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2583
+#: src/gtkblist.c:2679
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2585
+#: src/gtkblist.c:2681
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2586
+#: src/gtkblist.c:2682
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2587
+#: src/gtkblist.c:2683
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2588
+#: src/gtkblist.c:2684
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2589
+#: src/gtkblist.c:2685
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2591
+#: src/gtkblist.c:2687
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2594
+#: src/gtkblist.c:2690
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2595
+#: src/gtkblist.c:2691
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2596
+#: src/gtkblist.c:2692
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2597
+#: src/gtkblist.c:2693
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2599
+#: src/gtkblist.c:2695
 msgid "/Tools/_Statuses"
 msgstr "/工具(T)/状态(_S)"
 
-#: src/gtkblist.c:2600
+#: src/gtkblist.c:2696
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2601
+#: src/gtkblist.c:2697
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2698
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2699
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2604
+#: src/gtkblist.c:2700
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2606
+#: src/gtkblist.c:2702
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2607
+#: src/gtkblist.c:2703
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2610
+#: src/gtkblist.c:2706
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2611
+#: src/gtkblist.c:2707
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2612
+#: src/gtkblist.c:2708
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2613
+#: src/gtkblist.c:2709
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2631
-msgid "Rename Group"
-msgstr "重命名组"
-
-#: src/gtkblist.c:2631
-msgid "New group name"
-msgstr "新组名称"
-
-#: src/gtkblist.c:2632
-msgid "Please enter a new name for the selected group."
-msgstr "请输入选中组的新名字。"
-
-#: src/gtkblist.c:2663 src/gtkblist.c:2732
+#: src/gtkblist.c:2741 src/gtkblist.c:2808
 #, c-format
 msgid ""
 "\n"
@@ -2215,7 +2195,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2741
+#: src/gtkblist.c:2817
 #, c-format
 msgid ""
 "\n"
@@ -2224,7 +2204,7 @@
 "\n"
 "<b>联系人别名:</b> %s"
 
-#: src/gtkblist.c:2749
+#: src/gtkblist.c:2825
 #, c-format
 msgid ""
 "\n"
@@ -2233,7 +2213,7 @@
 "\n"
 "<b>别名:</b> %s"
 
-#: src/gtkblist.c:2757
+#: src/gtkblist.c:2833
 #, c-format
 msgid ""
 "\n"
@@ -2242,7 +2222,7 @@
 "\n"
 "<b>昵称:</b> %s"
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2842
 #, c-format
 msgid ""
 "\n"
@@ -2251,7 +2231,7 @@
 "\n"
 "<b>登入:</b> %s"
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -2260,7 +2240,7 @@
 "\n"
 "<b>瞌睡:</b> %s"
 
-#: src/gtkblist.c:2791
+#: src/gtkblist.c:2889
 #, c-format
 msgid ""
 "\n"
@@ -2269,21 +2249,7 @@
 "\n"
 "<b>上次看见:</b> %s 以前"
 
-#: src/gtkblist.c:2800
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2801
-#, c-format
-msgid ""
-"\n"
-"<b>Warned:</b> %s"
-msgstr ""
-"\n"
-"<b>警告:</b> %s"
-
-#: src/gtkblist.c:2807
+#: src/gtkblist.c:2897
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2291,7 +2257,7 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2828
+#: src/gtkblist.c:2919
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2299,7 +2265,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2830
+#: src/gtkblist.c:2921
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2307,7 +2273,7 @@
 "\n"
 "<b>状态:</b> 可怕"
 
-#: src/gtkblist.c:2832
+#: src/gtkblist.c:2923
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2315,103 +2281,103 @@
 "\n"
 "<b>状态:</b> 混乱"
 
-#: src/gtkblist.c:3074
-#, c-format
-msgid "Idle (%dh%02dm) "
+#: src/gtkblist.c:3185
+#, fuzzy, c-format
+msgid "Idle (%dh %02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3187
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3190
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:3085
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "警告 (%d%%) "
-
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3194
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3208
+#: src/gtkblist.c:3310
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: src/gtkblist.c:3209 src/gtkblist.c:3243
+#: src/gtkblist.c:3311 src/gtkblist.c:3345
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3210
+#: src/gtkblist.c:3312
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: src/gtkblist.c:3211
+#: src/gtkblist.c:3313
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: src/gtkblist.c:3212
+#: src/gtkblist.c:3314
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: src/gtkblist.c:3213
+#: src/gtkblist.c:3315
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: src/gtkblist.c:3246
+#: src/gtkblist.c:3348
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3249
+#: src/gtkblist.c:3351
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3319
+#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
+#: src/protocols/yahoo/yahoo.c:2749
+msgid "None"
+msgstr "无"
+
+#: src/gtkblist.c:3429
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3320
+#: src/gtkblist.c:3430
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3321
+#: src/gtkblist.c:3431
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3432
+#: src/gtkblist.c:3542
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3433
+#: src/gtkblist.c:3543
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3434
+#: src/gtkblist.c:3544
 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:3533
+#: src/gtkblist.c:3642
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3535
+#: src/gtkblist.c:3644
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4232 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4323 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:2708
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4256
+#: src/gtkblist.c:4347
 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. "
@@ -2421,122 +2387,48 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4319 src/gtkblist.c:4651
+#: src/gtkblist.c:4410 src/gtkblist.c:4742
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4584
+#: src/gtkblist.c:4675
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4600
+#: src/gtkblist.c:4691
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4617
+#: src/gtkblist.c:4708
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4641
+#: src/gtkblist.c:4732
 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:4720
+#: src/gtkblist.c:4811
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4721
+#: src/gtkblist.c:4812
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5271 src/gtkblist.c:5367
+#: src/gtkblist.c:5362 src/gtkblist.c:5458
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkcellview.c:198
-msgid "Background color name"
-msgstr "背景颜色名称"
-
-#: src/gtkcellview.c:199
-msgid "Background color as a string"
-msgstr "背景颜色的字符串"
-
-#: src/gtkcellview.c:205 src/gtkimhtmltoolbar.c:1031
-msgid "Background color"
-msgstr "背景颜色"
-
-#: src/gtkcellview.c:206
-msgid "Background color as a GdkColor"
-msgstr "背景颜色的 GdkColor"
-
-#: src/gtkcellview.c:213
-msgid "Background set"
-msgstr "背景设定"
-
-#: src/gtkcellview.c:214
-msgid "Whether this tag affects the background color"
-msgstr "此标记是否影响背景颜色"
-
-#: src/gtkcombobox.c:486
-msgid "ComboBox model"
-msgstr ""
-
-#: src/gtkcombobox.c:487
-msgid "The model for the combo box"
-msgstr ""
-
-#: src/gtkcombobox.c:494
-msgid "Wrap width"
-msgstr ""
-
-#: src/gtkcombobox.c:495
-msgid "Wrap width for layouting the items in a grid"
-msgstr ""
-
-#: src/gtkcombobox.c:504
-msgid "Row span column"
-msgstr ""
-
-#: src/gtkcombobox.c:505
-msgid "TreeModel column containing the row span values"
-msgstr ""
-
-#: src/gtkcombobox.c:514
-msgid "Column span column"
-msgstr ""
-
-#: src/gtkcombobox.c:516
-msgid "TreeModel column containing the column span values"
-msgstr ""
-
-#: src/gtkcombobox.c:525
+#: src/gtkconn.c:171
 #, fuzzy
-msgid "Active item"
-msgstr "活跃"
-
-#: src/gtkcombobox.c:526
-#, fuzzy
-msgid "The item which is currently active"
-msgstr "聊天目前不可用"
-
-#: src/gtkcombobox.c:534
-#, fuzzy
-msgid "Appears as list"
-msgstr "显示为离线"
-
-#: src/gtkcombobox.c:535
-msgid "Whether combobox dropdowns should look like lists rather than menus"
-msgstr ""
-
-#: src/gtkconn.c:172 src/gtkconn.c:405
-msgid "_Reconnect"
+msgid "Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:369
+#: src/gtkconn.c:368
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2549,36 +2441,50 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:371
+#: src/gtkconn.c:370
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:379
+#: src/gtkconn.c:378
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:410
+#: src/gtkconn.c:404
+msgid "_Reconnect"
+msgstr "重新连接(_R)"
+
+#: src/gtkconn.c:409
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:440
+#: src/gtkconn.c:439
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:330
+#: src/gtkconv.c:148
+#, fuzzy
+msgid "Confirm close"
+msgstr "确认账户"
+
+#: src/gtkconv.c:180
+#, fuzzy
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: src/gtkconv.c:410
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:339
+#: src/gtkconv.c:419
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:363
+#: src/gtkconv.c:456
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:366
+#: src/gtkconv.c:459
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2586,566 +2492,587 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:438
+#: src/gtkconv.c:531
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:445
+#: src/gtkconv.c:538
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:450
+#: src/gtkconv.c:543
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:457
+#: src/gtkconv.c:550
 msgid "That command only works in chats, not IMs."
 msgstr "该命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:460
+#: src/gtkconv.c:553
 msgid "That command only works in IMs, not chats."
 msgstr "该命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:464
+#: src/gtkconv.c:557
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:692 src/gtkconv.c:718
+#: src/gtkconv.c:783 src/gtkconv.c:809
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "该好友不在此聊天的协议中。"
 
-#: src/gtkconv.c:712
+#: src/gtkconv.c:803
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:767
+#: src/gtkconv.c:858
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:797
+#: src/gtkconv.c:888
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:909
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:838 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:895 src/gtkconv.c:2542 src/gtkdebug.c:177
+#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:901
+#: src/gtkconv.c:992
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:925
+#: src/gtkconv.c:1016
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:1026 src/gtkdebug.c:126
+#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1052 src/gtkdebug.c:154
+#: src/gtkconv.c:1143 src/gtkdebug.c:191
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1465
+#: src/gtkconv.c:1541
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1471 src/protocols/oscar/oscar.c:610
+#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1478
+#: src/gtkconv.c:1554
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1481 src/gtkprefs.c:828
+#: src/gtkconv.c:1557
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1486
+#: src/gtkconv.c:1562
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1492
+#: src/gtkconv.c:1568
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1501 src/gtkrequest.c:266
+#: src/gtkconv.c:1577 src/gtkrequest.c:266
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2550
+#: src/gtkconv.c:2644
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2573
+#: src/gtkconv.c:2667
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2601
+#: src/gtkconv.c:2695
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2606
+#: src/gtkconv.c:2700
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2612
+#: src/gtkconv.c:2706
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2977
+#: src/gtkconv.c:3067
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2982
+#: src/gtkconv.c:3072
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3083
+#: src/gtkconv.c:3173
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3538
+#: src/gtkconv.c:3628
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3630
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3545
+#: src/gtkconv.c:3635
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3547
+#: src/gtkconv.c:3637
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3548
+#: src/gtkconv.c:3638
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3640
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3554
+#: src/gtkconv.c:3644
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3645
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3557
+#: src/gtkconv.c:3647
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3559
-msgid "/Conversation/_Warn..."
-msgstr "/对话(C)/警告(_W)..."
-
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3649
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3654
 msgid "/Conversation/Al_ias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3568
+#: src/gtkconv.c:3656
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3658
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3572
+#: src/gtkconv.c:3660
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3577
+#: src/gtkconv.c:3665
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3667
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3584
+#: src/gtkconv.c:3672
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3588
+#: src/gtkconv.c:3676
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3589
+#: src/gtkconv.c:3677
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3590
+#: src/gtkconv.c:3678
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3679
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3680
 msgid "/Options/Show Ti_mestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3681
 msgid "/Options/Show Buddy _Icon"
 msgstr "/选项(O)/显示好友图标(_I)"
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3725
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3643
+#: src/gtkconv.c:3731
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3735
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3741
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3657
-msgid "/Conversation/Warn..."
-msgstr "/对话(C)/警告(W)..."
-
-#: src/gtkconv.c:3661
+#: src/gtkconv.c:3745
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3751
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3755
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:3759
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3763
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3769
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3689
+#: src/gtkconv.c:3773
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3695
+#: src/gtkconv.c:3779
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3698
+#: src/gtkconv.c:3782
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3701
+#: src/gtkconv.c:3785
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3704
+#: src/gtkconv.c:3788
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3791
 msgid "/Options/Show Buddy Icon"
 msgstr "/选项(O)/显示好友图标(I)"
 
-#: src/gtkconv.c:3821
+#: src/gtkconv.c:3911
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3869
+#: src/gtkconv.c:3959
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3931
+#: src/gtkconv.c:4021
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3944
+#: src/gtkconv.c:4034
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3956
+#: src/gtkconv.c:4046
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4489
+#: src/gtkconv.c:4569
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5090 src/gtkconv.c:5118 src/gtkconv.c:5214 src/gtkconv.c:5271
+#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6181
+#: src/gtkconv.c:6279
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6184
+#: src/gtkconv.c:6282
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6187
+#: src/gtkconv.c:6285
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6191
+#: src/gtkconv.c:6288
+#, fuzzy
+msgid "clear: Clears the conversation scrollback."
+msgstr "%s 已经关闭了对话窗口。"
+
+#: src/gtkconv.c:6291
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:192
+#: src/gtkdebug.c:230
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:245
+#: src/gtkdebug.c:571
+#, fuzzy
+msgid "Invert"
+msgstr "插入(_I)"
+
+#: src/gtkdebug.c:574
+msgid "Highlight matches"
+msgstr ""
+
+#: src/gtkdebug.c:621
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:283
+#: src/gtkdebug.c:674
+#, fuzzy
+msgid "Clear"
+msgstr "关闭"
+
+#: src/gtkdebug.c:683
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:690 src/gtkdebug.c:691
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkdialogs.c:66 src/gtkdialogs.c:95
+#: src/gtkdebug.c:709
+#, fuzzy
+msgid "Filter"
+msgstr "已失败"
+
+#: src/gtkdebug.c:722
+#, fuzzy
+msgid "Right click for more options."
+msgstr "显示全部选项"
+
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:70 src/gtkdialogs.c:71
-#: src/gtkdialogs.c:72 src/gtkdialogs.c:73 src/gtkdialogs.c:74
-#: src/gtkdialogs.c:76 src/gtkdialogs.c:77
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
 msgid "developer"
 msgstr "开发者"
 
+#: src/gtkdialogs.c:61
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
+#: src/gtkdialogs.c:62
+msgid "win32 port"
+msgstr "Win32 移植"
+
 #: src/gtkdialogs.c:68
-msgid "developer & webmaster"
-msgstr "开发者和网管"
-
-#: src/gtkdialogs.c:69
-msgid "win32 port"
-msgstr "Win32 移植"
-
-#: src/gtkdialogs.c:75
 msgid "support"
 msgstr "支持"
 
-#: src/gtkdialogs.c:93 src/gtkdialogs.c:96
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/gtkdialogs.c:94
+#: src/gtkdialogs.c:88
 msgid "libfaim maintainer"
 msgstr "libfaim 维护者"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:91
 msgid "Jabber developer"
 msgstr "Jabber 开发者"
 
-#: src/gtkdialogs.c:98
+#: src/gtkdialogs.c:92
 msgid "original author"
 msgstr "原作者"
 
-#: src/gtkdialogs.c:99
+#: src/gtkdialogs.c:93
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:105 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:148 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:102
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:104
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:105
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:106
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:110
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:111
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:112
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:120 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:115
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:116
 #, fuzzy
 msgid "Georgian"
 msgstr "德语"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:118
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "荷兰语"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:119
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:120
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:123
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:130
+#: src/gtkdialogs.c:124
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:125
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:135
+#: src/gtkdialogs.c:129
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:162
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:131
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:131
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:138 src/gtkdialogs.c:163
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/gtkdialogs.c:139 src/gtkdialogs.c:140 src/gtkdialogs.c:164
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:146
+#: src/gtkdialogs.c:140
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:161
+#: src/gtkdialogs.c:155
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:205
+#: src/gtkdialogs.c:199
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:229
+#: src/gtkdialogs.c:223
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3155,130 +3082,107 @@
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 GTK+ 写"
 "成,并以 GNU GPL 许可协议发行。<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: src/gtkdialogs.c:232
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
 
+#: src/gtkdialogs.c:235
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
+
 #: src/gtkdialogs.c:241
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
-
-#: src/gtkdialogs.c:247
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:262
+#: src/gtkdialogs.c:256
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:277
+#: src/gtkdialogs.c:271
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:292
+#: src/gtkdialogs.c:286
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:312
+#: src/gtkdialogs.c:306
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:330
+#: src/gtkdialogs.c:324
 msgid "Debugging Information"
 msgstr "调试信息"
 
-#: src/gtkdialogs.c:498 src/gtkdialogs.c:641 src/gtkdialogs.c:696
+#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
 msgid "_Name"
 msgstr "名称(_N)"
 
-#: src/gtkdialogs.c:503 src/gtkdialogs.c:646 src/gtkdialogs.c:701
+#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:511
+#: src/gtkdialogs.c:499
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:513
+#: src/gtkdialogs.c:501
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:654
+#: src/gtkdialogs.c:642
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:656
+#: src/gtkdialogs.c:644
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:710
-msgid "Get User Log"
+#: src/gtkdialogs.c:698
+#, fuzzy
+msgid "View User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:712
+#: src/gtkdialogs.c:700
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:752
-msgid "Warn User"
-msgstr "警告用户"
-
-#: src/gtkdialogs.c:773
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
-"\n"
-"这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
-
-#: src/gtkdialogs.c:782
-msgid "Warn _anonymously?"
-msgstr "匿名警告吗(_A)?"
-
-#: src/gtkdialogs.c:789
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>匿名警告较不容易引起注意。</b>"
-
-#: src/gtkdialogs.c:810
+#: src/gtkdialogs.c:719
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:811
+#: src/gtkdialogs.c:720
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:813 src/gtkdialogs.c:835 src/gtkdialogs.c:855
+#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
 #: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:831
+#: src/gtkdialogs.c:740
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:833
+#: src/gtkdialogs.c:742
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:852
+#: src/gtkdialogs.c:761
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:853
+#: src/gtkdialogs.c:762
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:890
+#: src/gtkdialogs.c:799
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3290,35 +3194,35 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:957
+#: src/gtkdialogs.c:866
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:960 src/gtkdialogs.c:961
+#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:999
+#: src/gtkdialogs.c:908
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:1002 src/gtkdialogs.c:1003
+#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:1041
+#: src/gtkdialogs.c:950
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:1044 src/gtkdialogs.c:1045
+#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
 msgid "Remove Chat"
 msgstr "删除聊天"
 
@@ -3327,15 +3231,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:162 src/gtkft.c:1000
+#: src/gtkft.c:162 src/gtkft.c:1046
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:165 src/gtkft.c:951
+#: src/gtkft.c:165 src/gtkft.c:997
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:168 src/gtkft.c:870
+#: src/gtkft.c:168 src/gtkft.c:916
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
@@ -3355,82 +3259,97 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>发送为:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:441
+#: src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:470
+#, fuzzy, c-format
+msgid "Error launching %s: %s"
+msgstr "调用 <b>%s</b> 出错: %s"
+
+#: src/gtkft.c:479
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "读取 %s 出错"
+
+#: src/gtkft.c:480
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: src/gtkft.c:575
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:582
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:589
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:554
+#: src/gtkft.c:596
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:585
+#: src/gtkft.c:627
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:628
 msgid "Local File:"
 msgstr "本地文件:"
 
-#: src/gtkft.c:587
+#: src/gtkft.c:629
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:630
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:631
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:590
+#: src/gtkft.c:632
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:676
+#: src/gtkft.c:718
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:686
+#: src/gtkft.c:728
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:695
+#: src/gtkft.c:737
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:696
+#: src/gtkft.c:738
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:733 src/gtkstock.c:105
+#: src/gtkft.c:775 src/gtkstock.c:106
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:743
+#: src/gtkft.c:785
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:953
+#: src/gtkft.c:999
 msgid "Failed"
 msgstr "已失败"
 
@@ -3442,150 +3361,181 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gtkimhtml.c:793
+#: src/gtkimhtml.c:816
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1235
+#: src/gtkimhtml.c:1263
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1236
+#: src/gtkimhtml.c:1264
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1239
+#: src/gtkimhtml.c:1267
 msgid "Hyperlink prelight color"
 msgstr "超级链接悬停颜色"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1268
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "绘制超级链接悬停时的颜色。"
 
-#: src/gtkimhtml.c:1458
+#: src/gtkimhtml.c:1486
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1470
+#: src/gtkimhtml.c:1498
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1480
+#: src/gtkimhtml.c:1508
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:3120
-msgid ""
-"Unable to guess the image type based on the file extension supplied.  "
+#: src/gtkimhtml.c:3182
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#: src/gtkimhtml.c:3185
+msgid ""
+"Unrecognized file type\n"
+"\n"
 "Defaulting to PNG."
-msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
-
-#: src/gtkimhtml.c:3128
-#, c-format
-msgid "Error saving image: %s"
+msgstr ""
+
+#: src/gtkimhtml.c:3198
+#, fuzzy, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3201
+#, fuzzy, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:3205 src/gtkimhtml.c:3217
+#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:3245
+#: src/gtkimhtml.c:3321
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:180
+#: src/gtkimhtmltoolbar.c:141
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:259
+#: src/gtkimhtmltoolbar.c:220
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:337
+#: src/gtkimhtmltoolbar.c:299
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:421
+#: src/gtkimhtmltoolbar.c:388
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:429
+#: src/gtkimhtmltoolbar.c:396
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:432
+#: src/gtkimhtmltoolbar.c:399
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:436
+#: src/gtkimhtmltoolbar.c:403
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:441
+#: src/gtkimhtmltoolbar.c:408
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:445
+#: src/gtkimhtmltoolbar.c:412
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:514
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:540 src/gtkimhtmltoolbar.c:550
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:748
+#: src/gtkimhtmltoolbar.c:715
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:762
+#: src/gtkimhtmltoolbar.c:729
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:940
+#: src/gtkimhtmltoolbar.c:917
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:951
+#: src/gtkimhtmltoolbar.c:928
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:939
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:978
+#: src/gtkimhtmltoolbar.c:955
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:990
+#: src/gtkimhtmltoolbar.c:967
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:1007
+#: src/gtkimhtmltoolbar.c:984
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:1019
+#: src/gtkimhtmltoolbar.c:996
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:1046
+#: src/gtkimhtmltoolbar.c:1008
+msgid "Background color"
+msgstr "背景颜色"
+
+#: src/gtkimhtmltoolbar.c:1024
+#, fuzzy
+msgid "Clear formatting"
+msgstr "清除格式(_C)"
+
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1056
+#: src/gtkimhtmltoolbar.c:1049
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1067
+#: src/gtkimhtmltoolbar.c:1060
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3599,7 +3549,7 @@
 msgid "Conversation with %s on %s"
 msgstr "与 %s 在 %s 的对话"
 
-#: src/gtklog.c:396
+#: src/gtklog.c:397
 msgid ""
 "System events will only be logged if the <span style=\"italic\">Enable "
 "system log preference</span> is set."
@@ -3607,44 +3557,44 @@
 "仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日"
 "志。"
 
-#: src/gtklog.c:400
+#: src/gtklog.c:401
 msgid ""
 "Instant messages will only be logged if the <span style=\"italic\">Log all "
 "instant messages</span> preference is enabled."
 msgstr ""
 "仅当选择了<span style=\"italic\">记录所有即时消息</span>时才会记录即时消息。"
 
-#: src/gtklog.c:403
+#: src/gtklog.c:404
 msgid ""
 "Chats will only be logged if the <span style=\"italic\">Log all chats "
 "preference</span> is enabled."
 msgstr ""
 "仅当选择了<span style=\"italic\">记录所有聊天</span>首选项时才会记录聊天。"
 
-#: src/gtklog.c:408
+#: src/gtklog.c:409
 msgid "No logs were found."
 msgstr "未找到日志。"
 
-#: src/gtklog.c:454
+#: src/gtklog.c:455
 #, c-format
 msgid "Conversations in %s"
 msgstr "与 %s 的对话"
 
-#: src/gtklog.c:462 src/gtklog.c:512
+#: src/gtklog.c:463 src/gtklog.c:513
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/gtklog.c:537
+#: src/gtklog.c:538
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/gtkmain.c:319
+#: src/gtkmain.c:323
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/gtkmain.c:321
+#: src/gtkmain.c:325
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3886,226 +3836,213 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:679
+#: src/gtkprefs.c:685
 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:719
+#: src/gtkprefs.c:725
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:726 src/gtkprefs.c:2057 src/protocols/jabber/buddy.c:266
+#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
 #: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:823
-msgid "Display"
-msgstr "显示"
-
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:832
+msgid "Buddy List Sorting"
+msgstr "好友列表排序"
+
+#: src/gtkprefs.c:841
+msgid "_Sorting:"
+msgstr "排序(_S):"
+
+#: src/gtkprefs.c:846
+msgid "Buddy Display"
+msgstr "好友显示"
+
+#: src/gtkprefs.c:847
+msgid "Show more buddy details"
+msgstr "显示好友的更多细节"
+
+#: src/gtkprefs.c:885
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "将未知的斜线命令发送为消息(_S)"
+
+#: src/gtkprefs.c:887
+#, fuzzy
+msgid "Show _formatting on incoming messages"
+msgstr "显示格式工具栏(_F)"
+
+#: src/gtkprefs.c:889
+msgid "Show buddy _icons"
+msgstr "显示好友图标(_I)"
+
+#: src/gtkprefs.c:891
+msgid "Enable buddy ic_on animation"
+msgstr "启用好友图标动画(_O)"
+
+#: src/gtkprefs.c:893
+msgid "_Notify buddies that you are typing to them"
+msgstr "提醒好友您正在打字给他们(_N)"
+
+#: src/gtkprefs.c:896
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:829
-msgid "Ignore _formatting"
-msgstr "忽略格式(_F)"
-
-#: src/gtkprefs.c:832
-msgid "Default Formatting"
-msgstr "默认格式"
-
-#: src/gtkprefs.c:834
-msgid "_Send default formatting with outgoing messages"
-msgstr "送出信息使用默认格式(_S)"
-
-#: src/gtkprefs.c:844
+#: src/gtkprefs.c:914
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:847
-msgid "_Clear Formatting"
-msgstr "清除格式(_C)"
-
-#: src/gtkprefs.c:889
-msgid "Buddy List Sorting"
-msgstr "好友列表排序"
-
-#: src/gtkprefs.c:898
-msgid "_Sorting:"
-msgstr "排序(_S):"
-
-#: src/gtkprefs.c:903
-msgid "Buddy Display"
-msgstr "好友显示"
-
-#: src/gtkprefs.c:904
-msgid "Show more buddy details"
-msgstr "显示好友的更多细节"
-
-#: src/gtkprefs.c:939
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "将未知的斜线命令发送为消息(_S)"
-
-#: src/gtkprefs.c:942
-msgid "Show buddy _icons"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkprefs.c:944
-msgid "Enable buddy ic_on animation"
-msgstr "启用好友图标动画(_O)"
-
-#: src/gtkprefs.c:946
-msgid "_Notify buddies that you are typing to them"
-msgstr "提醒好友您正在打字给他们(_N)"
-
 #. All the tab options!
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:935
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:937
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:951
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:969
-msgid "Tab p_lacement:"
-msgstr "标签位置(_L):"
-
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:957
+#, fuzzy
+msgid "_Placement:"
+msgstr "扩展放置"
+
+#: src/gtkprefs.c:959
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:960
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:961
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:974
+#: src/gtkprefs.c:962
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:980
-msgid "New conversation _placement:"
-msgstr "新对话放置(_P):"
-
-#: src/gtkprefs.c:1033 src/protocols/oscar/oscar.c:763
-#: src/protocols/oscar/oscar.c:5180
+#: src/gtkprefs.c:966
+#, fuzzy
+msgid "N_ew conversations:"
+msgstr "关闭对话"
+
+#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
+#: src/protocols/oscar/oscar.c:5310
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1019
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1028
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1052
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1071
+#: src/gtkprefs.c:1055
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1074
+#: src/gtkprefs.c:1058
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1081
+#: src/gtkprefs.c:1065
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1088
+#: src/gtkprefs.c:1072
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1092
+#: src/gtkprefs.c:1076
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1154
+#: src/gtkprefs.c:1138
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1194
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1195
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1212
+#: src/gtkprefs.c:1196
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1213
+#: src/gtkprefs.c:1197
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1198
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1199
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1200
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1201
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1202
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1211
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1264
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1284
+#: src/gtkprefs.c:1268
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1291
+#: src/gtkprefs.c:1275
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1277
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1278
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1296
+#: src/gtkprefs.c:1280
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4114,75 +4051,75 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1349
+#: src/gtkprefs.c:1333
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1336
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1339
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1341
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1344
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1346
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1349
 msgid "Log when buddies log in/log _out"
 msgstr "记录好友的登入/登出(_O)"
 
-#: src/gtkprefs.c:1371
+#: src/gtkprefs.c:1355
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1361
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1367
 msgid "Log your own _signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_S)"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1504
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1574
+#: src/gtkprefs.c:1558
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1575
+#: src/gtkprefs.c:1559
 msgid "_Method:"
 msgstr "方式(_M):"
 
+#: src/gtkprefs.c:1561
+msgid "Console beep"
+msgstr "控制台响铃"
+
+#: src/gtkprefs.c:1563
+msgid "Automatic"
+msgstr "自动"
+
+#: src/gtkprefs.c:1568
+msgid "Command"
+msgstr "命令"
+
+#: src/gtkprefs.c:1569
+msgid "No sounds"
+msgstr "无声音"
+
 #: src/gtkprefs.c:1577
-msgid "Console beep"
-msgstr "控制台响铃"
-
-#: src/gtkprefs.c:1579
-msgid "Automatic"
-msgstr "自动"
-
-#: src/gtkprefs.c:1586
-msgid "Command"
-msgstr "命令"
-
-#: src/gtkprefs.c:1587
-msgid "No sounds"
-msgstr "无声音"
-
-#: src/gtkprefs.c:1595
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4191,102 +4128,98 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1604
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1605
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1625
+#: src/gtkprefs.c:1607
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1617
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1686
+#: src/gtkprefs.c:1668
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1693
+#: src/gtkprefs.c:1675
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1712
+#: src/gtkprefs.c:1694
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1716
+#: src/gtkprefs.c:1698
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1720
+#: src/gtkprefs.c:1702
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1776
+#: src/gtkprefs.c:1758
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1779
+#: src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1781
-msgid "Never"
-msgstr "从不"
-
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1764
 msgid "When away"
 msgstr "离开时"
 
-#: src/gtkprefs.c:1783
+#: src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "离开和瞌睡时"
 
-#: src/gtkprefs.c:1786 src/protocols/msn/msn.c:505
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2817
-#: src/protocols/oscar/oscar.c:4310 src/protocols/yahoo/yahoo.c:2537
+#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
+#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
 #: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1787
+#: src/gtkprefs.c:1769
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1790
+#: src/gtkprefs.c:1772
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1775
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1795
+#: src/gtkprefs.c:1777
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1785
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1804
+#: src/gtkprefs.c:1786
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:1790
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1816
+#: src/gtkprefs.c:1798
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1874
+#: src/gtkprefs.c:1856
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4301,7 +4234,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1879
+#: src/gtkprefs.c:1861
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4316,131 +4249,127 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:1996
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2027
+#: src/gtkprefs.c:2010
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2075
+#: src/gtkprefs.c:2058
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2118
-msgid "Message Text"
-msgstr "消息文本"
-
-#: src/gtkprefs.c:2119
+#: src/gtkprefs.c:2101
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2120
+#: src/gtkprefs.c:2102
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2121 src/protocols/silc/silc.c:1599
+#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2126
+#: src/gtkprefs.c:2108
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2129
+#: src/gtkprefs.c:2111
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2130
+#: src/gtkprefs.c:2112
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2133
+#: src/gtkprefs.c:2115
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/gtkprivacy.c:79
-msgid "Allow only the users on my buddy list"
-msgstr "只允许我的好友"
-
 #: src/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "只允许我的好友"
+
+#: src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/gtkprivacy.c:81
-msgid "Block all users"
-msgstr "屏蔽全部用户"
-
 #: src/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "屏蔽全部用户"
+
+#: src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:392
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:405
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:417
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:583 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:585
+#: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:588 src/gtkprivacy.c:601
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:622 src/gtkprivacy.c:635
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:624
+#: src/gtkprivacy.c:630
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:633
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4448,19 +4377,19 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1073
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1073
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "No"
 msgstr "否"
 
@@ -4473,19 +4402,19 @@
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1707
+#: src/gtkrequest.c:1764
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1708
+#: src/gtkrequest.c:1765
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1750 src/gtkrequest.c:1791
+#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1751 src/gtkrequest.c:1792
+#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4507,21 +4436,17 @@
 msgid "Type"
 msgstr "类型"
 
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:317
-#: src/protocols/gg/gg.c:323 src/protocols/gg/gg.c:329
-#: src/protocols/gg/gg.c:335 src/protocols/gg/gg.c:341
-#: src/protocols/gg/gg.c:347 src/protocols/gg/gg.c:353
-#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:975
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:987
-#: src/protocols/jabber/jabber.c:993 src/protocols/jabber/jabber.c:999
-#: src/protocols/jabber/jabber.c:1005 src/protocols/jabber/jabber.c:1011
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6893
-#: src/protocols/oscar/oscar.c:6900 src/protocols/rendezvous/rendezvous.c:669
-#: src/protocols/rendezvous/rendezvous.c:672
-#: src/protocols/sametime/sametime.c:2712
-#: src/protocols/sametime/sametime.c:2718
-#: src/protocols/sametime/sametime.c:2724 src/protocols/yahoo/yahoo.c:3025
-#: src/protocols/yahoo/yahoo.c:3059 src/protocols/zephyr/zephyr.c:2272
+#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
+#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
+#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
+#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
+#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
+#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "消息"
 
@@ -4539,10 +4464,10 @@
 
 #: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
 #: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:954 src/protocols/msn/msn.c:503
-#: src/protocols/novell/novell.c:2830 src/protocols/novell/novell.c:2834
-#: src/protocols/oscar/oscar.c:745 src/protocols/oscar/oscar.c:751
-#: src/protocols/oscar/oscar.c:753 src/protocols/yahoo/yahoo.c:2660
+#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
+#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
+#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
+#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
 msgid "Status"
 msgstr "状态"
 
@@ -4563,58 +4488,58 @@
 msgid "Use a different status for some accounts"
 msgstr "为某些账户使用不同的状态"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:60
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:61
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:62
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:63
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:64
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:65
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:66
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:67
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:68
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:76
+#: src/gtksound.c:71
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:282
+#: src/gtksound.c:257
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:298
+#: src/gtksound.c:273
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:310
+#: src/gtksound.c:285
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4626,44 +4551,40 @@
 msgstr "正打字"
 
 #. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:261
-#: src/protocols/jabber/jabber.c:805 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1816 src/protocols/rendezvous/rendezvous.c:699
-#: src/protocols/trepia/trepia.c:1069 src/protocols/yahoo/yahoo.c:2357
-#: src/protocols/zephyr/zephyr.c:1540
+#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
+#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
+#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
+#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "正连接"
 
 #. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:51 src/protocols/irc/irc.c:175
-#: src/protocols/jabber/jabber.c:986 src/protocols/msn/msn.c:536
+#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
 #: 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:2808 src/protocols/novell/novell.c:2946
-#: src/protocols/novell/novell.c:3035 src/protocols/oscar/oscar.c:785
-#: src/protocols/oscar/oscar.c:6892 src/protocols/rendezvous/rendezvous.c:654
-#: src/protocols/rendezvous/rendezvous.c:669 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3019 src/status.c:157
+#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2948
+#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
+#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
 msgid "Available"
 msgstr "可用"
 
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:55
-#: src/protocols/oscar/oscar.c:693 src/protocols/oscar/oscar.c:6906
-#: src/protocols/yahoo/yahoo.c:2535 src/protocols/yahoo/yahoo.c:3063
+#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
 msgid "Invisible"
 msgstr "隐身"
 
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:307
-#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1081
-#: src/protocols/jabber/jabber.c:975 src/protocols/msn/msn.c:528
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2820
-#: src/protocols/novell/novell.c:2939 src/protocols/oscar/oscar.c:753
-#: src/protocols/oscar/oscar.c:6742 src/protocols/oscar/oscar.c:6882
-#: src/protocols/rendezvous/rendezvous.c:666
-#: src/protocols/sametime/sametime.c:2704 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2539 src/protocols/yahoo/yahoo.c:3013
-#: src/status.c:155
+#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
+#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
+#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
 msgid "Offline"
 msgstr "离线"
 
@@ -4672,81 +4593,82 @@
 msgid "New Status"
 msgstr "新建状态"
 
-#: src/gtkstock.c:100
+#: src/gtkstock.c:101
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkstock.c:102
+#: src/gtkstock.c:103
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#: src/gtkstock.c:103
+#: src/gtkstock.c:104
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/gtkstock.c:104
+#: src/gtkstock.c:105
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/gtkstock.c:106
+#: src/gtkstock.c:107
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: src/gtkutils.c:1386 src/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "装入 %s 时发生了下列错误: %s。"
 
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#: src/gtkutils.c:1388 src/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "装入图像失败"
 
-#: src/gtkutils.c:1483
+#: src/gtkutils.c:1488
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "无法发送文件夹 %s。"
 
-#: src/gtkutils.c:1485
+#: src/gtkutils.c:1490
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
 
-#: src/gtkutils.c:1513 src/gtkutils.c:1522 src/gtkutils.c:1527
+#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
 msgid "You have dragged an image"
 msgstr "您拖曳了图像"
 
-#: src/gtkutils.c:1514
+#: src/gtkutils.c:1519
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
-#: src/gtkutils.c:1518 src/gtkutils.c:1533
+#: src/gtkutils.c:1523 src/gtkutils.c:1538
 msgid "Set as buddy icon"
 msgstr "设置为好友头像"
 
-#: src/gtkutils.c:1519 src/gtkutils.c:1534
+#: src/gtkutils.c:1524 src/gtkutils.c:1539
 msgid "Send image file"
 msgstr "发送图像文件"
 
-#: src/gtkutils.c:1520 src/gtkutils.c:1534
+#: src/gtkutils.c:1525 src/gtkutils.c:1539
 msgid "Insert in message"
 msgstr "在消息中插入"
 
-#: src/gtkutils.c:1523
+#: src/gtkutils.c:1528
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您是否想要将其设置为此用户的头像?"
 
-#: src/gtkutils.c:1528
+#: src/gtkutils.c:1533
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图标。"
-
-#: src/gtkutils.c:1530
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
+"标。"
+
+#: src/gtkutils.c:1535
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4757,11 +4679,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1584
+#: src/gtkutils.c:1589
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-#: src/gtkutils.c:1584
+#: src/gtkutils.c:1589
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4769,15 +4691,15 @@
 "您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
 "非启动器自身。"
 
-#: src/log.c:104
+#: src/log.c:105
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:538
+#: src/log.c:746
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:600
+#: src/log.c:811
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4786,7 +4708,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:602
+#: src/log.c:813
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4795,25 +4717,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:653 src/log.c:783
+#: src/log.c:864 src/log.c:995
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:663 src/log.c:795
+#: src/log.c:874 src/log.c:1007
 #, 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:667
+#: src/log.c:878
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:728
+#: src/log.c:940
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:799
+#: src/log.c:1011
 msgid "Plain text"
 msgstr "纯文本"
 
@@ -4837,64 +4759,64 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:52
+#: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "只对好友可用"
 
-#: src/protocols/gg/gg.c:54
+#: src/protocols/gg/gg.c:53
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:56
+#: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:57 src/status.c:158
+#: src/protocols/gg/gg.c:56 src/status.c:157
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/protocols/gg/gg.c:152
+#: src/protocols/gg/gg.c:151
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:155 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:158 src/protocols/jabber/auth.c:133
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
 #: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
 #: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
 #: src/protocols/jabber/jabber.c:109
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:161
+#: src/protocols/gg/gg.c:160
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:164
+#: src/protocols/gg/gg.c:163
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:167
+#: src/protocols/gg/gg.c:166
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:170
+#: src/protocols/gg/gg.c:169
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:272 src/protocols/oscar/oscar.c:4109
+#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
 #, 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:273 src/protocols/gg/gg.c:1135
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4113
-#: src/protocols/oscar/oscar.c:4339 src/protocols/silc/ops.c:1088
+#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
+#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
 #: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:724 src/protocols/zephyr/zephyr.c:1139
+#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
 msgid "Buddy Information"
 msgstr "好友信息"
 
@@ -4912,173 +4834,172 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:311 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/jabber.c:980
-#: src/protocols/msn/msn.c:532 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2943 src/protocols/oscar/oscar.c:695
-#: src/protocols/oscar/oscar.c:6887 src/protocols/sametime/sametime.c:2708
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2541
-#: src/protocols/yahoo/yahoo.c:3016 src/protocols/zephyr/zephyr.c:2264
-#: src/status.c:156
+#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
+#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
+#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/gg/gg.c:366
+#: src/protocols/gg/gg.c:365
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:519
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:527
+#: src/protocols/gg/gg.c:526
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:819 src/protocols/napster/napster.c:502
+#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
 #: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2127 src/protocols/yahoo/yahoo.c:2154
-#: src/protocols/yahoo/yahoo.c:2217 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
 #: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:834
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:838
+#: src/protocols/gg/gg.c:837
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:841
+#: src/protocols/gg/gg.c:840
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:843
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:853
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:872 src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
 #: src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:922
+#: src/protocols/gg/gg.c:921
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:934
+#: src/protocols/gg/gg.c:933
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:939
+#: src/protocols/gg/gg.c:938
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:942
+#: src/protocols/gg/gg.c:941
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:988
+#: src/protocols/gg/gg.c:987
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:1041
+#: src/protocols/gg/gg.c:1040
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:1046
+#: src/protocols/gg/gg.c:1045
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1072 src/protocols/sametime/sametime.c:2711
+#: src/protocols/gg/gg.c:1071
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1077 src/protocols/oscar/oscar.c:5172
+#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1081 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:5183 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1086 src/protocols/jabber/jabber.c:631
-#: src/protocols/oscar/oscar.c:5184 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
+#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1090 src/protocols/gg/gg.c:1835
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5173
+#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
+#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1097 src/protocols/gg/gg.c:1100
+#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1106 src/protocols/gg/gg.c:1108
-#: src/protocols/gg/gg.c:1110
+#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
+#: src/protocols/gg/gg.c:1109
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1114 src/protocols/jabber/jabber.c:641
-#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5235
+#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
+#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1157
+#: src/protocols/gg/gg.c:1156
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1165
+#: src/protocols/gg/gg.c:1164
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1226
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1235
+#: src/protocols/gg/gg.c:1234
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1243
+#: src/protocols/gg/gg.c:1242
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1250
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1259
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1267
+#: src/protocols/gg/gg.c:1266
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
+#: src/protocols/gg/gg.c:1385
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "与 Gadu-Gadu 服务器通讯出错"
+
 #: src/protocols/gg/gg.c:1386
-msgid "Error communicating with Gadu-Gadu server"
-msgstr "与 Gadu-Gadu 服务器通讯出错"
-
-#: src/protocols/gg/gg.c:1387
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5086,77 +5007,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1415
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1417
+#: src/protocols/gg/gg.c:1416
 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:1490
+#: src/protocols/gg/gg.c:1489
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1491 src/protocols/gg/gg.c:1514
+#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1513
+#: src/protocols/gg/gg.c:1512
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
+#: src/protocols/gg/gg.c:1563
+msgid "Unable to access directory"
+msgstr "无法访问目录"
+
 #: src/protocols/gg/gg.c:1564
-msgid "Unable to access directory"
-msgstr "无法访问目录"
-
-#: src/protocols/gg/gg.c:1565
 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:1599
+#: src/protocols/gg/gg.c:1598
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1600
+#: src/protocols/gg/gg.c:1599
 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:1616
+#: src/protocols/gg/gg.c:1615
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1621 src/protocols/jabber/jabber.c:1115
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
+#: src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1625
+#: src/protocols/gg/gg.c:1624
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1629
+#: src/protocols/gg/gg.c:1628
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1633
+#: src/protocols/gg/gg.c:1632
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1666
+#: src/protocols/gg/gg.c:1665
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1667
+#: src/protocols/gg/gg.c:1666
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5173,7 +5094,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1814 src/protocols/gg/gg.c:1816
+#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -5203,81 +5124,90 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 无法打开监听端口。"
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:82
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:527
-#: src/protocols/irc/irc.c:549
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:552
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
-#: src/protocols/irc/irc.c:191
+#: src/protocols/irc/irc.c:192
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:203 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:209 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:241
+#: src/protocols/irc/irc.c:242
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:269 src/protocols/jabber/jabber.c:408
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
+#: src/protocols/jabber/jabber.c:745
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/irc/irc.c:280
+#: src/protocols/irc/irc.c:281
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:351 src/protocols/jabber/jabber.c:303
-#: src/protocols/oscar/oscar.c:1735 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
+#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:330
+#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/irc/irc.c:379 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:524 src/protocols/irc/irc.c:546
+#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
 #: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:685 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1400
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:688 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1391
+#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
 msgid "Topic"
 msgstr "话题"
 
+#: src/protocols/irc/irc.c:738
+msgid "IRC"
+msgstr ""
+
+#: src/protocols/irc/irc.c:742
+#, fuzzy
+msgid "Quit message"
+msgstr "(1 条消息)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5286,43 +5216,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:795
+#: src/protocols/irc/irc.c:828
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:796
+#: src/protocols/irc/irc.c:829
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:815 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1611 src/protocols/napster/napster.c:709
+#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
+#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:818 src/protocols/jabber/jabber.c:1635
-#: src/protocols/msn/msn.c:1924 src/protocols/napster/napster.c:714
-#: src/protocols/silc/silc.c:1607 src/protocols/trepia/trepia.c:1305
+#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
+#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
+#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:821
+#: src/protocols/irc/irc.c:854
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:824 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:601 src/protocols/silc/buddy.c:1478
+#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
+#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:827
+#: src/protocols/irc/irc.c:860
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:830
+#: src/protocols/irc/irc.c:863
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -5366,7 +5296,7 @@
 msgstr "<b>%s:</b> %s<br>"
 
 #: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Realname"
 msgstr "真名"
 
@@ -5601,7 +5531,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1463
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
@@ -5693,7 +5623,7 @@
 msgstr "CTCP PING 响应"
 
 #: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1632 src/protocols/toc/toc.c:190
+#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
 #: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
@@ -5747,14 +5677,14 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:621 src/protocols/msn/msn.c:1346
+#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
 #: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
 msgid "URL"
 msgstr "URL"
 
@@ -5775,7 +5705,7 @@
 msgstr "区域"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:653
 msgid "Postal Code"
 msgstr "邮政编码"
 
@@ -5792,7 +5722,7 @@
 
 #: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
 #: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:997
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Email"
 msgstr "电子邮件"
 
@@ -5809,7 +5739,7 @@
 msgstr "职务"
 
 #: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5208
+#: src/protocols/oscar/oscar.c:5338
 msgid "Birthday"
 msgstr "生日"
 
@@ -5827,7 +5757,7 @@
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1614
+#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
 msgid "Resource"
 msgstr "资源"
 
@@ -5835,8 +5765,8 @@
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:636
-#: src/protocols/oscar/oscar.c:5226 src/protocols/oscar/oscar.c:5234
+#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
+#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
@@ -5845,65 +5775,64 @@
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:822
+#: src/protocols/jabber/buddy.c:824
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:822
+#: src/protocols/jabber/buddy.c:824
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:847
+#: src/protocols/jabber/buddy.c:849
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1029
+#: src/protocols/jabber/buddy.c:1031
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1034
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1039
+#: src/protocols/jabber/buddy.c:1041
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1045
+#: src/protocols/jabber/buddy.c:1047
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1053
+#: src/protocols/jabber/buddy.c:1055
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:992
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1089 src/protocols/jabber/jabber.c:1004
-#: src/status.c:161
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
+#: src/status.c:160
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1010
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6926
-#: src/protocols/sametime/sametime.c:2723
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
+#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6461
-#: src/protocols/yahoo/yahoochat.c:984
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
+#: src/protocols/yahoo/yahoochat.c:995
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -5991,398 +5920,399 @@
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:212 src/protocols/trepia/trepia.c:248
+#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
 #: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
 #: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
 #: src/protocols/trepia/trepia.c:1181
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:250 src/protocols/jabber/jabber.c:270
+#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:377 src/protocols/jabber/jabber.c:713
+#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:418 src/protocols/jabber/jabber.c:753
+#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
 #: src/protocols/trepia/trepia.c:1075
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:446
+#: src/protocols/jabber/jabber.c:448
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
+#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:458
+#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:569 src/protocols/jabber/jabber.c:570
+#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:605 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:616
+#: src/protocols/jabber/jabber.c:618
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:646 src/protocols/oscar/oscar.c:5228
-#: src/protocols/oscar/oscar.c:5236 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:656 src/protocols/silc/ops.c:855
+#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
 #: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:666
+#: src/protocols/jabber/jabber.c:668
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:674
+#: src/protocols/jabber/jabber.c:676
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:677 src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:809
+#: src/protocols/jabber/jabber.c:811
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:815 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:824
+#: src/protocols/jabber/jabber.c:826
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:895 src/protocols/jabber/jabber.c:1212
-#: src/protocols/jabber/jabber.c:1253 src/protocols/jabber/jabber.c:1286
-#: src/protocols/oscar/oscar.c:751 src/protocols/oscar/oscar.c:6740
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
+#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:928
-msgid "Both"
-msgstr "双向"
-
 #: src/protocols/jabber/jabber.c:930
+msgid "Both"
+msgstr "双向"
+
+#: src/protocols/jabber/jabber.c:932
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:932
+#: src/protocols/jabber/jabber.c:934
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:935
+#: src/protocols/jabber/jabber.c:937
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:939
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:941
+#: src/protocols/jabber/jabber.c:943
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:980 src/protocols/jabber/jabber.c:986
-#: src/protocols/jabber/jabber.c:992 src/protocols/jabber/jabber.c:998
-#: src/protocols/jabber/jabber.c:1004 src/protocols/jabber/jabber.c:1010
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
 msgid "Priority"
 msgstr "优先级"
 
-#: src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1034
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1033
+#: src/protocols/jabber/jabber.c:1035
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1037 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1096
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1099 src/protocols/jabber/jabber.c:1100
+#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1100
+#: src/protocols/jabber/jabber.c:1102
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1110 src/protocols/toc/toc.c:1657
+#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1192
+#: src/protocols/jabber/jabber.c:1194
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1194
-msgid "Conflict"
-msgstr "冲突"
-
 #: src/protocols/jabber/jabber.c:1196
-msgid "Feature Not Implemented"
-msgstr "特性未实现"
+msgid "Conflict"
+msgstr "冲突"
 
 #: src/protocols/jabber/jabber.c:1198
+msgid "Feature Not Implemented"
+msgstr "特性未实现"
+
+#: src/protocols/jabber/jabber.c:1200
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1202
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1206
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1208
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1208
-msgid "Not Acceptable"
-msgstr "不可接受"
-
 #: src/protocols/jabber/jabber.c:1210
+msgid "Not Acceptable"
+msgstr "不可接受"
+
+#: src/protocols/jabber/jabber.c:1212
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1214
-msgid "Payment Required"
-msgstr "需要付费"
-
 #: src/protocols/jabber/jabber.c:1216
+msgid "Payment Required"
+msgstr "需要付费"
+
+#: src/protocols/jabber/jabber.c:1218
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1222
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1224
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1226
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1228
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1230
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1230
-msgid "Subscription Required"
-msgstr "需要订阅"
-
 #: src/protocols/jabber/jabber.c:1232
+msgid "Subscription Required"
+msgstr "需要订阅"
+
+#: src/protocols/jabber/jabber.c:1234
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1239
-msgid "Authorization Aborted"
-msgstr "认证被中断"
-
 #: src/protocols/jabber/jabber.c:1241
+msgid "Authorization Aborted"
+msgstr "认证被中断"
+
+#: src/protocols/jabber/jabber.c:1243
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1246
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1249
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1252
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1257
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1259
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1261
-msgid "Bad Format"
-msgstr "格式无效"
-
 #: src/protocols/jabber/jabber.c:1263
+msgid "Bad Format"
+msgstr "格式无效"
+
+#: src/protocols/jabber/jabber.c:1265
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1268
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1268 src/protocols/silc/ops.c:1518
+#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1272
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1274
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1276
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1280
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1282
-msgid "Invalid XML"
-msgstr "无效的 XML"
-
 #: src/protocols/jabber/jabber.c:1284
+msgid "Invalid XML"
+msgstr "无效的 XML"
+
+#: src/protocols/jabber/jabber.c:1286
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1288
-msgid "Policy Violation"
-msgstr "违背策略"
-
 #: src/protocols/jabber/jabber.c:1290
-msgid "Remote Connection Failed"
-msgstr "远程连接失败"
+msgid "Policy Violation"
+msgstr "违背策略"
 
 #: src/protocols/jabber/jabber.c:1292
+msgid "Remote Connection Failed"
+msgstr "远程连接失败"
+
+#: src/protocols/jabber/jabber.c:1294
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1296
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1298
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1300
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1302
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1302
-msgid "Unsupported Encoding"
-msgstr "不支持的编码"
-
 #: src/protocols/jabber/jabber.c:1304
+msgid "Unsupported Encoding"
+msgstr "不支持的编码"
+
+#: src/protocols/jabber/jabber.c:1306
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1306
-msgid "Unsupported Version"
-msgstr "不支持的版本"
-
 #: src/protocols/jabber/jabber.c:1308
-msgid "XML Not Well Formed"
-msgstr "XML 格式有错"
+msgid "Unsupported Version"
+msgstr "不支持的版本"
 
 #: src/protocols/jabber/jabber.c:1310
+msgid "XML Not Well Formed"
+msgstr "XML 格式有错"
+
+#: src/protocols/jabber/jabber.c:1312
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1377
+#: src/protocols/jabber/jabber.c:1379
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1429
+#: src/protocols/jabber/jabber.c:1431
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1457
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1459
+#: src/protocols/jabber/jabber.c:1461
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1470
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1473
+#: src/protocols/jabber/jabber.c:1475
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1479
+#: src/protocols/jabber/jabber.c:1481
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1485
+#: src/protocols/jabber/jabber.c:1487
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1491
-msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+#: src/protocols/jabber/jabber.c:1493
+#, fuzzy
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1497
+#: src/protocols/jabber/jabber.c:1499
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1503
+#: src/protocols/jabber/jabber.c:1505
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1508
+#: src/protocols/jabber/jabber.c:1510
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
@@ -6397,28 +6327,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1589 src/protocols/jabber/jabber.c:1591
+#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1617
+#: src/protocols/jabber/jabber.c:1618
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1622
+#: src/protocols/jabber/jabber.c:1623
 msgid "Require TLS"
 msgstr "需要 TLS"
 
-#: src/protocols/jabber/jabber.c:1625
+#: src/protocols/jabber/jabber.c:1626
 msgid "Force old (port 5223) SSL"
 msgstr "强制旧 SSL(5223 端口)"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1631
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1639 src/protocols/silc/silc.c:1603
+#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6455,49 +6385,51 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:287 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "用户 %s 想要将 %s 添加为好友。"
 
-#: src/protocols/jabber/presence.c:295 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:6391
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
+#: src/protocols/yahoo/yahoo.c:861
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:296 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6392
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
+#: src/protocols/yahoo/yahoo.c:863
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:343 src/protocols/jabber/presence.c:344
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:345
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:386
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:389
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -6575,7 +6507,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:684
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -6627,7 +6559,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:197
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -6720,7 +6652,7 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2256
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
 #: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "认证失败"
@@ -6807,8 +6739,9 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:503 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/yahoo/yahoo.c:2660
+#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/yahoo/yahoo.c:2762
 #, c-format
 msgid ""
 "\n"
@@ -6817,75 +6750,75 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:508
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:513
+#: src/protocols/msn/msn.c:511
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2517 src/protocols/yahoo/yahoo.c:3030
+#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:548 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2952
-#: src/protocols/novell/novell.c:3040 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2519
-#: src/protocols/yahoo/yahoo.c:3033
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
+#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
+#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
+#: src/protocols/yahoo/yahoo.c:3189
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:552 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2527 src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:556 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2531 src/protocols/yahoo/yahoo.c:3051
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:560 src/protocols/zephyr/zephyr.c:2267
-#: src/status.c:159
+#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:158
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:572
+#: src/protocols/msn/msn.c:570
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:577
+#: src/protocols/msn/msn.c:575
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:581
+#: src/protocols/msn/msn.c:579
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:583
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:591
+#: src/protocols/msn/msn.c:589
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:594
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:619
+#: src/protocols/msn/msn.c:617
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:628 src/protocols/novell/novell.c:3438
+#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: src/protocols/msn/msn.c:665
+#: src/protocols/msn/msn.c:663
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6893,95 +6826,95 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:693
+#: src/protocols/msn/msn.c:691
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:715 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, 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:1346 src/protocols/msn/msn.c:1693
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:789
+#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
+#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1423
+#: src/protocols/msn/msn.c:1425
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1428 src/protocols/msn/msn.c:1680
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
+#: src/protocols/yahoo/yahoo_profile.c:765
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1499 src/protocols/oscar/oscar.c:5213
+#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1506 src/protocols/oscar/oscar.c:5200
+#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1515 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1522 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1530 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1553
-#: src/protocols/msn/msn.c:1560 src/protocols/msn/msn.c:1568
-#: src/protocols/msn/msn.c:1575
+#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
+#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1577
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1584 src/protocols/msn/msn.c:1590
-#: src/protocols/msn/msn.c:1597 src/protocols/msn/msn.c:1604
+#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
+#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1613 src/protocols/msn/msn.c:1619
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1628
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1635 src/protocols/msn/msn.c:1641
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
+#: src/protocols/yahoo/yahoo_profile.c:1081
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1649 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1651
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1660 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1682
+#: src/protocols/msn/msn.c:1684
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1683
+#: src/protocols/msn/msn.c:1685
 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 "
@@ -6990,13 +6923,13 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1687
+#: src/protocols/msn/msn.c:1689
 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:1693 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -7010,20 +6943,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1898 src/protocols/msn/msn.c:1900
+#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1919 src/protocols/trepia/trepia.c:1300
+#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1928
+#: src/protocols/msn/msn.c:1929
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1339
+#: src/protocols/yahoo/yahoochat.c:1350
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -7075,7 +7008,7 @@
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1295
+#: src/protocols/msn/notification.c:1297
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7106,7 +7039,7 @@
 msgstr "读取错误"
 
 #: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4296
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -7130,7 +7063,7 @@
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
 #: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4865 src/protocols/yahoo/yahoo.c:220
+#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
@@ -7215,6 +7148,26 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
+#: src/protocols/msn/userlist.c:276
+#, fuzzy, c-format
+msgid "%s has added you to his or her contact list."
+msgstr "用户 %s 想要将 %s 添加为好友。"
+
+#: src/protocols/msn/userlist.c:340
+#, c-format
+msgid "%s has removed you from his or her contact list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:655
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "无法读取文件 %s。"
+
+#: src/protocols/msn/userlist.c:657
+#, fuzzy
+msgid "The screen name specified is invalid."
+msgstr "输入的 SecurID 密钥无效。"
+
 #: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
@@ -7271,7 +7224,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:689 src/protocols/napster/napster.c:691
+#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -7505,8 +7458,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5186
-#: src/protocols/oscar/oscar.c:5193
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
+#: src/protocols/oscar/oscar.c:5323
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -7556,11 +7509,11 @@
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1886
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1887
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7571,15 +7524,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1889
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1994
+#: src/protocols/novell/novell.c:1996
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:2050
+#: src/protocols/novell/novell.c:2052
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7589,21 +7542,22 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2148
+#: src/protocols/novell/novell.c:2150
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2170
+#: src/protocols/novell/novell.c:2172
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2474
+#: src/protocols/novell/novell.c:2476
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2955 src/protocols/novell/novell.c:3043
+#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
+#: src/protocols/yahoo/yahoo.c:2808
 msgid "Appear Offline"
 msgstr "显示为离线"
 
@@ -7617,292 +7571,296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3537 src/protocols/novell/novell.c:3539
+#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3558
+#: src/protocols/novell/novell.c:3559
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3562
+#: src/protocols/novell/novell.c:3563
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:197
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:198
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:199
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:201
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:202
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:203
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:204
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:205
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:206
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:207
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:208
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:209
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:210
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:211
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:212
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:213
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:214
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:215
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:216
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:217
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:218
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:219
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:220
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:404 src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:607
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:601
+#: src/protocols/oscar/oscar.c:610
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:604 src/protocols/silc/silc.c:668
+#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:607 src/protocols/oscar/oscar.c:7033
+#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:614
+#: src/protocols/oscar/oscar.c:623
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:626
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:620
+#: src/protocols/oscar/oscar.c:629
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:632
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:635
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:638
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:641
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:644
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:638
-msgid "Old ICQ UTF8"
-msgstr "旧的 ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:641
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-#: src/protocols/oscar/oscar.c:644
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:647
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Old ICQ UTF8"
+msgstr "旧的 ICQ UTF8"
 
 #: src/protocols/oscar/oscar.c:650
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
+#: src/protocols/oscar/oscar.c:653
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:656
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:659
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:662
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:657
+#: src/protocols/oscar/oscar.c:666
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:660
+#: src/protocols/oscar/oscar.c:669
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:663
+#: src/protocols/oscar/oscar.c:672
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:6916
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:6931
+#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:6921
+#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:700
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
+msgid "Warning Level"
+msgstr "警告级别"
+
+#: src/protocols/oscar/oscar.c:785
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:778
+#: src/protocols/oscar/oscar.c:794
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:935
+#: src/protocols/oscar/oscar.c:951
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:937
+#: src/protocols/oscar/oscar.c:953
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:945
+#: src/protocols/oscar/oscar.c:961
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:1022 src/protocols/oscar/oscar.c:1153
+#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1103
+#: src/protocols/oscar/oscar.c:1119
 #, 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:1529
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1534
+#: src/protocols/oscar/oscar.c:1550
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1569
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1573
+#: src/protocols/oscar/oscar.c:1589
 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:1577 src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1641
+#: src/protocols/oscar/oscar.c:1657
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "您已经丢失与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1664
+#: src/protocols/oscar/oscar.c:1680
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1745
+#: src/protocols/oscar/oscar.c:1749
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1769
+#: src/protocols/oscar/oscar.c:1773
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7912,46 +7870,51 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2346
+#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1914
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:2024 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/oscar/oscar.c:2027
+#, fuzzy, c-format
+msgid "Transfer of file %s timed out."
+msgstr "文件 %s 传送完成"
+
+#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
 #: src/protocols/yahoo/yahoo_filexfer.c:186
 #: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:2029
+#: src/protocols/oscar/oscar.c:2111
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2108
+#: src/protocols/oscar/oscar.c:2190
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2233 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2238
+#: src/protocols/oscar/oscar.c:2320
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2242
+#: src/protocols/oscar/oscar.c:2324
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2247
+#: src/protocols/oscar/oscar.c:2329
 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."
@@ -7959,33 +7922,33 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2252
+#: src/protocols/oscar/oscar.c:2334
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2365
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2353
+#: src/protocols/oscar/oscar.c:2435
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2377
+#: src/protocols/oscar/oscar.c:2459
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: src/protocols/oscar/oscar.c:2391
+#: src/protocols/oscar/oscar.c:2473
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: src/protocols/oscar/oscar.c:2392
+#: src/protocols/oscar/oscar.c:2474
 msgid "Enter the 6 digit number from the digital display."
 msgstr "输入所显示的六位数字。"
 
-#: src/protocols/oscar/oscar.c:2432 src/protocols/oscar/oscar.c:2462
-#: src/protocols/oscar/oscar.c:2551
+#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:2633
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7993,24 +7956,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2435 src/protocols/oscar/oscar.c:2465
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2554
+#: src/protocols/oscar/oscar.c:2636
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2585
+#: src/protocols/oscar/oscar.c:2667
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/oscar/oscar.c:3722
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3725
 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 "
@@ -8019,40 +7982,40 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3648
+#: src/protocols/oscar/oscar.c:3764
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3656
+#: src/protocols/oscar/oscar.c:3772
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3657
+#: src/protocols/oscar/oscar.c:3773
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3687
+#: src/protocols/oscar/oscar.c:3803
 #, 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:3692 src/protocols/oscar/oscar.c:3694
+#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3810
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3738
-#: src/protocols/oscar/oscar.c:3838 src/protocols/oscar/oscar.c:3858
-#: src/protocols/oscar/oscar.c:6382 src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3737
+#: src/protocols/oscar/oscar.c:3853
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3836
+#: src/protocols/oscar/oscar.c:3961
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8061,11 +8024,11 @@
 "用户 %u 想要将 %s 加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3846 src/protocols/oscar/oscar.c:6389
+#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3858
+#: src/protocols/oscar/oscar.c:3983
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8075,17 +8038,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:3984
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3866
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3874
+#: src/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8098,7 +8061,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8111,7 +8074,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8124,32 +8087,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3911
+#: src/protocols/oscar/oscar.c:4036
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:4042
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3921
+#: src/protocols/oscar/oscar.c:4046
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:4130
 #, 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:4014
+#: src/protocols/oscar/oscar.c:4139
 #, 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:4023
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8157,89 +8120,85 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4032
+#: src/protocols/oscar/oscar.c:4157
 #, 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:4041
+#: src/protocols/oscar/oscar.c:4166
 #, 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:4050
+#: src/protocols/oscar/oscar.c:4175
 #, 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:4104 src/protocols/oscar/oscar.c:4338
+#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4295
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4332
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4207 src/protocols/oscar/oscar.c:4212
-#: src/protocols/oscar/oscar.c:4270 src/protocols/oscar/oscar.c:4274
+#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
+#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4335
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4270
+#: src/protocols/oscar/oscar.c:4395
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4273
+#: src/protocols/oscar/oscar.c:4398
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4296
-msgid "Warning Level"
-msgstr "警告级别"
-
-#: src/protocols/oscar/oscar.c:4300
+#: src/protocols/oscar/oscar.c:4425
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4305 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4389
+#: src/protocols/oscar/oscar.c:4514
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4575
+#: src/protocols/oscar/oscar.c:4700
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4925
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4796
+#: src/protocols/oscar/oscar.c:4926
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8247,155 +8206,155 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4997
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:5035
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5198 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5200 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5200 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/oscar/oscar.c:5346
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5220
+#: src/protocols/oscar/oscar.c:5350
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5225
+#: src/protocols/oscar/oscar.c:5355
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5229 src/protocols/oscar/oscar.c:5237
+#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5363
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5241
+#: src/protocols/oscar/oscar.c:5371
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5242
+#: src/protocols/oscar/oscar.c:5372
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5243
+#: src/protocols/oscar/oscar.c:5373
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5244
+#: src/protocols/oscar/oscar.c:5374
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5376
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5256
+#: src/protocols/oscar/oscar.c:5386
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5435
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5457
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5352
+#: src/protocols/oscar/oscar.c:5482
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5503
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5505
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5406
+#: src/protocols/oscar/oscar.c:5536
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5539
 #, 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:5412
+#: src/protocols/oscar/oscar.c:5542
 #, 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:5415
+#: src/protocols/oscar/oscar.c:5545
 #, 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:5418
+#: src/protocols/oscar/oscar.c:5548
 #, 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:5421
+#: src/protocols/oscar/oscar.c:5551
 #, 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:5424
+#: src/protocols/oscar/oscar.c:5554
 #, 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:5427
+#: src/protocols/oscar/oscar.c:5557
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5437
+#: src/protocols/oscar/oscar.c:5567
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8404,25 +8363,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5438 src/protocols/oscar/oscar.c:5445
+#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5573
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5510
+#: src/protocols/oscar/oscar.c:5640
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5637
+#: src/protocols/oscar/oscar.c:5780
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5638
+#: src/protocols/oscar/oscar.c:5781
 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 "
@@ -8431,7 +8390,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5665
+#: src/protocols/oscar/oscar.c:5808
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8441,15 +8400,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5670
+#: src/protocols/oscar/oscar.c:5813
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5843
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:5844
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8458,7 +8417,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5748
+#: src/protocols/oscar/oscar.c:5891
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8470,11 +8429,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5896
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5851
+#: src/protocols/oscar/oscar.c:5994
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8484,16 +8443,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5853 src/protocols/oscar/oscar.c:6245
-#: src/protocols/oscar/oscar.c:6259
+#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6408
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5951
+#: src/protocols/oscar/oscar.c:6100
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5952
+#: src/protocols/oscar/oscar.c:6101
 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 "
@@ -8502,13 +8461,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6136 src/protocols/oscar/oscar.c:6137
-#: src/protocols/oscar/oscar.c:6142 src/protocols/oscar/oscar.c:6303
-#: src/protocols/oscar/oscar.c:6304 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
+#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6243
+#: src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8516,11 +8475,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6243 src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6406
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8530,18 +8489,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6340
+#: src/protocols/oscar/oscar.c:6489
 #, 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:6346
+#: src/protocols/oscar/oscar.c:6495
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6380
+#: src/protocols/oscar/oscar.c:6538
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8551,17 +8510,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6425
+#: src/protocols/oscar/oscar.c:6583
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6426
+#: src/protocols/oscar/oscar.c:6584
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8571,92 +8530,92 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6588
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6467 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6664
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6573
+#: src/protocols/oscar/oscar.c:6731
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6708
+#: src/protocols/oscar/oscar.c:6866
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6989
+#: src/protocols/oscar/oscar.c:7153
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:7154
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7009
+#: src/protocols/oscar/oscar.c:7173
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7015
+#: src/protocols/oscar/oscar.c:7179
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7027
+#: src/protocols/oscar/oscar.c:7191
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7044
+#: src/protocols/oscar/oscar.c:7208
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7268
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:7107
+#: src/protocols/oscar/oscar.c:7271
 msgid "Hide IP address"
 msgstr "隐藏 IP 地址"
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7274
 msgid "Web aware"
 msgstr "Web 状态"
 
-#: src/protocols/oscar/oscar.c:7115
+#: src/protocols/oscar/oscar.c:7279
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: src/protocols/oscar/oscar.c:7132
+#: src/protocols/oscar/oscar.c:7296
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7133
+#: src/protocols/oscar/oscar.c:7297
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7140
+#: src/protocols/oscar/oscar.c:7304
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7192
+#: src/protocols/oscar/oscar.c:7356
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7401
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7240
+#: src/protocols/oscar/oscar.c:7404
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7241
+#: src/protocols/oscar/oscar.c:7405
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8664,77 +8623,77 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7258
+#: src/protocols/oscar/oscar.c:7422
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7259
+#: src/protocols/oscar/oscar.c:7423
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7260
+#: src/protocols/oscar/oscar.c:7424
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7341 src/protocols/silc/silc.c:826
+#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7347
+#: src/protocols/oscar/oscar.c:7511
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7352 src/protocols/silc/silc.c:822
+#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7358
+#: src/protocols/oscar/oscar.c:7522
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7362
+#: src/protocols/oscar/oscar.c:7526
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:7372
+#: src/protocols/oscar/oscar.c:7536
 msgid "Show privacy options..."
 msgstr "显示隐藏选项..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:7379
+#: src/protocols/oscar/oscar.c:7543
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7383
+#: src/protocols/oscar/oscar.c:7547
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7387
+#: src/protocols/oscar/oscar.c:7551
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7391
+#: src/protocols/oscar/oscar.c:7555
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7398
+#: src/protocols/oscar/oscar.c:7562
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7404
+#: src/protocols/oscar/oscar.c:7568
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7409
+#: src/protocols/oscar/oscar.c:7573
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7479
+#: src/protocols/oscar/oscar.c:7643
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7482
+#: src/protocols/oscar/oscar.c:7646
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8748,112 +8707,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7573 src/protocols/oscar/oscar.c:7575
+#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7598
+#: src/protocols/oscar/oscar.c:7788
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7601
+#: src/protocols/oscar/oscar.c:7791
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7604 src/protocols/zephyr/zephyr.c:2905
+#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/rendezvous/rendezvous.c:572
-#: src/protocols/rendezvous/rendezvous.c:846
-msgid "User"
-msgstr "用户"
-
-#: src/protocols/rendezvous/rendezvous.c:648
-msgid "AIM Screen name"
-msgstr "AIM 用户名"
-
-#: src/protocols/rendezvous/rendezvous.c:688
-msgid "Preparing Buddy List"
-msgstr "正准备好友列表"
-
-#: src/protocols/rendezvous/rendezvous.c:693
-msgid "Unable to establish listening port."
-msgstr "无法建立监听端口。"
-
-#: src/protocols/rendezvous/rendezvous.c:702
-msgid "Unable to establish mDNS socket."
-msgstr "无法建立 mDNS 套接字。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/rendezvous/rendezvous.c:794
-#: src/protocols/rendezvous/rendezvous.c:796
-msgid "Rendezvous Protocol Plugin"
-msgstr "Rendezvous 协议插件"
-
-#. Try to avoid making this configurable...
-#: src/protocols/rendezvous/rendezvous.c:839
-msgid "Host name"
-msgstr "主机名"
-
-#: src/protocols/rendezvous/rendezvous.c:842
-msgid "First name"
-msgstr "名"
-
-#: src/protocols/rendezvous/rendezvous.c:846
-msgid "Last name"
-msgstr "姓"
-
-#: src/protocols/rendezvous/rendezvous.c:850
-msgid "Share AIM screen name"
-msgstr "共享 AIM 用户名"
-
-#: src/protocols/sametime/sametime.c:1115
-msgid "Sending Handshake"
-msgstr "正发送握手"
-
-#: src/protocols/sametime/sametime.c:1120
-#, fuzzy
-msgid "Waiting for Handshake Acknowledgement"
-msgstr "正在传送开始"
-
-#: src/protocols/sametime/sametime.c:1125
-msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1130
-msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1135
-#, fuzzy
-msgid "Login Redirected"
-msgstr "登录服务器"
-
-#: src/protocols/sametime/sametime.c:1140
-msgid "Login Acknowledged"
-msgstr "登录已被确认"
-
-#: src/protocols/sametime/sametime.c:1145
-msgid "Connected to Sametime Community Server"
-msgstr "已连接到 Sametime 社区服务器"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1242
-msgid "Admin Alert"
-msgstr "管理提醒"
-
 #: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
 #: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
 #: src/protocols/silc/ft.c:338
@@ -9876,7 +9745,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2609
+#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
@@ -10009,42 +9878,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1574
+#: src/protocols/silc/silc.c:1573
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1576
+#: src/protocols/silc/silc.c:1575
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1609
 #, fuzzy
 msgid "Public Key file"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1613
 #, fuzzy
 msgid "Private Key file"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1616
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1621
+#: src/protocols/silc/silc.c:1620
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1624
+#: src/protocols/silc/silc.c:1623
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1627
+#: src/protocols/silc/silc.c:1626
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1630
+#: src/protocols/silc/silc.c:1629
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
@@ -10296,43 +10165,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1522
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1662
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1820
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1865 src/protocols/toc/toc.c:1905
-#: src/protocols/toc/toc.c:2029 src/protocols/toc/toc.c:2117
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:2062
+#: src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2162
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2196
+#: src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2203
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -10347,15 +10216,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2290 src/protocols/toc/toc.c:2292
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2311
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2315
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -10438,40 +10307,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1279 src/protocols/trepia/trepia.c:1281
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:711
+#: src/protocols/yahoo/yahoo.c:694
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:735 src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
 msgid "Buzz!!"
 msgstr "呼叫"
 
-#: src/protocols/yahoo/yahoo.c:780
+#: src/protocols/yahoo/yahoo.c:763
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:847
+#. TODO: this is almost exactly the same as what MSN does,
+#. * this should probably be moved to the core.
+#. *
+#: src/protocols/yahoo/yahoo.c:853
+#, fuzzy, c-format
+msgid "The user %s wants to add %s to his or her buddy list%s%s."
+msgstr "用户 %s 想要将 %s 添加为好友。"
+
+#: src/protocols/yahoo/yahoo.c:859
+#, fuzzy
+msgid "Message (optional) :"
+msgstr "消息通知"
+
+#: src/protocols/yahoo/yahoo.c:901
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:850
+#: src/protocols/yahoo/yahoo.c:904
 #, 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:853
+#: src/protocols/yahoo/yahoo.c:907
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1605
+#: src/protocols/yahoo/yahoo.c:1659
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10481,11 +10363,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1608
+#: src/protocols/yahoo/yahoo.c:1662
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1681
+#: src/protocols/yahoo/yahoo.c:1735
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10493,19 +10375,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: src/protocols/yahoo/yahoo.c:1738
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1718
+#: src/protocols/yahoo/yahoo.c:1772
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1729
+#: src/protocols/yahoo/yahoo.c:1783
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1730
+#: src/protocols/yahoo/yahoo.c:1784
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10516,93 +10398,117 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1738
+#: src/protocols/yahoo/yahoo.c:1792
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1741
+#: src/protocols/yahoo/yahoo.c:1795
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1744
+#: src/protocols/yahoo/yahoo.c:1798
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: src/protocols/yahoo/yahoo.c:1852
 #, 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:1801
+#: src/protocols/yahoo/yahoo.c:1855
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2039 src/protocols/yahoo/yahoo.c:2185
+#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
 #: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2207 src/protocols/yahoo/yahoo.c:2324
-#: src/protocols/yahoo/yahoo.c:2408 src/protocols/yahoo/yahoo.c:2418
-#: src/protocols/yahoo/yahoochat.c:1399 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
+#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
 #: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2521 src/protocols/yahoo/yahoo.c:3036
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2523 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2525 src/protocols/yahoo/yahoo.c:3042
+#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2529 src/protocols/yahoo/yahoo.c:3048
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2533 src/protocols/yahoo/yahoo.c:3054
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2640
+#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
+#, fuzzy
+msgid "Appear Online"
+msgstr "显示为离线"
+
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
+#, fuzzy
+msgid "Appear Permanently Offline"
+msgstr "显示为离线"
+
+#: src/protocols/yahoo/yahoo.c:2763
+#, fuzzy
+msgid "Stealth"
+msgstr "州/省"
+
+#: src/protocols/yahoo/yahoo.c:2818
+#, fuzzy
+msgid "Don't Appear Permanently Offline"
+msgstr "显示为离线"
+
+#: src/protocols/yahoo/yahoo.c:2857
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/yahoo/yahoo.c:2862
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2775
+#: src/protocols/yahoo/yahoo.c:2887
+msgid "Stealth Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2920
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2929
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2794
+#: src/protocols/yahoo/yahoo.c:2939
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2798
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3348
+#: src/protocols/yahoo/yahoo.c:3505
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3352
+#: src/protocols/yahoo/yahoo.c:3509
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: 呼叫联系人,以便引起他的注意"
 
@@ -10616,174 +10522,134 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3432 src/protocols/yahoo/yahoo.c:3434
+#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3453
+#: src/protocols/yahoo/yahoo.c:3609
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3456
+#: src/protocols/yahoo/yahoo.c:3612
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3459
+#: src/protocols/yahoo/yahoo.c:3615
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3462
+#: src/protocols/yahoo/yahoo.c:3618
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3465
+#: src/protocols/yahoo/yahoo.c:3621
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3468
+#: src/protocols/yahoo/yahoo.c:3624
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3471
+#: src/protocols/yahoo/yahoo.c:3627
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3474
+#: src/protocols/yahoo/yahoo.c:3630
+#, fuzzy
+msgid "Chat Room Locale"
+msgstr "聊天房间列表 URL"
+
+#: src/protocols/yahoo/yahoo.c:3633
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3477
+#: src/protocols/yahoo/yahoo.c:3636
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3480
+#: src/protocols/yahoo/yahoo.c:3639
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoochat.c:196
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-#: src/protocols/yahoo/yahoochat.c:198
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
-
-#: src/protocols/yahoo/yahoochat.c:353
-msgid "Failed to join chat"
-msgstr "加入聊天失败"
-
-#: src/protocols/yahoo/yahoochat.c:353
-msgid "Maybe the room is full?"
-msgstr "可能房间已满?"
-
-#: src/protocols/yahoo/yahoochat.c:431
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您现在正在 %s 中聊天。"
-
-#: src/protocols/yahoo/yahoochat.c:602
-msgid "Failed to join buddy in chat"
-msgstr "在聊天中加入好友失败"
-
-#: src/protocols/yahoo/yahoochat.c:603
-msgid "Maybe they're not in a chat?"
-msgstr "可能他们未在聊天中?"
-
-#: src/protocols/yahoo/yahoochat.c:1339
-msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
-
-#: src/protocols/yahoo/yahoochat.c:1385
-msgid "Voices"
-msgstr "语音"
-
-#: src/protocols/yahoo/yahoochat.c:1388
-msgid "Webcams"
-msgstr "摄像头"
-
-#: src/protocols/yahoo/yahoochat.c:1399 src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr "用户房间"
-
 #: src/protocols/yahoo/yahoo_profile.c:677
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 地址:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:754
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:800
 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:971
+#: src/protocols/yahoo/yahoo_profile.c:978
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1045
-#: src/protocols/yahoo/yahoo_profile.c:1049
-#: src/protocols/yahoo/yahoo_profile.c:1053
+#: src/protocols/yahoo/yahoo_profile.c:1052
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo_profile.c:1063
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/yahoo/yahoo_profile.c:1070
+#: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo_profile.c:1088
+#: src/protocols/yahoo/yahoo_profile.c:1095
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo_profile.c:1103
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1115
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1112
+#: src/protocols/yahoo/yahoo_profile.c:1119
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
 #: src/protocols/yahoo/yahoo_profile.c:1132
+#, fuzzy
+msgid "Last Update"
+msgstr "上次更新"
+
+#: src/protocols/yahoo/yahoo_profile.c:1138
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1144
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: src/protocols/yahoo/yahoo_profile.c:1160
 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:1157
+#: src/protocols/yahoo/yahoo_profile.c:1163
 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 "
@@ -10792,97 +10658,147 @@
 "无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
 "人资料。如果您确定用户存在的话,请稍候再试。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1165
+#: src/protocols/yahoo/yahoo_profile.c:1171
 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:205
+msgid "Invitation Rejected"
+msgstr "邀请已拒绝"
+
+#: src/protocols/yahoo/yahoochat.c:360
+msgid "Failed to join chat"
+msgstr "加入聊天失败"
+
+#: src/protocols/yahoo/yahoochat.c:360
+msgid "Maybe the room is full?"
+msgstr "可能房间已满?"
+
+#: src/protocols/yahoo/yahoochat.c:438
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您现在正在 %s 中聊天。"
+
+#: src/protocols/yahoo/yahoochat.c:613
+msgid "Failed to join buddy in chat"
+msgstr "在聊天中加入好友失败"
+
+#: src/protocols/yahoo/yahoochat.c:614
+msgid "Maybe they're not in a chat?"
+msgstr "可能他们未在聊天中?"
+
+#: src/protocols/yahoo/yahoochat.c:1350
+msgid "Fetching the room list failed."
+msgstr "获取房间列表失败。"
+
+#: src/protocols/yahoo/yahoochat.c:1403
+msgid "Voices"
+msgstr "语音"
+
+#: src/protocols/yahoo/yahoochat.c:1406
+msgid "Webcams"
+msgstr "摄像头"
+
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
+msgid "Unable to fetch room list."
+msgstr "无法获取房间列表。"
+
+#: src/protocols/yahoo/yahoochat.c:1477
+msgid "User Rooms"
+msgstr "用户房间"
+
 #: src/protocols/yahoo/ycht.c:402
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
 
-#: src/protocols/zephyr/zephyr.c:332
+#: src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/zephyr/zephyr.c:680
+#: src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1127
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:717 src/protocols/zephyr/zephyr.c:1132
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:722 src/protocols/zephyr/zephyr.c:1134
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:1465 src/protocols/zephyr/zephyr.c:1466
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:2291
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:2297
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:2308
+#: src/protocols/zephyr/zephyr.c:2296
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:2614
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2619
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2624
+#: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2629
+#: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2634
+#: src/protocols/zephyr/zephyr.c:2622
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2640
+#: src/protocols/zephyr/zephyr.c:2628
 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:2645
+#: src/protocols/zephyr/zephyr.c:2633
 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:2651
+#: src/protocols/zephyr/zephyr.c:2639
 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:2657
+#: src/protocols/zephyr/zephyr.c:2645
 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;"
@@ -10890,7 +10806,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2663
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10898,15 +10814,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:2668
+#: src/protocols/zephyr/zephyr.c:2656
 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:2774
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:2777
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10920,31 +10836,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2860 src/protocols/zephyr/zephyr.c:2862
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:2887
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2890
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2893
+#: src/protocols/zephyr/zephyr.c:2880
 msgid "Import from .anyone"
 msgstr "从 .anyone 导入"
 
-#: src/protocols/zephyr/zephyr.c:2896
+#: src/protocols/zephyr/zephyr.c:2883
 msgid "Import from .zephyr.subs"
 msgstr "从 .zephyr.subs 导入"
 
-#: src/protocols/zephyr/zephyr.c:2899
+#: src/protocols/zephyr/zephyr.c:2886
 msgid "Realm"
 msgstr "域"
 
-#: src/protocols/zephyr/zephyr.c:2902
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr "暴露"
 
@@ -10970,130 +10886,296 @@
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
-#: src/prpl.c:209
-#, c-format
-msgid ""
-"%s has just been warned by an anonymous person.\n"
-"Your new warning level is %d%%"
-msgstr ""
-
-#: src/prpl.c:214
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1254
+#: src/request.h:1276
 msgid "Accept"
 msgstr "接受"
 
-#: src/savedstatuses.c:351
-msgid "saved statuses"
-msgstr "已存状态"
-
 #: src/server.c:351
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: src/server.c:743
+#: src/server.c:733
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:757
+#: src/server.c:747
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1013
+#: src/server.c:1008
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s 邀请了 %s 加入聊天室 %s:\n%s"
-
-#: src/server.c:1018
+msgstr ""
+"%s 邀请了 %s 加入聊天室 %s:\n"
+"%s"
+
+#: src/server.c:1013
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: src/server.c:1024
+#: src/server.c:1017
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/status.c:154
+#: src/status.c:153
 msgid "Unset"
 msgstr "取消设置"
 
-#: src/status.c:621
+#: src/status.c:626
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:626
+#: src/status.c:631
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1276
+#: src/status.c:1314
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/status.c:1292
+#: src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/util.c:2106
+#: src/util.c:2120
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"
 
-#: src/util.c:2107
+#: src/util.c:2121
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file been renamed to %s~."
 msgstr "阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
 
-#: src/util.c:2544
+#: src/util.c:2558
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2547
+#: src/util.c:2561
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2577
+#: src/util.c:2591
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2591
+#: src/util.c:2605
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2599
+#: src/util.c:2613
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2607
+#: src/util.c:2621
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:3027
+#: src/util.c:3041
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
+#~ msgid "Orientation"
+#~ msgstr "方向"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "托盘的方向。"
+
+#~ msgid "GTK Signals Test"
+#~ msgstr "GTK 信号测试"
+
+#~ msgid "Test to see that all ui signals are working properly."
+#~ msgstr "测试看看所有的信号是否都工作正确。"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation."
+#~ msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "停靠的好友列表常居顶端(_B)"
+
+#~ msgid "No name"
+#~ msgstr "无名称"
+
+#~ msgid "Show fewer options"
+#~ msgstr "显示主要选项"
+
+#~ msgid "Information"
+#~ msgstr "信息"
+
+#~ msgid "Rename Group"
+#~ msgstr "重命名组"
+
+#~ msgid "New group name"
+#~ msgstr "新组名称"
+
+#~ msgid "Please enter a new name for the selected group."
+#~ msgstr "请输入选中组的新名字。"
+
+#~ msgid "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Warned:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>警告:</b> %s"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "警告 (%d%%) "
+
+#~ msgid "Background color name"
+#~ msgstr "背景颜色名称"
+
+#~ msgid "Background color as a string"
+#~ msgstr "背景颜色的字符串"
+
+#~ msgid "Background color as a GdkColor"
+#~ msgstr "背景颜色的 GdkColor"
+
+#~ msgid "Background set"
+#~ msgstr "背景设定"
+
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "此标记是否影响背景颜色"
+
+#, fuzzy
+#~ msgid "Active item"
+#~ msgstr "活跃"
+
+#, fuzzy
+#~ msgid "The item which is currently active"
+#~ msgstr "聊天目前不可用"
+
+#, fuzzy
+#~ msgid "Appears as list"
+#~ msgstr "显示为离线"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/对话(C)/警告(_W)..."
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/对话(C)/警告(W)..."
+
+#~ msgid "Warn User"
+#~ msgstr "警告用户"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
+#~ "\n"
+#~ "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "匿名警告吗(_A)?"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>匿名警告较不容易引起注意。</b>"
+
+#~ msgid ""
+#~ "Unable to guess the image type based on the file extension supplied.  "
+#~ "Defaulting to PNG."
+#~ msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
+
+#~ msgid "Display"
+#~ msgstr "显示"
+
+#~ msgid "Ignore _formatting"
+#~ msgstr "忽略格式(_F)"
+
+#~ msgid "Default Formatting"
+#~ msgstr "默认格式"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "送出信息使用默认格式(_S)"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "标签位置(_L):"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "新对话放置(_P):"
+
+#~ msgid "Message Text"
+#~ msgstr "消息文本"
+
+#~ msgid "User"
+#~ msgstr "用户"
+
+#~ msgid "AIM Screen name"
+#~ msgstr "AIM 用户名"
+
+#~ msgid "Preparing Buddy List"
+#~ msgstr "正准备好友列表"
+
+#~ msgid "Unable to establish listening port."
+#~ msgstr "无法建立监听端口。"
+
+#~ msgid "Unable to establish mDNS socket."
+#~ msgstr "无法建立 mDNS 套接字。"
+
+#~ msgid "Rendezvous Protocol Plugin"
+#~ msgstr "Rendezvous 协议插件"
+
+#~ msgid "Host name"
+#~ msgstr "主机名"
+
+#~ msgid "First name"
+#~ msgstr "名"
+
+#~ msgid "Last name"
+#~ msgstr "姓"
+
+#~ msgid "Share AIM screen name"
+#~ msgstr "共享 AIM 用户名"
+
+#~ msgid "Sending Handshake"
+#~ msgstr "正发送握手"
+
+#, fuzzy
+#~ msgid "Waiting for Handshake Acknowledgement"
+#~ msgstr "正在传送开始"
+
+#, fuzzy
+#~ msgid "Login Redirected"
+#~ msgstr "登录服务器"
+
+#~ msgid "Login Acknowledged"
+#~ msgstr "登录已被确认"
+
+#~ msgid "Connected to Sametime Community Server"
+#~ msgstr "已连接到 Sametime 社区服务器"
+
+#~ msgid "Admin Alert"
+#~ msgstr "管理提醒"
+
+#~ msgid "saved statuses"
+#~ msgstr "已存状态"
+
 #~ msgid "Mail Server"
 #~ msgstr "邮件服务器"
 
@@ -11417,9 +11499,6 @@
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "允许斜线开头的命令(_S)"
 
-#~ msgid "Show _formatting toolbar"
-#~ msgstr "显示格式工具栏(_F)"
-
 #~ msgid "Show _aliases in tabs/titles"
 #~ msgstr "在标签/标题中显示别名(_A)"